Merge branch 'main' into location_choice_logsum_est_mode

RSGInc · Dec 13, 2024 · bde106f · bde106f
2 parents 4bc5296 + 171f172
commit bde106f
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 67 deletions.
diff --git a/.github/workflows/branch-docs.yml b/.github/workflows/branch-docs.yml
@@ -15,7 +15,7 @@ jobs:
       run:
         shell: bash -l {0}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # get all tags, lets setuptools_scm do its thing
 

diff --git a/.github/workflows/build_installer.yml b/.github/workflows/build_installer.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - uses: conda-incubator/setup-miniconda@v3
       with:
@@ -47,7 +47,7 @@ jobs:
       shell: bash
 
     - name: Upload installer to Github artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/Activitysim-${{ inputs.version }}-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}*
         name: Activitysim-${{ inputs.version }}-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}

diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml
@@ -26,13 +26,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Mambaforge
+      - name: Setup Miniforge
         uses: conda-incubator/setup-miniconda@v3
         with:
-            miniforge-variant: Mambaforge
             miniforge-version: latest
             activate-environment: asim-test
-            use-mamba: true
             python-version: ${{ matrix.python-version }}
 
       - name: Set cache date for year and month
@@ -46,7 +44,7 @@ jobs:
 
       - name: Update environment
         run: |
-          mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
+          conda env update -n asim-test -f conda-environments/github-actions-tests.yml
         if: steps.cache.outputs.cache-hit != 'true'
 
       - name: Install activitysim
@@ -58,8 +56,8 @@ jobs:
 
       - name: Conda checkup
         run: |
-          mamba info -a
-          mamba list
+          conda info -a
+          conda list
 
       - name: Lint with Black
         run: |
@@ -111,13 +109,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Mambaforge
+      - name: Setup Miniforge
         uses: conda-incubator/setup-miniconda@v3
         with:
-            miniforge-variant: Mambaforge
             miniforge-version: latest
             activate-environment: asim-test
-            use-mamba: true
             python-version: ${{ matrix.python-version }}
 
       - name: Set cache date for year and month
@@ -131,7 +127,7 @@ jobs:
 
       - name: Update environment
         run: |
-          mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
+          conda env update -n asim-test -f conda-environments/github-actions-tests.yml
         if: steps.cache.outputs.cache-hit != 'true'
 
       - name: Install activitysim
@@ -143,8 +139,8 @@ jobs:
 
       - name: Conda checkup
         run: |
-          mamba info -a
-          mamba list
+          conda info -a
+          conda list
 
       - name: Lint with Black
         run: |
@@ -194,13 +190,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Mambaforge
+      - name: Setup Miniforge
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
           miniforge-version: latest
           activate-environment: asim-test
-          use-mamba: true
           python-version: ${{ env.python-version }}
 
       - name: Set cache date for year and month
@@ -214,7 +208,7 @@ jobs:
 
       - name: Update environment
         run: |
-          mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
+          conda env update -n asim-test -f conda-environments/github-actions-tests.yml
         if: steps.cache.outputs.cache-hit != 'true'
 
       - name: Install activitysim
@@ -226,8 +220,8 @@ jobs:
 
       - name: Conda checkup
         run: |
-          mamba info -a
-          mamba list
+          conda info -a
+          conda list
 
       # TODO: Cache sharrow compiled flows?  The contents of __pycache__ appear to
       #       be ignored, so this is not working as expected right now
@@ -282,13 +276,11 @@ jobs:
       - name: Checkout ActivitySim
         uses: actions/checkout@v4
 
-      - name: Setup Mambaforge
+      - name: Setup Miniforge
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
           miniforge-version: latest
           activate-environment: asim-test
-          use-mamba: true
           python-version: ${{ env.python-version }}
 
       - name: Set cache date for year and month
@@ -304,7 +296,7 @@ jobs:
 
       - name: Update environment
         run: |
-          mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
+          conda env update -n asim-test -f conda-environments/github-actions-tests.yml
         if: steps.cache.outputs.cache-hit != 'true'
 
       - name: Install activitysim
@@ -316,8 +308,8 @@ jobs:
 
       - name: Conda checkup
         run: |
-          mamba info -a
-          mamba list
+          conda info -a
+          conda list
 
       - name: Checkout Example
         uses: actions/checkout@v4
@@ -345,13 +337,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Mambaforge
+      - name: Setup Miniforge
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
           miniforge-version: latest
           activate-environment: asim-test
-          use-mamba: true
           python-version: ${{ env.python-version }}
 
       - name: Set cache date for year and month
@@ -365,7 +355,7 @@ jobs:
 
       - name: Update environment
         run: |
