[WIP] Fixing intel workflow

OpenSEMBA · Dec 14, 2024 · 1247ad3 · 1247ad3
1 parent 6e3d227
commit 1247ad3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/ubuntu-gnu.yml b/.github/workflows/ubuntu-gnu.yml
@@ -20,7 +20,7 @@ jobs:
             mpi: "Yes"
             mtln: "No"
 
-    name: ubuntu ${{matrix.build-type}} - mpi ${{matrix.mpi}} - mtln ${{matrix.mtln}}
+    name: ubuntu-gnu ${{matrix.build-type}} - mpi ${{matrix.mpi}} - mtln ${{matrix.mtln}}
 
     steps:       
     - name: Checkout

diff --git a/.github/workflows/ubuntu-intel.yml b/.github/workflows/ubuntu-intel.yml
@@ -1,10 +1,6 @@
 name: ubuntu-intel
 
 on:
-  push:
-    branches:
-      - dev
-
   pull_request:
     branches:
       - main
@@ -16,8 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix: 
-        optimization-type: ["Debug", "Release"]
-        mpi-build: ["No", "Yes"]
+        build-type: ["Debug", "Release"]
+        mpi: ["Yes"]
+        mtln: ["No"]
+
+
+    name: ubuntu-intel ${{matrix.build-type}} - mpi ${{matrix.mpi}} - mtln ${{matrix.mtln}}
 
     steps:
 
@@ -39,7 +39,7 @@ jobs:
 
     - name: CMake build
       run: |
-        cmake -S . -B build -DCMAKE_BUILD_TYPE=${{matrix.optimization-type}} -DSEMBA_FDTD_ENABLE_MPI=${{matrix.mpi-build}} -DSEMBA_FDTD_ENABLE_MTLN=NO
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=${{matrix.build-type}} -DSEMBA_FDTD_ENABLE_MPI=${{matrix.mpi}} -DSEMBA_FDTD_ENABLE_MTLN=${{matrix.mtln}}
         cmake --build build -j
         
     - name: Run fdtd unit tests
@@ -51,7 +51,10 @@ jobs:
       run: |
         python -m pip install -r requirements.txt
 
-    - name: Run wrapper tests
-      timeout-minutes: 60
-      run: |
-        python -m pytest test    
+    - name: Run all wrapper tests
+      if: matrix.mtln=='Yes'
+      run: python -m pytest test/
+
+    - name: Run non-mtln wrapper tests
+      if: matrix.mtln=='No'
+      run: python -m pytest -m 'not mtln' test/