Merge pull request #141 from amontoison/ci-icl

Test NOMAD with icx and icpx compilers

.github/workflows/ci.yml

@@ -30,11 +30,6 @@ jobs:
             os: windows-latest, compiler: gnu,
             build_type: "Release", cc: "gcc", cxx: "g++"
           }
-        - {
-            name: "Windows", artifact: "Windows-MinGW.tar.xz",
-            os: windows-latest, compiler: intel,
-            build_type: "Release", cc: "icl", cxx: "icl"
-          }
         - {
             name: "Ubuntu", artifact: "Linux.tar.xz",
             os: ubuntu-latest, compiler: gnu,
@@ -45,6 +40,11 @@ jobs:
             os: ubuntu-latest, compiler: intel,
             build_type: "Release", cc: "icc", cxx: "icpc"
           }
+        - {
+            name: "Ubuntu", artifact: "Linux.tar.xz",
+            os: ubuntu-latest, compiler: intel-llvm,
+            build_type: "Release", cc: "icx", cxx: "icpx"
+          }
         - {
             name: "MacOS", artifact: "macOS.tar.xz",
             os: macos-latest, compiler: clang,
@@ -84,16 +84,26 @@ jobs:
           brew install cmake
           cmake --version
 
-      - name: Install GNU C and Fortran compilers
+      - name: Install GNU C and C++ compilers
         if: matrix.config.compiler == 'gnu'
         uses: awvwgk/setup-fortran@main
         with:
           compiler: gcc
           version: 12
 
-      - name: Install Intel OpenAPI C and Fortran compilers
+      - name: Install classic Intel C and C++ compilers
         if: matrix.config.compiler == 'intel'
-        uses: modflowpy/install-intelfortran-action@v1
+        uses: awvwgk/setup-fortran@main
+        with:
+          compiler: intel-classic
+          version: 2021.9
+
+      - name: Install nextgen Intel C and C++ compilers
+        if: matrix.config.compiler == 'intel-llvm'
+        uses: awvwgk/setup-fortran@main
+        with:
+          compiler: intel
+          version: 2023.1
 
       - name: Configure
         shell: bash
@@ -105,11 +115,20 @@ jobs:
             cmake \
               -DCMAKE_C_COMPILER=${{matrix.config.cc}} \
               -DCMAKE_CXX_COMPILER=${{matrix.config.cxx}} \
+              -DCMAKE_C_FLAGS=-diag-disable=10441 \
               -DCMAKE_CXX_FLAGS=-diag-disable=10441 \
               -DTEST_OPENMP=OFF \
               -DBUILD_INTERFACE_C=ON \
               -DCMAKE_INSTALL_PREFIX=../instdir \
               ..
+          elif [[ "${{matrix.config.name}}" == "Windows--MinGW" ]]; then
+            cmake -G "MinGW Makefiles" \
+              -DCMAKE_C_COMPILER=${{matrix.config.cc}} \
+              -DCMAKE_CXX_COMPILER=${{matrix.config.cxx}} \
+              -DTEST_OPENMP=OFF \
+              -DBUILD_INTERFACE_C=ON \
+              -DCMAKE_INSTALL_PREFIX=../instdir \
+              ..
           else
             cmake \
               -DCMAKE_C_COMPILER=${{matrix.config.cc}} \