Fix intel compiler version in github actions, and add IntelLLVM

ecmwf · Nov 23, 2023 · 894755f · 894755f
1 parent 93082b9
commit 894755f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,6 +37,7 @@ jobs:
           - linux clang-12
 #          - linux nvhpc-22.11
           - linux intel
+          - linux intel-classic
           - macos
 
         include:
@@ -102,7 +103,16 @@ jobs:
 
           - name : linux intel
             os: ubuntu-20.04
-            compiler: intel-oneapi
+            compiler: intel
+            compiler_cc: icx
+            compiler_cxx: icpx
+            compiler_fc: ifx
+            caching: true
+            coverage: false
+
+          - name : linux intel-classic
+            os: ubuntu-20.04
+            compiler: intel-classic
             compiler_cc: icc
             compiler_cxx: icpc
             compiler_fc: ifort
@@ -179,7 +189,7 @@ jobs:
         ${ATLAS_TOOLS}/install-intel-oneapi.sh
         source /opt/intel/oneapi/setvars.sh
         printenv >> $GITHUB_ENV
-        echo "CACHE_SUFFIX=$(icc -dumpversion)" >> $GITHUB_ENV
+        echo "CACHE_SUFFIX=$CC-$($CC -dumpversion)" >> $GITHUB_ENV
 
     - name: Install MPI
       shell: bash -eux {0}
@@ -220,6 +230,19 @@ jobs:
         # Add mpirun to path for testing
         [ -z ${MPI_HOME+x} ] || echo "${MPI_HOME}/bin" >> $GITHUB_PATH
 
+        if [[ "${{matrix.compiler}}" == intel-classic ]]; then
+          echo "CFLAGS=-diag-disable=10441"   >> $GITHUB_ENV
+          echo "CXXFLAGS=-diag-disable=10441" >> $GITHUB_ENV
+          echo "FCFLAGS=-diag-disable=10441"  >> $GITHUB_ENV
+          echo "FFLAGS=-diag-disable=10441"   >> $GITHUB_ENV
+        fi
+
+        if [[ "${{matrix.compiler}}" == intel ]]; then
+          echo "CFLAGS=-Rno-debug-disables-optimization"   >> $GITHUB_ENV
+          echo "CXXFLAGS=-Rno-debug-disables-optimization" >> $GITHUB_ENV
+        fi
+
+
 
     - name: Build & Test
       id: build-test

diff --git a/tools/install-intel-oneapi.sh b/tools/install-intel-oneapi.sh
@@ -1,14 +1,14 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
+version=2023.2.0
 KEY=GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
 wget https://apt.repos.intel.com/intel-gpg-keys/$KEY
 sudo apt-key add $KEY
 rm $KEY
 echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
 sudo apt-get update
 sudo apt-get install \
-    intel-oneapi-compiler-fortran \
-    intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic \
+    intel-oneapi-compiler-fortran-$version \
+    intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-$version \
     intel-oneapi-mpi \
-    intel-oneapi-mpi-devel \
-    intel-oneapi-mkl
+    intel-oneapi-mkl-$version