45 only run the unit tests which touch changed code in the CI

.github/actions/compile/action.yml

@@ -17,3 +17,6 @@ runs:
           struphy compile -d -y &&
           struphy compile -y --language ${{ matrix.compile-language }}
         )
+        struphy compile --status
+        struphy --refresh-models
+

.github/actions/tests/unit-mpi/action.yml

@@ -0,0 +1,10 @@
+name: "Run unit tests with MPI"
+
+runs:
+  using: composite
+  steps:
+    - name: Run unit tests with MPI
+      shell: bash
+      run: |
+        pip install mpi4py
+        struphy test unit --mpi 2

.github/actions/tests/unit/action.yml

@@ -3,19 +3,17 @@ name: "Run unit tests"
 runs:
   using: composite
   steps:
-    - name: Run unit tests with MPI
-      shell: bash
-      run: |
-        struphy compile --status
-        struphy --refresh-models
-        struphy test unit --mpi 2
 
-    - name: Run unit tests
+    - name: Uninstall MPI
       shell: bash
       run: |
-        struphy compile --status
-        struphy --refresh-models
         pip show mpi4py
         pip uninstall -y mpi4py
         pip list
+
+    - name: Run unit tests without MPI
+      shell: bash
+      env:
+        TESTMON_DATAFILE: ${{ github.workspace }}/.testmondata-${{ matrix.test-type }}
+      run: |
         struphy test unit

.github/workflows/macos-latest.yml

@@ -9,9 +9,9 @@
 #       - main
 #       - devel
 
-# # concurrency:
-# #   group: ${{ github.ref }}
-# #   cancel-in-progress: true
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: true
 
 # jobs:
 #   macos-latest-build:

.github/workflows/static_analysis.yml

@@ -10,9 +10,10 @@ on:
       - main
       - devel
 
-# concurrency:
-#   group: ${{ github.ref }}
-#   cancel-in-progress: true
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash

.github/workflows/testing.yml

@@ -17,8 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.12"]
-        compile-language: ["fortran", "c"]
-        test-type: ["unit", "model", "quickstart", "tutorials"]
+        compile-language: ["fortran"] #, "c"]
+        test-type: ["unit"] #, "model", "quickstart", "tutorials"]
 
     steps:
       # Checkout the repository
@@ -43,7 +43,21 @@ jobs:
           key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
           restore-keys: |
             ${{ runner.os }}-pip-
+
+      - uses: actions/cache@v4
+        with:
+          path: .testmondata-${{ matrix.test-type }}
+          key: testmon-${{ matrix.test-type }}-${{ github.sha }}
+          restore-keys: |
+            testmon-${{ matrix.test-type }}-${{ github.ref }}-
+            testmon-${{ matrix.test-type }}-${{ github.ref_name }}-
+            testmon-${{ matrix.test-type }}-refs/heads/devel-
+            testmon-${{ matrix.test-type }}-devel-
+            testmon-${{ matrix.test-type }}-
 
+      - name: Check .testmondata
+        run: ls -la testmon* || echo "No .testmondata"
+
       # Install prereqs
       # I don't think it's possible to use a single action for this because
       # we can't use ${inputs.os} in an if statement, so we have to use two different actions.
@@ -81,6 +95,10 @@ jobs:
       - name: Run unit tests
         if: matrix.test-type == 'unit'
         uses: ./.github/actions/tests/unit
+
+      - name: Run unit tests with MPI
+        if: matrix.test-type == 'unit'
+        uses: ./.github/actions/tests/unit-mpi
 
       - name: Run model tests
         if: matrix.test-type == 'model'
@@ -93,3 +111,10 @@ jobs:
       - name: Run tutorials
         if: matrix.test-type == 'tutorials'
         uses: ./.github/actions/tests/tutorials
+
+      # Upload .testmondata as cache for later tests
+      - uses: actions/cache/save@v4
+        if: always()
+        with:
+          path: .testmondata-${{ matrix.test-type }}
+          key: testmon-${{ matrix.test-type }}-${{ github.sha }}

.github/workflows/ubuntu-latest.yml

@@ -9,9 +9,9 @@ on:
       - main
       - devel
 
-# concurrency:
-#   group: ${{ github.ref }}
-#   cancel-in-progress: true
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   ubuntu-latest-build:

.gitignore

@@ -88,6 +88,7 @@ code_analysis_report.html
 src/struphy/io/out/
 src/struphy/state.yml
 src/struphy/io/inp/params_*
+struphy_verification_tests/
 
 # models list
 src/struphy/models/models_list

pyproject.toml

@@ -35,6 +35,7 @@ dependencies = [
     'argcomplete',
     'pytest',
     'pytest-mpi',
+    'pytest-testmon',
     'line_profiler',
 ]
 
@@ -133,6 +134,7 @@ kinetic-diagnostics = "struphy.diagnostics.console_diagn:main"
 struphy = [
     "compile_struphy.mk",
     "psydac-2.5.0.dev0-py3-none-any.whl",
+    "conftest.py",
 ]
 
 [tool.autopep8]
