@@ -188,7 +188,7 @@ jobs:
188188 sudo apt-get update
189189 echo ""
190190 # info
191- sudo -E apt-cache pkgnames intel | grep intel-oneapi
191+ # sudo -E apt-cache pkgnames intel | grep intel-oneapi
192192 #echo ""
193193 echo "installing packages intel oneapi:"
194194 sudo apt-get install -y intel-oneapi-compiler-fortran-2023.2.2 intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2023.2.2 intel-oneapi-mpi-2021.14 intel-oneapi-mpi-devel-2021.14
@@ -311,29 +311,22 @@ jobs:
311311 uses : actions/cache@v4
312312 with :
313313 path : /opt/intel/oneapi
314- key : install-${{ runner.os }}-all
314+ key : install-${{ runner.os }}-ifx- all
315315
316316 - name : Install packages
317- # if: steps.cache-intel-oneapi-ifx.outputs.cache-hit != 'true'
317+ if : steps.cache-intel-oneapi-ifx.outputs.cache-hit != 'true'
318318 run : |
319- # old way
320- #wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
321- #sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB # deprecated warning
322- #sudo echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
323- # new way
324- #curl -Lo- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | sudo gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg
325- #sudo tee /etc/apt/sources.list.d/oneAPI.list <<< "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main"
326319 # new way
327320 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
328321 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
329322 echo ""
330323 sudo apt-get update
331324 echo ""
332325 # info
333- sudo -E apt-cache pkgnames intel | grep intel-oneapi
326+ # sudo -E apt-cache pkgnames intel | grep intel-oneapi
334327 #echo ""
335328 echo "installing packages intel oneapi:"
336- sudo apt-get install -y intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-mpi intel-oneapi-mpi-devel
329+ sudo apt-get install -y intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mpi intel-oneapi-mpi-devel
337330 echo ""
338331
339332 - name : compiler infos
@@ -346,24 +339,10 @@ jobs:
346339 which icx
347340 icx --version
348341 echo ""
349- # icc deprecated
350- #echo "icc --version"
351- #which icc
352- #icc --version
353- #echo ""
354342 echo "ifx --version"
355343 which ifx
356344 ifx --version
357345 echo ""
358- # ifort no more provided - use ifx instead
359- #echo "ifort --version"
360- #which ifort
361- #ifort --version
362- #echo ""
363- # mpiifort no more provided - use mpiifx instead
364- #echo "mpiifort --version"
365- #which mpiifort
366- #mpiifort --version
367346 echo "mpiifx --version"
368347 which mpiifx
369348 mpiifx --version
@@ -405,7 +384,9 @@ jobs:
405384
406385 - name : configure serial debug
407386 run : |
408- ./configure --enable-debug --without-mpi FC=ifx CC=icc
387+ set +e # revert the default `set -e`
388+ ./configure --enable-debug --without-mpi FC=ifx CC=icx
389+ if [[ $? -ne 0 ]]; then echo "configuration failed:"; cat config.log; echo ""; echo "exiting..."; exit 1; fi
409390
410391 - name : make serial debug
411392 run : |
@@ -415,7 +396,7 @@ jobs:
415396
416397 - name : configure serial
417398 run : |
418- ./configure --without-mpi FC=ifx CC=icc
399+ ./configure --without-mpi FC=ifx CC=icx
419400
420401 - name : make serial
421402 run : |
@@ -424,7 +405,9 @@ jobs:
424405
425406 - name : configure parallel debug
426407 run : |
408+ set +e # revert the default `set -e`
427409 ./configure --enable-debug --with-mpi FC=ifx CC=icx MPIFC=mpiifx MPI_INC="${I_MPI_ROOT}/include"
410+ if [[ $? -ne 0 ]]; then echo "configuration failed:"; cat config.log; echo ""; echo "exiting..."; exit 1; fi
428411
429412 - name : make parallel debug
430413 run : |
@@ -434,7 +417,7 @@ jobs:
434417
435418 - name : configure parallel
436419 run : |
437- ./configure --with-mpi FC=ifx CC=icc MPIFC=mpiifx MPI_INC="${I_MPI_ROOT}/include"
420+ ./configure --with-mpi FC=ifx CC=icx MPIFC=mpiifx MPI_INC="${I_MPI_ROOT}/include"
438421
439422 - name : make parallel
440423 run : |
0 commit comments