Skip to content

Add chunk_size_mode: auto — derive the chunk budget from the real memory limit #1106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vincentgong7 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add chunk_size_mode: auto — derive the chunk budget from the real memory limit #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions activitysim/abm/models/location_choice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ def run_location_sample(
estimator,
model_settings,
chunk_size,
chunk_tag=f"{chunk_tag}.presample",
chunk_tag=f"{chunk_tag}.presample.{segment_name}",
trace_label=trace_label,
full_dest_size_terms=full_dest_size_terms,
)
Expand All @@ -567,7 +567,7 @@ def run_location_sample(
estimator,
model_settings,
chunk_size,
chunk_tag=f"{chunk_tag}.sample",
chunk_tag=f"{chunk_tag}.sample.{segment_name}",
trace_label=trace_label,
)

Expand Down Expand Up @@ -880,7 +880,7 @@ def run_location_choice(
location_sample_df,
model_settings,
chunk_size,
chunk_tag=f"{chunk_tag}.logsums",
chunk_tag=f"{chunk_tag}.logsums.{segment_name}",
trace_label=tracing.extend_trace_label(
trace_label, "logsums.%s" % segment_name
),
Expand All @@ -900,7 +900,7 @@ def run_location_choice(
estimator,
model_settings,
chunk_size,
chunk_tag=f"{chunk_tag}.simulate",
chunk_tag=f"{chunk_tag}.simulate.{segment_name}",
trace_label=tracing.extend_trace_label(
trace_label, "simulate.%s" % segment_name
),
Expand Down
8 changes: 4 additions & 4 deletions activitysim/abm/models/trip_destination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def destination_sample(
chunk_size,
trace_label,
):
chunk_tag = "trip_destination.sample"
chunk_tag = f"trip_destination.sample.{primary_purpose}"

skims = skim_hotel.sample_skims(presample=False)
alt_dest_col_name = model_settings.ALT_DEST_COL_NAME
Expand Down Expand Up @@ -630,7 +630,7 @@ def destination_presample(
trace_label,
):
trace_label = tracing.extend_trace_label(trace_label, "presample")
chunk_tag = "trip_destination.presample" # distinguish from trip_destination.sample
chunk_tag = f"trip_destination.presample.{primary_purpose}" # distinguish from trip_destination.sample

alt_dest_col_name = model_settings.ALT_DEST_COL_NAME

Expand Down Expand Up @@ -876,7 +876,7 @@ def compute_logsums(
logger.debug("Running %s with %d samples", trace_label, destination_sample.shape[0])

# chunk usage is uniform so better to combine
chunk_tag = "trip_destination.compute_logsums"
chunk_tag = f"trip_destination.compute_logsums.{primary_purpose}"

# FIXME should pass this in?
network_los = state.get_injectable("network_los")
Expand Down Expand Up @@ -995,7 +995,7 @@ def trip_destination_simulate(
destination alt chosen
"""
trace_label = tracing.extend_trace_label(trace_label, "trip_dest_simulate")
chunk_tag = "trip_destination.simulate"
chunk_tag = f"trip_destination.simulate.{primary_purpose}"

spec = simulate.spec_for_segment(
state,
Expand Down
8 changes: 4 additions & 4 deletions activitysim/abm/models/util/tour_destination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def destination_sample(
chunk_size,
trace_label,
):
chunk_tag = "tour_destination.sample"
chunk_tag = f"tour_destination.sample.{spec_segment_name}"

# create wrapper with keys for this lookup
# the skims will be available under the name "skims" for any @ expressions
Expand Down Expand Up @@ -602,7 +602,7 @@ def destination_presample(
trace_label,
):
trace_label = tracing.extend_trace_label(trace_label, "presample")
chunk_tag = "tour_destination.presample"
chunk_tag = f"tour_destination.presample.{spec_segment_name}"

logger.debug(f"{trace_label} location_presample")

Expand Down Expand Up @@ -791,7 +791,7 @@ def run_destination_logsums(
# if special person id is passed
chooser_id_column = model_settings.CHOOSER_ID_COLUMN

chunk_tag = "tour_destination.logsums"
chunk_tag = f"tour_destination.logsums.{tour_purpose}"

# merge persons into tours
choosers = pd.merge(
Expand Down Expand Up @@ -843,7 +843,7 @@ def run_destination_simulate(
run destination_simulate on tour_destination_sample
annotated with mode_choice logsum to select a destination from sample alternatives
"""
chunk_tag = "tour_destination.simulate"
chunk_tag = f"tour_destination.simulate.{spec_segment_name}"

model_spec = simulate.spec_for_segment(
state,
Expand Down
4 changes: 2 additions & 2 deletions activitysim/abm/test/test_misc/test_trip_destination_sampling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def fake_destination_sample(
pd.Index([101, 102, 103], name="dest_taz"),
)
assert captured["alt_dest_col_name"] == "dest_taz"
assert captured["chunk_tag"] == "trip_destination.sample"
assert captured["chunk_tag"] == "trip_destination.sample.eatout"
assert captured["zone_layer"] is None
assert captured["presample"] is False

Expand Down Expand Up @@ -219,7 +219,7 @@ def fake_choose_maz_for_taz(
pd.Index([1, 2, 3], name="zone_id"),
)
assert captured["alt_dest_col_name"] == "dest_taz"
assert captured["chunk_tag"] == "trip_destination.presample"
assert captured["chunk_tag"] == "trip_destination.presample.eatout"
assert captured["zone_layer"] == "taz"
assert captured["presample"] is True
assert captured["full_taz_index"] is None
Expand Down
Loading
Loading