Skip to content

Commit 4f62fab

Browse files
authored
Cleaned up a few more instances of counters that should be converted to uint64_t in the data ingestion pipeline. (#2405)
1 parent d7c5780 commit 4f62fab

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

Diff for: include/lbann/callbacks/variable_minibatch.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace callback {
4242
class variable_minibatch : public callback_base
4343
{
4444
public:
45-
variable_minibatch(size_t starting_mbsize);
45+
variable_minibatch(uint64_t starting_mbsize);
4646
variable_minibatch(const variable_minibatch&) = default;
4747
variable_minibatch& operator=(const variable_minibatch&) = default;
4848
/// Set the initial mini-batch size.

Diff for: include/lbann/data_ingestion/data_store_conduit.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ class data_store_conduit
541541
// methods follow
542542
//=========================================================================
543543

544-
void start_exchange_data_by_sample(size_t current_pos, size_t mb_size);
544+
void start_exchange_data_by_sample(uint64_t current_pos, uint64_t mb_size);
545545
void finish_exchange_data_by_sample();
546546

547547
void setup_data_store_buffers();

Diff for: src/callbacks/variable_minibatch.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
namespace lbann {
4444
namespace callback {
4545

46-
variable_minibatch::variable_minibatch(size_t starting_mbsize)
46+
variable_minibatch::variable_minibatch(uint64_t starting_mbsize)
4747
: m_starting_mbsize(starting_mbsize),
4848
m_current_mini_batch_size(starting_mbsize)
4949
{}
@@ -177,9 +177,9 @@ float variable_minibatch::get_current_learning_rate(model* m) const
177177
return 0.0f;
178178
}
179179

180-
step_minibatch::step_minibatch(size_t starting_mbsize,
181-
size_t step,
182-
size_t ramp_time)
180+
step_minibatch::step_minibatch(uint64_t starting_mbsize,
181+
uint64_t step,
182+
uint64_t ramp_time)
183183
: variable_minibatch(starting_mbsize), m_step(step), m_ramp_time(ramp_time)
184184
{}
185185

@@ -209,7 +209,7 @@ void step_minibatch::write_specific_proto(lbann_data::Callback& proto) const
209209
msg->set_ramp_time(m_ramp_time);
210210
}
211211

212-
minibatch_schedule::minibatch_schedule(size_t starting_mbsize,
212+
minibatch_schedule::minibatch_schedule(uint64_t starting_mbsize,
213213
std::vector<minibatch_step> steps)
214214
: variable_minibatch(starting_mbsize), m_steps(std::move(steps))
215215
{
@@ -221,9 +221,9 @@ minibatch_schedule::minibatch_schedule(size_t starting_mbsize,
221221
}
222222

223223
bool minibatch_schedule::schedule(model* m,
224-
size_t& new_mbsize,
224+
uint64_t& new_mbsize,
225225
float& new_lr,
226-
size_t& ramp_time)
226+
uint64_t& ramp_time)
227227
{
228228
const auto& c =
229229
static_cast<const SGDExecutionContext&>(m->get_execution_context());

Diff for: src/data_ingestion/coordinator/buffered_data_coordinator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ int buffered_data_coordinator<TensorDataType>::fetch_to_local_matrix(
167167
// Compute the size of the current local mini-batch
168168
const uint64_t end_pos =
169169
std::min(relative_base_position + loaded_mini_batch_size,
170-
dr->m_shuffled_indices.size());
170+
(uint64_t)dr->m_shuffled_indices.size());
171171
const uint64_t local_mini_batch_size = std::min(
172172
((end_pos - relative_base_position) + ds.get_sample_stride() - 1) /
173173
ds.get_sample_stride(),

Diff for: src/data_ingestion/data_store_conduit.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1819,8 +1819,8 @@ void data_store_conduit::profile_timing()
18191819
}
18201820
}
18211821

1822-
void data_store_conduit::start_exchange_mini_batch_data(size_t current_pos,
1823-
size_t mb_size,
1822+
void data_store_conduit::start_exchange_mini_batch_data(uint64_t current_pos,
1823+
uint64_t mb_size,
18241824
bool at_new_epoch)
18251825
{
18261826
if (is_local_cache() && is_fully_loaded()) {

0 commit comments

Comments
 (0)