remove support for the legacy intel compiler

Author: matekelemen

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        compiler: [GCC, CLANG, ICC, ICX]
+        compiler: [GCC, CLANG, ICX, ICPX]
         mpi: [OpenMPI, IntelMPI]
         exclude:
             # CLANG is not properly supported by Intel, better use LLVMIntel in the future
@@ -46,12 +46,8 @@ jobs:
           valgrind \
           clang
 
-    - name: Install legacy Intel compiler
-      if: ${{ matrix.compiler == 'ICC' }}
-      run: sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
-
     - name: Install Intel compiler
-      if: ${{ matrix.compiler == 'ICX' }}
+      if: ${{ matrix.compiler == 'ICPX' }}
       run: sudo apt-get install intel-oneapi-compiler-dpcpp-cpp
 
     - name: Install MPI
@@ -70,18 +66,18 @@ jobs:
         elif [ ${{ matrix.compiler }} = CLANG ]; then
           export CXX=/usr/bin/clang++
           export CC=/usr/bin/clang
-        elif [ ${{ matrix.compiler }} = ICC ]; then
-          export CXX=icpc
-          export CC=icc
         elif [ ${{ matrix.compiler }} = ICX ]; then
           export CXX=icpx
           export CC=icx
+        elif [ ${{ matrix.compiler }} = ICPX ]; then
+          export CXX=icpx
+          export CC=icx
         else
           echo 'Unsupported compiler: ${{ matrix.compiler }}'
           exit 1
         fi
 
-        if [ ${{ matrix.compiler }} = ICC ] || [ ${{ matrix.compiler }} = ICX ] || [ ${{ matrix.mpi }} = IntelMPI ]; then
+        if [ ${{ matrix.compiler }} = ICX ] || [ ${{ matrix.compiler }} = ICPX ] || [ ${{ matrix.mpi }} = IntelMPI ]; then
           source /opt/intel/oneapi/setvars.sh
         fi
 
@@ -107,7 +103,7 @@ jobs:
         export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin
         export PATH=${PATH}:${GITHUB_WORKSPACE}/bin # required for IntelMPI
         export PATH=${PATH}:${GITHUB_WORKSPACE}/bin/tests_c_mpi # required for IntelMPI
-        if [ ${{ matrix.compiler }} = ICC ] || [ ${{ matrix.compiler }} = ICX ] || [ ${{ matrix.mpi }} = IntelMPI ]; then
+        if [ ${{ matrix.compiler }} = ICX ] || [ ${{ matrix.compiler }} = ICPX ] || [ ${{ matrix.mpi }} = IntelMPI ]; then
           source /opt/intel/oneapi/setvars.sh
         fi
 
@@ -128,14 +124,14 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-        compiler: [GCC, ICC]
+        compiler: [GCC, ICX]
     timeout-minutes: 15
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Install Intel compiler
-      if: ${{ matrix.compiler == 'ICC' }}
+      if: ${{ matrix.compiler == 'ICX' }}
       run: |
         # see https://software.intel.com/content/www/us/en/develop/articles/installing-intel-oneapi-toolkits-via-apt.html#pkgtable
         cd /tmp
@@ -145,7 +141,7 @@ jobs:
         sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
 
         sudo apt-get update
-        sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
+        sudo apt-get install intel-oneapi-compiler-dpcpp-cpp
 
     - name: Install MPI
       run: |
@@ -170,7 +166,7 @@ jobs:
 
     - name: Running tests
       run: |
-        if [ ${{ matrix.compiler }} = ICC ]; then
+        if [ ${{ matrix.compiler }} = ICX ]; then
           source /opt/intel/oneapi/setvars.sh
         fi
         export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin
@@ -181,7 +177,7 @@ jobs:
 
     - name: Running MPI tests
       run: |
-        if [ ${{ matrix.compiler }} = ICC ]; then
+        if [ ${{ matrix.compiler }} = ICX ]; then
           source /opt/intel/oneapi/setvars.sh
         fi
         export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin