Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions activitysim/core/chunk.py
Original file line number Diff line number Diff line change
Expand Up @@ -1234,11 +1234,16 @@ def adaptive_chunked_choosers(

num_choosers = len(choosers.index)

if state.settings.multiprocess:
num_processes = state.get_injectable("num_processes", 1)
else:
num_processes = 1

if state.settings.chunk_training_mode == MODE_EXPLICIT:
if explicit_chunk_size < 1:
chunk_size = math.ceil(num_choosers * explicit_chunk_size)
else:
chunk_size = int(explicit_chunk_size)
chunk_size = math.ceil(explicit_chunk_size / num_processes)
elif chunk_size is None:
chunk_size = state.settings.chunk_size

Expand Down Expand Up @@ -1372,11 +1377,16 @@ def adaptive_chunked_choosers_and_alts(
f"with {num_choosers} choosers and {num_alternatives} alternatives"
)

if state.settings.multiprocess:
num_processes = state.get_injectable("num_processes", 1)
else:
num_processes = 1

if state.settings.chunk_training_mode == MODE_EXPLICIT:
if explicit_chunk_size < 1:
chunk_size = math.ceil(num_choosers * explicit_chunk_size)
else:
chunk_size = int(explicit_chunk_size)
chunk_size = int(explicit_chunk_size / num_processes)
elif chunk_size is None:
chunk_size = state.settings.chunk_size

Expand All @@ -1389,7 +1399,14 @@ def adaptive_chunked_choosers_and_alts(
chunk_training_mode=state.settings.chunk_training_mode,
)
rows_per_chunk, estimated_number_of_chunks = chunk_sizer.initial_rows_per_chunk()
assert (rows_per_chunk > 0) and (rows_per_chunk <= num_choosers)
assert (rows_per_chunk > 0) and (
(rows_per_chunk <= num_choosers)
or (
(rows_per_chunk >= num_choosers)
and (estimated_number_of_chunks == 1)
and (state.settings.chunk_training_mode == MODE_EXPLICIT)
)
)

# alt chunks boundaries are where index changes
alt_ids = alternatives.index.values
Expand Down