Move some Intel compiler options to the idfx_test module

Author: Marc Coiffier

.github/workflows/idefix-ci.yml

@@ -28,7 +28,7 @@ jobs:
     name: CPU Jobs (icc)
     uses: ./.github/workflows/idefix-ci-jobs.yml
     with:
-      TESTME_OPTIONS: -Werror
+      TESTME_OPTIONS: -intel -Werror
       IDEFIX_COMPILER: icc
 
   gcc-jobs:
@@ -45,4 +45,4 @@ jobs:
     uses: ./.github/workflows/idefix-ci-jobs.yml
     with:
       TESTME_OPTIONS: -cuda -Werror
-      IDEFIX_COMPILER: cuda
+      IDEFIX_COMPILER: nvcc

pytools/idfx_test.py

@@ -58,6 +58,10 @@ def __init__ (self):
                         help="Test on Nvidia GPU using CUDA",
                         action="store_true")
 
+    parser.add_argument("-intel",
+                        help="Test compiling with Intel OneAPI",
+                        action="store_true")
+
     parser.add_argument("-hip",
                         help="Test on AMD GPU using HIP",
                         action="store_true")
@@ -119,6 +123,12 @@ def configure(self,definitionFile=""):
       # disable Async cuda malloc for tests performed on old UCX implementations
       comm.append("-DKokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC=OFF")
 
+    if self.intel:
+      # disable fmad operations on Cuda to make it compatible with CPU arithmetics
+      comm.append("-DIdefix_CXX_FLAGS=-fp-model=strict")
+      comm.append("-DCMAKE_CXX_COMPILER=icpx")
+      comm.append("-DCMAKE_C_COMPILER=icx")
+
     if self.hip:
       comm.append("-DKokkos_ENABLE_HIP=ON")
       # disable fmad operations on HIP to make it compatible with CPU arithmetics

scripts/ci/run-tests

@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 if [ "$IDEFIX_COMPILER" == icc ]; then
     source /opt/intel/oneapi/setvars.sh
-    export CC=icx
-    export CXX=icpx
-    export CFLAGS="-fp-model=strict"
-    export CXXFLAGS="-fp-model=strict"
 fi
 set -ue
 cd "$1"