changes for compute_settings

.github/workflows/ci.yml

@@ -57,6 +57,7 @@ jobs:
       - name: Update environment
         run: |
           mamba env update -n asim-test -f activitysim/conda-environments/github-actions-tests.yml
+          mamba install -c conda-forge c-blosc2
         if: steps.cache.outputs.cache-hit != 'true'
 
       - name: Install activitysim

configs/resident/cdap.yaml

@@ -46,5 +46,5 @@ annotate_households:
   TABLES:
     - persons
 
-sharrow_settings:
-  skip: true
+compute_settings:
+  sharrow_skip: true

configs/resident/joint_tour_frequency_composition.yaml

@@ -34,5 +34,5 @@ ALTS_TABLE_STRUCTURE:
       2: children
       3: mixed
 
-sharrow_settings:
-  skip: true
+compute_settings:
+  sharrow_skip: true

configs/resident/joint_tour_scheduling.yaml

@@ -12,5 +12,5 @@ preprocessor:
     - households
     - joint_tour_participants
 
-sharrow_settings:
-  skip: true
+compute_settings:
+  sharrow_skip: true

configs/resident/non_mandatory_tour_scheduling.yaml

@@ -51,34 +51,34 @@ TOUR_SPEC_SEGMENTS:
 # spec keyed by <spec_segment>
 SPEC_SEGMENTS:
   escort:
-    'SPEC': tour_scheduling_nonmandatory_escort.csv
-    'COEFFICIENTS': tour_scheduling_nonmandatory_escort_coefficients.csv
-    'sharrow_settings':
-      skip: true
+    SPEC: tour_scheduling_nonmandatory_escort.csv
+    COEFFICIENTS: tour_scheduling_nonmandatory_escort_coefficients.csv
+    compute_settings:
+      sharrow_skip: true
   shopping:
-    'SPEC': tour_scheduling_nonmandatory_shopping.csv
-    'COEFFICIENTS': tour_scheduling_nonmandatory_shopping_coefficients.csv
-    'sharrow_settings':
+    SPEC: tour_scheduling_nonmandatory_shopping.csv
+    COEFFICIENTS: tour_scheduling_nonmandatory_shopping_coefficients.csv
+    compute_settings:
       skip: true
   eatout:
-    'SPEC': tour_scheduling_nonmandatory_eatout.csv
-    'COEFFICIENTS': tour_scheduling_nonmandatory_eatout_coefficients.csv
-    'sharrow_settings':
+    SPEC: tour_scheduling_nonmandatory_eatout.csv
+    COEFFICIENTS: tour_scheduling_nonmandatory_eatout_coefficients.csv
+    compute_settings:
       skip: true
   othdiscr:
-    'SPEC': tour_scheduling_nonmandatory_othdiscr.csv
-    'COEFFICIENTS': tour_scheduling_nonmandatory_othdiscr_coefficients.csv
-    'sharrow_settings':
+    SPEC: tour_scheduling_nonmandatory_othdiscr.csv
+    COEFFICIENTS: tour_scheduling_nonmandatory_othdiscr_coefficients.csv
+    compute_settings:
       skip: true
   othmaint:
-    'SPEC': tour_scheduling_nonmandatory_othmaint.csv
-    'COEFFICIENTS': tour_scheduling_nonmandatory_othmaint_coefficients.csv
-    'sharrow_settings':
+    SPEC: tour_scheduling_nonmandatory_othmaint.csv
+    COEFFICIENTS: tour_scheduling_nonmandatory_othmaint_coefficients.csv
+    compute_settings:
       skip: true
   social:
-    'SPEC': tour_scheduling_nonmandatory_social.csv
-    'COEFFICIENTS': tour_scheduling_nonmandatory_social_coefficients.csv
-    'sharrow_settings':
+    SPEC: tour_scheduling_nonmandatory_social.csv
+    COEFFICIENTS: tour_scheduling_nonmandatory_social_coefficients.csv
+    compute_settings:
       skip: true
 
 ## alts preprocessor keyed by <spec_segment>
@@ -104,5 +104,5 @@ SPEC_SEGMENTS:
 #
 DESTINATION_FOR_TOUR_PURPOSE: destination
 
-'sharrow_settings':
-  skip: true
+compute_settings:
+  sharrow_skip: true

configs/resident/school_escorting.yaml

@@ -46,5 +46,5 @@ CONSTANTS:
   max_bin_difference_between_departure_times: 1
   mins_per_time_bin: 30
 
-sharrow_settings:
-  skip: true
+compute_settings:
+  sharrow_skip: true

configs/resident/tour_mode_choice.yaml

@@ -113,5 +113,5 @@ LOGSUM_CHOOSER_COLUMNS:
 
 MODE_CHOICE_LOGSUM_COLUMN_NAME: mode_choice_logsum
 
-sharrow_settings:
-  skip: true
+compute_settings:
+  sharrow_skip: true

configs/resident/vehicle_type_choice.yaml

@@ -138,6 +138,6 @@ CONSTANTS:
   # chargers per cap used in vehicle type model estimation
   # CHARGERS_PER_CAP: 0.000721205
 
-sharrow_settings:
-  skip: true
+compute_settings:
+  sharrow_skip: true
   # "body_type.str.contains('-AV')" and similar string-manip expressions not sharrow-safe

extensions/av_ownership.py

@@ -143,6 +143,7 @@ def av_ownership(
             trace_label=trace_label,
             trace_choice_name="av_ownership",
             estimator=estimator,
+            compute_settings=model_settings.compute_settings,
         )
 
         if iterations_target_percent is not None:

extensions/external_identification.py

@@ -123,7 +123,7 @@ def external_identification(
         trace_label=trace_label,
         trace_choice_name=trace_label,
         estimator=estimator,
-        sharrow_settings=model_settings.sharrow_settings,
+        compute_settings=model_settings.compute_settings,
     )
 
     return choices

extensions/transponder_ownership.py

@@ -99,6 +99,7 @@ def transponder_ownership(
         trace_label=trace_label,
         trace_choice_name="transponder_ownership",
         estimator=estimator,
+        compute_settings=model_settings.compute_settings,
     )
     choices = choices == transponder_own_alt