@@ -182,3 +184,5 @@ markers = [
     "hybrid",
     "single",
 ]
+
+

src/struphy/console/test.py

@@ -1,5 +1,10 @@
+import os
+
+import struphy
 from struphy.utils.utils import subp_run
 
+LIBPATH = struphy.__path__[0]
+
 
 def struphy_test(
     group: str,
@@ -41,15 +46,15 @@ def struphy_test(
                 "-n",
                 str(mpi),
                 "pytest",
-                "-k",
-                "not _models and not _tutorial and not pproc",
+                # "--testmon",
                 "--with-mpi",
+                f"{LIBPATH}/tests/unit/",
             ]
         else:
             cmd = [
                 "pytest",
-                "-k",
-                "not _models and not _tutorial and not pproc",
+                "--testmon",
+                f"{LIBPATH}/tests/unit/",
             ]
 
         if with_desc:
@@ -59,6 +64,8 @@ def struphy_test(
         if show_plots:
             cmd += ["--show-plots"]
 
+        # Run in the current directory
+        cwd = os.getcwd()
         subp_run(cmd)
 
     elif group in {"models", "fluid", "kinetic", "hybrid", "toy"}:
@@ -69,21 +76,21 @@ def struphy_test(
                 "-n",
                 str(mpi),
                 "pytest",
-                "-k",
-                "_models",
                 "-m",
                 group,
                 "-s",
+                # "--testmon",
                 "--with-mpi",
+                f"{LIBPATH}/tests/models/",
             ]
         else:
             cmd = [
                 "pytest",
-                "-k",
-                "_models",
                 "-m",
                 group,
                 "-s",
+                "--testmon",
+                f"{LIBPATH}/tests/models/",
             ]
 
         if vrbose:
@@ -92,6 +99,9 @@ def struphy_test(
             cmd += ["--nclones", f"{nclones}"]
         if show_plots:
             cmd += ["--show-plots"]
+
+        # Run in the current directory
+        cwd = os.getcwd()
         subp_run(cmd)
 
     elif "verification" in group:
@@ -102,17 +112,17 @@ def struphy_test(
                 "-n",
                 str(mpi),
                 "pytest",
-                "-k",
-                "_verif_",
                 "-s",
+                # "--testmon",
                 "--with-mpi",
+                f"{LIBPATH}/tests/verification/",
             ]
         else:
             cmd = [
                 "pytest",
-                "-k",
-                "_verif_",
                 "-s",
+                "--testmon",
+                f"{LIBPATH}/models/tests/verification/",
             ]
 
         if vrbose:
@@ -121,6 +131,9 @@ def struphy_test(
             cmd += ["--nclones", f"{nclones}"]
         if show_plots:
             cmd += ["--show-plots"]
+
+        # Run in the current directory
+        cwd = os.getcwd()
         subp_run(cmd)
 
     else:
@@ -130,11 +143,10 @@ def struphy_test(
             "-n",
             str(mpi),
             "pytest",
-            "-k",
-            "_models",
             "-m",
             "single",
             "-s",
+            # "--testmon",
             "--with-mpi",
             "--model-name",
             group,
@@ -145,4 +157,7 @@ def struphy_test(
             cmd += ["--nclones", f"{nclones}"]
         if show_plots:
             cmd += ["--show-plots"]
+
+        # Run in the current directory
+        cwd = os.getcwd()
         subp_run(cmd)

src/struphy/linear_algebra/saddle_point.py

@@ -7,7 +7,7 @@
 from psydac.linalg.direct_solvers import SparseSolver
 from psydac.linalg.solvers import inverse
 
-from struphy.linear_algebra.tests.test_saddlepoint_massmatrices import _plot_residual_norms
+from struphy.tests.unit.linear_algebra.test_saddlepoint_massmatrices import _plot_residual_norms
 
 
 class SaddlePointSolver:

src/struphy/pic/tests/test_accumulation.py → src/struphy/tests/unit/pic/test_accumulation.py

@@ -61,8 +61,8 @@ def pc_lin_mhd_6d_step_ph_full(Nel, p, spl_kind, mapping, Np, verbose=False):
     from struphy.pic.accumulation import accum_kernels
     from struphy.pic.accumulation.particles_to_grid import Accumulator
     from struphy.pic.particles import Particles6D
-    from struphy.pic.tests.test_pic_legacy_files.accumulation_kernels_3d import kernel_step_ph_full
     from struphy.pic.utilities import BoundaryParameters, LoadingParameters, WeightsParameters
+    from struphy.tests.unit.pic.test_pic_legacy_files.accumulation_kernels_3d import kernel_step_ph_full
 
     if isinstance(MPI.COMM_WORLD, MockComm):
         mpi_comm = None

src/struphy/pic/tests/test_pic_legacy_files/accumulation.py → src/struphy/tests/unit/pic/test_pic_legacy_files/accumulation.py

@@ -12,11 +12,11 @@
 import scipy.sparse as spa
 from psydac.ddm.mpi import mpi as MPI
 
-import struphy.pic.tests.test_pic_legacy_files.accumulation_kernels_3d as pic_ker_3d
+import struphy.tests.unit.pic.test_pic_legacy_files.accumulation_kernels_3d as pic_ker_3d
 
-# import struphy.pic.tests.test_pic_legacy_files.accumulation_kernels_2d as pic_ker_2d
+# import struphy.tests.unit.pic.test_pic_legacy_files.accumulation_kernels_2d as pic_ker_2d
 
-# from struphy.pic.tests.test_pic_legacy_files.control_variate import TermsControlVariate
+# from struphy.tests.unit.pic.test_pic_legacy_files.control_variate import TermsControlVariate
 
 
 class Accumulator:

src/struphy/pic/tests/test_pic_legacy_files/accumulation_kernels_3d.py → src/struphy/tests/unit/pic/test_pic_legacy_files/accumulation_kernels_3d.py

@@ -4,8 +4,8 @@
 import struphy.linear_algebra.linalg_kernels as linalg
 
 # import module for mapping evaluation
-import struphy.pic.tests.test_pic_legacy_files.mappings_3d_fast as mapping_fast
-import struphy.pic.tests.test_pic_legacy_files.spline_evaluation_3d as eva3
+import struphy.tests.unit.pic.test_pic_legacy_files.mappings_3d_fast as mapping_fast
+import struphy.tests.unit.pic.test_pic_legacy_files.spline_evaluation_3d as eva3
 
 
 # ==============================================================================

src/struphy/pic/tests/test_pic_legacy_files/mappings_3d.py → src/struphy/tests/unit/pic/test_pic_legacy_files/mappings_3d.py

@@ -28,8 +28,8 @@
 
 from numpy import arcsin, arctan2, cos, empty, pi, shape, sin, sqrt
 
-import struphy.pic.tests.test_pic_legacy_files.spline_evaluation_2d as eva_2d
-import struphy.pic.tests.test_pic_legacy_files.spline_evaluation_3d as eva_3d
+import struphy.tests.unit.pic.test_pic_legacy_files.spline_evaluation_2d as eva_2d
+import struphy.tests.unit.pic.test_pic_legacy_files.spline_evaluation_3d as eva_3d
 
 
 # =======================================================================

src/struphy/pic/tests/test_pic_legacy_files/mappings_3d_fast.py → src/struphy/tests/unit/pic/test_pic_legacy_files/mappings_3d_fast.py

@@ -9,9 +9,9 @@
 from numpy import cos, empty, pi, sin
 
 import struphy.bsplines.bsplines_kernels as bsp
-import struphy.pic.tests.test_pic_legacy_files.mappings_3d as mapping
-from struphy.pic.tests.test_pic_legacy_files.spline_evaluation_2d import evaluation_kernel_2d
-from struphy.pic.tests.test_pic_legacy_files.spline_evaluation_3d import evaluation_kernel_3d
+import struphy.tests.unit.pic.test_pic_legacy_files.mappings_3d as mapping
+from struphy.tests.unit.pic.test_pic_legacy_files.spline_evaluation_2d import evaluation_kernel_2d
+from struphy.tests.unit.pic.test_pic_legacy_files.spline_evaluation_3d import evaluation_kernel_3d
 
 
 # ==========================================================================

src/struphy/pic/tests/test_pic_legacy_files/pusher.py → src/struphy/tests/unit/pic/test_pic_legacy_files/pusher.py

@@ -1,8 +1,8 @@
 import cunumpy as xp
 
-import struphy.pic.tests.test_pic_legacy_files.pusher_pos as push_pos
-import struphy.pic.tests.test_pic_legacy_files.pusher_vel_2d as push_vel_2d
-import struphy.pic.tests.test_pic_legacy_files.pusher_vel_3d as push_vel_3d
+import struphy.tests.unit.pic.test_pic_legacy_files.pusher_pos as push_pos
+import struphy.tests.unit.pic.test_pic_legacy_files.pusher_vel_2d as push_vel_2d
+import struphy.tests.unit.pic.test_pic_legacy_files.pusher_vel_3d as push_vel_3d
 
 
 class Pusher:

src/struphy/pic/tests/test_pic_legacy_files/pusher_pos.py → src/struphy/tests/unit/pic/test_pic_legacy_files/pusher_pos.py

@@ -8,9 +8,9 @@
 import struphy.linear_algebra.linalg_kernels as linalg
 
 # import modules for mapping evaluation
-import struphy.pic.tests.test_pic_legacy_files.mappings_3d as mapping
-import struphy.pic.tests.test_pic_legacy_files.mappings_3d_fast as mapping_fast
-import struphy.pic.tests.test_pic_legacy_files.spline_evaluation_3d as eva3
+import struphy.tests.unit.pic.test_pic_legacy_files.mappings_3d as mapping
+import struphy.tests.unit.pic.test_pic_legacy_files.mappings_3d_fast as mapping_fast
+import struphy.tests.unit.pic.test_pic_legacy_files.spline_evaluation_3d as eva3
 
 
 # ==========================================================================================================