Update intel test, as in GRChombo

GRTLCollaboration · Nov 1, 2024 · e1c8afb · e1c8afb
1 parent cf16ed4
commit e1c8afb
Showing 1 changed file with 27 additions and 9 deletions.
diff --git a/.github/workflows/run-grdzhadzha-tests-intel.yml b/.github/workflows/run-grdzhadzha-tests-intel.yml
@@ -4,10 +4,21 @@ on: [push]
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        mpi: ['FALSE', 'TRUE']
+        opt: ['FALSE', 'TRUE']
+        include:
+          - debug: 'TRUE'
+            opt: 'FALSE'
+          - debug: 'FALSE'
+            opt: 'TRUE'
+    name: MPI = ${{ matrix.mpi }}, OPT = ${{ matrix.opt }}
     env:
       CHOMBO_HOME: ${{ github.workspace }}/Chombo/lib
       OMP_NUM_THREADS: 1
+      BUILD_ARGS: MPI=${{ matrix.mpi}} OPT=${{ matrix.opt }} DEBUG=${{ matrix.debug }}
       GRCHOMBO_HOME: ${{ github.workspace }}/GRChombo
       GRCHOMBO_SOURCE: ${{ github.workspace }}/GRChombo/Source
 
@@ -34,29 +45,36 @@ jobs:
         sudo apt-get update
         sudo apt-get -y --no-install-recommends install csh libgetopt-complete-perl
 
-    - name: Install Intel compilers/MPI
+    - name: Install Intel compilers
       run: |
-        wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-        sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-        sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
-        sudo apt-get -y install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-compiler-fortran intel-oneapi-mkl intel-oneapi-mpi intel-oneapi-mpi-devel intel-oneapi-openmp
+        wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
+        | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
+        echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
+        sudo apt-get update
+        sudo apt-get -y install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2023.2.4 intel-oneapi-compiler-fortran-2023.2.4 intel-oneapi-mkl-2023.2.0 intel-oneapi-openmp-2023.2.4
       working-directory: /tmp
+
+    - name: Instal Intel MPI
+      if: matrix.mpi == 'TRUE'
+      run: |
+        sudo apt-get -y install intel-oneapi-mpi intel-oneapi-mpi-devel 
+
 
     - name: Build Chombo
       run: |
         source /opt/intel/oneapi/setvars.sh
         cp $GRCHOMBO_HOME/InstallNotes/MakeDefsLocalExamples/intel-classic-no-hdf5-minimal.Make.defs.local $CHOMBO_HOME/mk/Make.defs.local
-        make -j 4 AMRTimeDependent AMRTools BaseTools BoxTools
+        make -j 4 AMRTimeDependent AMRTools BaseTools BoxTools $BUILD_ARGS
       working-directory: ${{ env.CHOMBO_HOME }}
 
     - name: Build GRDzhadzha Tests
       run: |
         source /opt/intel/oneapi/setvars.sh
-        make test -j 4
+        make test -j 4 $BUILD_ARGS
       working-directory: ${{ github.workspace }}/GRDzhadzha
 
     - name: Run GRDzhadzha Tests
       run: |
         source /opt/intel/oneapi/setvars.sh
-        make run -j 2
+        make run -j 2 $BUILD_ARGS
       working-directory: ${{ github.workspace }}/GRDzhadzha