Merge branch 'master' into mfem_47_dev

mfem · Aug 6, 2024 · 84f7257 · 84f7257
2 parents 69246d5 + f100218
commit 84f7257
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/.github/workflows/build-and-test-callable.yml b/.github/workflows/build-and-test-callable.yml
@@ -98,6 +98,9 @@ jobs:
         sudo apt-get install mpich libmpich-dev
         pip install mpi4py
 
+    - name: Purge PIP cache
+      run: pip cache purge
+
     - name: Cache CUDA
       if: inputs.cuda
       id: cache-cuda

diff --git a/.github/workflows/build-and-test-dispatch.yml b/.github/workflows/build-and-test-dispatch.yml
@@ -15,30 +15,48 @@ on:
         options:
           - 'defaults'
           - 'fast'
+          - 'cuda'
+          - 'libceed'
+          - 'gslib'
           - 'all'
   pull_request:
 
 jobs:
   # -------------------------------------------------------------------------------------------------
   # Build and test whole matrix of options on linux
   # -------------------------------------------------------------------------------------------------
-  test-linux:
+  test-linux-serial:
     if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }}
     strategy:
       fail-fast: false
       matrix:
         mfem-branch: [master, default] # 'default' uses a specific commit hash defined in setup.py:repos_sha
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] # 3.12 is not supported by scipy
-        parallel: [false, true]
+        parallel: [false]
     name: test-linux | ${{ matrix.mfem-branch }} | ${{ matrix.python-version }} | ${{ matrix.parallel && 'parallel' || 'serial' }}
     uses: ./.github/workflows/build-and-test-callable.yml
     with:
       os: ubuntu-latest
       mfem-branch: ${{ matrix.mfem-branch }}
       python-version: ${{ matrix.python-version }}
       parallel: ${{ matrix.parallel }}
-
-
+
+test-linux-parallel:
+    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        mfem-branch: [master, default] # 'default' uses a specific commit hash defined in setup.py:repos_sha
+        python-version: ['3.9', '3.10', '3.11'] # 3.12 is not supported by scipy
+        parallel: [true]
+    name: test-linux | ${{ matrix.mfem-branch }} | ${{ matrix.python-version }} | ${{ matrix.parallel && 'parallel' || 'serial' }}
+    uses: ./.github/workflows/build-and-test-callable.yml
+    with:
+      os: ubuntu-latest
+      mfem-branch: ${{ matrix.mfem-branch }}
+      python-version: ${{ matrix.python-version }}
+      parallel: ${{ matrix.parallel }}
+
   # -------------------------------------------------------------------------------------------------
   # Fast test
   # -------------------------------------------------------------------------------------------------
@@ -73,21 +91,21 @@ jobs:
       mfem-branch: ${{ matrix.mfem-branch }}
 
   test-cuda:
-    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }}
+    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'cuda'}}
     uses: ./.github/workflows/build-and-test-callable.yml
     with:
       cuda: true
     name: test-cuda
 
   test-libceed:
-    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }}
+    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'libceed'}}
     uses: ./.github/workflows/build-and-test-callable.yml
     with:
       libceed: true
     name: test-libceed
 
   test-gslib:
-    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }}
+    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'gslib'}}
     uses: ./.github/workflows/build-and-test-callable.yml
     with:
       gslib: true
@@ -99,4 +117,4 @@ jobs:
   test-defaults:
     if: ${{ github.event_name == 'workflow_dispatch' && inputs.test_options == 'defaults' }}
     uses: ./.github/workflows/build-and-test-callable.yml
-    name: test-defaults
+    name: test-defaults