-          mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
+          conda env update -n asim-test -f conda-environments/github-actions-tests.yml
         if: steps.cache.outputs.cache-hit != 'true'
 
       - name: Install activitysim
@@ -377,8 +367,8 @@ jobs:
 
       - name: Conda checkup
         run: |
-          mamba info -a
-          mamba list
+          conda info -a
+          conda list
 
       - name: Test Random Seed Generation
         run: |
@@ -392,18 +382,16 @@ jobs:
     defaults:
       run:
         shell: bash -l {0}
-    name: estimation_mode_test
+    name: Estimation Mode Unit Tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Mambaforge
+      - name: Setup Miniforge
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
           miniforge-version: latest
           activate-environment: asim-test
-          use-mamba: true
           python-version: ${{ env.python-version }}
 
       - name: Set cache date for year and month
@@ -417,7 +405,7 @@ jobs:
 
       - name: Update environment
         run: |
-          mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
+          conda env update -n asim-test -f conda-environments/github-actions-tests.yml
         if: steps.cache.outputs.cache-hit != 'true'
 
       - name: Install Larch
@@ -432,8 +420,8 @@ jobs:
 
       - name: Conda checkup
         run: |
-          mamba info -a
-          mamba list
+          conda info -a
+          conda list
 
       - name: Test Estimation Mode
         run: |
@@ -452,15 +440,13 @@ jobs:
         with:
           fetch-depth: 0  # get all tags, lets setuptools_scm do its thing
       - name: Set up Python 3.10
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Install dependencies
         uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
           miniforge-version: latest
-          use-mamba: true
           environment-file: conda-environments/docbuild.yml
           python-version: "3.10"
           activate-environment: docbuild

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'ActivitySim/activitysim'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: "3.10"
@@ -39,7 +39,7 @@ jobs:
           else
             echo "✅ Looks good"
           fi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: releases
           path: dist
@@ -48,11 +48,11 @@ jobs:
     needs: build-artifacts
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: "3.10"
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v4
         with:
           name: releases
           path: dist
@@ -84,13 +84,13 @@ jobs:
       run:
         shell: bash -l {0}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: releases
           path: dist
       - name: Set up Python 3.10
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Install dependencies
@@ -132,7 +132,7 @@ jobs:
     if: github.event_name == 'release'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v4
         with:
           name: releases
           path: dist

diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -12,10 +12,10 @@ jobs:
   build-artifacts:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: "3.10"
@@ -43,7 +43,7 @@ jobs:
           else
             echo "✅ Looks good"
           fi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: releases
           path: dist
@@ -52,11 +52,11 @@ jobs:
     needs: build-artifacts
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: "3.10"
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v4
         with:
           name: releases
           path: dist

diff --git a/activitysim/abm/models/util/logsums.py b/activitysim/abm/models/util/logsums.py
@@ -167,7 +167,10 @@ def compute_location_choice_logsums(
     )
 
     nest_spec = config.get_logit_model_settings(logsum_settings)
-    nest_spec = simulate.eval_nest_coefficients(nest_spec, coefficients, trace_label)
+    if nest_spec is not None:  # nest_spec is None for MNL
+        nest_spec = simulate.eval_nest_coefficients(
+            nest_spec, coefficients, trace_label
+        )
 
     locals_dict = {}
     # model_constants can appear in expressions

diff --git a/activitysim/core/configuration/filesystem.py b/activitysim/core/configuration/filesystem.py
@@ -134,6 +134,18 @@ def _parse_arg(name, x):
 
         return self
 
+    def parse_settings(self, settings):
+        def _parse_setting(name, x):
+            v = getattr(settings, x, None)
+            if v is not None:
+                setattr(self, name, v)
+
+        _parse_setting("cache_dir", "cache_dir")
+        _parse_setting("sharrow_cache_dir", "sharrow_cache_dir")
+        _parse_setting("profile_dir", "profile_dir")
+        _parse_setting("pipeline_file_name", "pipeline_file_name")
+        return
+
     def get_working_subdir(self, subdir) -> Path:
         if self.working_dir:
             return self.working_dir.joinpath(subdir)

diff --git a/activitysim/core/mp_tasks.py b/activitysim/core/mp_tasks.py
@@ -887,6 +887,7 @@ def setup_injectables_and_logging(injectables, locutor: bool = True) -> workflow
     state = workflow.State()
     state = state.initialize_filesystem(**injectables)
     state.settings = injectables.get("settings", Settings())
+    state.filesystem.parse_settings(state.settings)
 
     # register abm steps and other abm-specific injectables
     # by default, assume we are running activitysim.abm