diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index dcdbd047d..8373f298c 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -63,19 +63,6 @@ jobs: channel-priority: flexible auto-update-conda: true - - uses: actions/cache/restore@v4 - name: Restore cached dependencies - id: cache - if: matrix.os == 'ubuntu-latest' - with: - path: | - /home/runner/.local - /usr/share/miniconda3/envs/condaenv - /usr/share/miniconda3/bin - /usr/share/miniconda3/lib - /usr/share/miniconda3/include - key: libe-${{ github.ref_name }}-${{ matrix.python-version }}-${{ matrix.comms-type }}-${{ matrix.pydantic-version }}-basic - - name: Force-update certifi run: | python --version @@ -115,18 +102,6 @@ jobs: pip install mpmath matplotlib conda install numpy nlopt scipy - - uses: actions/cache/save@v4 - name: Save dependencies to cache - if: matrix.os == 'ubuntu-latest' - with: - path: | - /home/runner/.local - /usr/share/miniconda3/envs/condaenv - /usr/share/miniconda3/bin - /usr/share/miniconda3/lib - /usr/share/miniconda3/include - key: libe-${{ github.ref_name }}-${{ matrix.python-version }}-${{ matrix.comms-type }} - - name: Install libEnsemble, flake8 run: | pip install pydantic==${{ matrix.pydantic-version }} diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index ff3516ce9..3b16f9e3f 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -67,19 +67,6 @@ jobs: channel-priority: flexible auto-update-conda: true - - uses: actions/cache/restore@v4 - name: Restore cached dependencies - id: cache - if: matrix.os == 'ubuntu-latest' - with: - path: | - /home/runner/.local - /usr/share/miniconda3/envs/condaenv - /usr/share/miniconda3/bin - /usr/share/miniconda3/lib - /usr/share/miniconda3/include - key: libe-${{ github.ref_name }}-${{ matrix.python-version }}-${{ matrix.comms-type }}-${{ matrix.pydantic-version }}-extra - - name: Force-update certifi run: | python --version @@ -96,31 +83,20 @@ jobs: conda install clang_osx-64 - name: Install mpi4py and MPI from conda - if: (matrix.python-version != '3.10' && matrix.os == 'ubuntu-latest') || matrix.os == 'macos-latest' run: | conda install mpi4py ${{ matrix.mpi-version }} - - name: Install mpi4py from pip, MPI from conda - if: matrix.python-version == '3.10' && matrix.os == 'ubuntu-latest' - run: | - conda install ${{ matrix.mpi-version }} - pip install mpi4py - - name: Install generator dependencies run: | - python -m pip install --upgrade pip conda env update --file install/gen_deps_environment.yml - #- name: Install ax-platform - # run: pip install "ax-platform<=0.4.0" - - name: Install gpcam if: matrix.python-version != '3.12' run: | pip install gpcam - name: Install surmise - if: matrix.os != 'macos-latest' + if: matrix.os == 'ubuntu-latest' run: | pip install --upgrade git+https://github.com/bandframework/surmise.git @@ -154,18 +130,6 @@ jobs: pip install -e . popd - - uses: actions/cache/save@v4 - name: Save dependencies to cache - if: matrix.os == 'ubuntu-latest' - with: - path: | - /home/runner/.local - /usr/share/miniconda3/envs/condaenv - /usr/share/miniconda3/bin - /usr/share/miniconda3/lib - /usr/share/miniconda3/include - key: libe-${{ github.ref_name }}-${{ matrix.python-version }}-${{ matrix.comms-type }} - - name: Install libEnsemble, flake8, lock environment run: | pip install pydantic==${{ matrix.pydantic-version }} @@ -178,7 +142,7 @@ jobs: # rm ./libensemble/tests/regression_tests/test_gpCAM.py rm ./libensemble/tests/regression_tests/test_persistent_gp.py - - name: Remove test for persistent Tasmanian on Python 3.12 + - name: Remove test for persistent Tasmanian, Surmise on Python 3.12 if: matrix.python-version >= '3.12' run: | rm ./libensemble/tests/regression_tests/test_persistent_tasmanian.py @@ -209,16 +173,10 @@ jobs: with: redis-version: 7 - - name: Run extensive tests, Ubuntu - if: matrix.os == 'ubuntu-latest' + - name: Run extensive tests run: | ./libensemble/tests/run-tests.sh -e -z -${{ matrix.comms-type }} - - name: Run extensive tests, macOS - if: matrix.os == 'macos-latest' - run: | - ./libensemble/tests/run-tests.sh -e -z -${{ matrix.comms-type }} - - name: Merge coverage run: | mv libensemble/tests/.cov* .