Merge 2c56a44 into 5fd6376

Libensemble · Jan 10, 2023 · c8079d3 · c8079d3
2 parents 5fd6376 + 2c56a44
commit c8079d3
Show file tree

Hide file tree

Showing 29 changed files with 1,375 additions and 1,700 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,10 +27,6 @@ jobs:
                       mpi-version: "openmpi=4.1.2"
                       python-version: "3.10"
                       comms-type: l
-                    - os: ubuntu-latest
-                      python-version: "3.10"
-                      comms-type: l
-                      mpi-version: "mpich"
                     # - os: windows-latest
                     #   python-version: "3.10"
                     #   comms-type: l
@@ -61,6 +57,20 @@ jobs:
             channel-priority: flexible
             auto-update-conda: true
 
+        - uses: actions/cache@v3
+          name: Cache installed dependencies
+          id: cache
+          if: matrix.os == 'ubuntu-latest'
+          with:
+            path: |
+              /home/runner/work/libensemble/libensemble/heffte/build/
+              /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 }}
+
         - name: Force-update certifi
           run: |
             python --version
@@ -81,9 +91,9 @@ jobs:
         - name: Install macOS compilers and older SDK
           if: matrix.os == 'macos-latest'
           run: |
-            wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.14.sdk.tar.xz
-            mkdir ../sdk; tar xf MacOSX10.14.sdk.tar.xz -C ../sdk
-            conda install clang_osx-64=9.0.1
+            wget https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.15.sdk.tar.xz
+            mkdir ../sdk; tar xf MacOSX10.15.sdk.tar.xz -C ../sdk
+            conda install clang_osx-64
 
         # - name: Setup MPI (${{ matrix.mpi-version }})
         #   uses: mpi4py/setup-mpi@v1
@@ -108,21 +118,15 @@ jobs:
             pip install mpi4py
 
         - name: Install generator dependencies
-          if: contains('3.8_3.9_3.10_3.11', matrix.python-version) && matrix.os != 'windows-latest'
+          if: matrix.os != 'windows-latest' && steps.cache.outputs.cache-hit != 'true'
           run: |
             python -m pip install --upgrade pip
-            conda install nlopt
-            conda install scipy
-            conda install superlu_dist
-            conda install hypre
-            conda install mumps-mpi
-            conda install petsc
-            conda install petsc4py
-            pip install DFO-LS
+            conda env update --file install/gen_deps_environment.yml
 
+            pip install DFO-LS
             pip install mpmath
             pip install ax-platform==0.2.8
-            python -m pip install --upgrade git+https://github.com/mosesyhc/surmise.git@development/PCGPwM
+            pip install --upgrade git+https://github.com/mosesyhc/surmise.git@development/PCGPwM
 
         # - name: Install some generator dependencies on Windows
         #   if: matrix.os == 'windows-latest'
@@ -133,10 +137,9 @@ jobs:
         #     pip install mpmath
 
         - name: Install generator dependencies for Ubuntu tests
-          if: matrix.os == 'ubuntu-latest'
+          if: matrix.os == 'ubuntu-latest' && steps.cache.outputs.cache-hit != 'true'
           run: |
-            sudo apt-get update
-            sudo apt-get install octave
+            conda install octave
             sudo apt-get install bc
 
             # begin heffte build and dependencies
@@ -156,27 +159,24 @@ jobs:
             pip install git+https://github.com/jlnav/dragonfly.git@fix/remove_npobject
 
             pip install ax-platform
-
-            pip install scikit-build
-            # git clone https://github.com/ORNL/TASMANIAN.git
-            # cd TASMANIAN/InterfacePython/PipInstaller; pip install -e .; cd -
-            # pip install git+https://github.com/jlnav/TASMANIAN.git@fix/setuppy_deprecate_LegacyVersion
-
             pip install scikit-build packaging Tasmanian --user
 
+        - name: Copy heffte exe on cache-hit
+          if: matrix.os == 'ubuntu-latest' && steps.cache.outputs.cache-hit != 'false'
+          run: |
+            cd /home/runner/work/libensemble/libensemble
+            cp ./heffte/build/benchmarks/speed3d_c2c ./libensemble/tests/regression_tests/
+
         - name: Install other testing dependencies
           run: |
             conda install pyzmq
             pip install -r install/testing_requirements.txt
-            pip install psutil
-            pip install pyyaml
-            pip install tomli
-            pip install funcx==1.0.4
+            pip install -r install/misc_feature_requirements.txt
             git clone https://github.com/argonne-lcf/balsam.git
             sed -i -e "s/pyzmq>=22.1.0,<23.0.0/pyzmq>=23.0.0,<24.0.0/" ./balsam/setup.cfg
             cd balsam; pip install -e .; cd ..
 
-        - name: Find MPI, Install libEnsemble, flake8, ulimit adjust
+        - name: Install libEnsemble, flake8, lock environment
           run: |
             pip install -e .
             flake8 libensemble
@@ -186,8 +186,14 @@ jobs:
           run: |
             mv libensemble/tests/unit_tests/mpich-only_test_api.py libensemble/tests/unit_tests/test_alt_api.py
 
-        - name: Run extensive tests, Ubuntu, Python 3.8-3.11
-          if: matrix.os == 'ubuntu-latest' && contains('3.8_3.9_3.10_3.11', matrix.python-version)
+        - name: Experiment with running multiple pytest workers
+          run: |
+            pip install pytest-xdist
+            cd libensemble/tests/unit_tests; pytest -n auto --runextra .
+            cd -
+
+        - name: Run extensive tests, Ubuntu
+          if: matrix.os == 'ubuntu-latest'
           run: |
            ./libensemble/tests/run-tests.sh -e -A "-W error" -z -${{ matrix.comms-type }}
 
@@ -199,7 +205,7 @@ jobs:
         - name: Run extensive tests, macOS
           if: matrix.os == 'macos-latest'
           env:
-              CONDA_BUILD_SYSROOT: /Users/runner/work/libensemble/sdk/MacOSX10.14.sdk
+              CONDA_BUILD_SYSROOT: /Users/runner/work/libensemble/sdk/MacOSX10.15.sdk
           run: |
             ./libensemble/tests/run-tests.sh -e -A "-W error" -z -${{ matrix.comms-type }}
 

diff --git a/install/gen_deps_environment.yml b/install/gen_deps_environment.yml
@@ -0,0 +1,15 @@
+name: condaenv
+
+channels:
+  - conda-forge
+
+dependencies:
+  - pip
+  - numpy
+  - nlopt
+  - scipy
+  - superlu_dist
+  - hypre
+  - mumps-mpi
+  - petsc
+  - petsc4py
diff --git a/install/misc_feature_requirements.txt b/install/misc_feature_requirements.txt
@@ -0,0 +1,3 @@
+PyYAML==6.0
+tomli==2.0.1
+funcx==1.0.4
diff --git a/libensemble/tests/functionality_tests/test_1d_sampling_from_files.py b/libensemble/tests/functionality_tests/test_1d_sampling_from_files.py
diff --git a/libensemble/tests/functionality_tests/test_1d_sampling_with_profile.py b/libensemble/tests/functionality_tests/test_1d_sampling_with_profile.py
diff --git a/libensemble/tests/functionality_tests/test_calc_exception.py b/libensemble/tests/functionality_tests/test_calc_exception.py