Skip to content

Commit 2ad7f3e

Browse files
committed
updates intel compiler check
1 parent 342ead9 commit 2ad7f3e

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/CI.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ jobs:
314314
key: install-${{ runner.os }}-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: |
319319
# old way
320320
#wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
@@ -346,10 +346,11 @@ jobs:
346346
which icx
347347
icx --version
348348
echo ""
349-
echo "icc --version"
350-
which icc
351-
icc --version
352-
echo ""
349+
# icc deprecated
350+
#echo "icc --version"
351+
#which icc
352+
#icc --version
353+
#echo ""
353354
echo "ifx --version"
354355
which ifx
355356
ifx --version
@@ -373,7 +374,7 @@ jobs:
373374
echo ""
374375
# infos
375376
which ifx
376-
which icc
377+
which icx
377378
which mpiifx
378379
echo "mpirun:"
379380
which mpirun
@@ -397,8 +398,8 @@ jobs:
397398
echo ""
398399
echo ""
399400
printenv >> $GITHUB_ENV
400-
echo "CXX=icpc" >> $GITHUB_ENV
401-
echo "CC=icc" >> $GITHUB_ENV
401+
echo "CXX=icx" >> $GITHUB_ENV
402+
echo "CC=icx" >> $GITHUB_ENV
402403
echo "FC=ifx" >> $GITHUB_ENV
403404
echo ""
404405
@@ -423,7 +424,7 @@ jobs:
423424
424425
- name: configure parallel debug
425426
run: |
426-
./configure --enable-debug --with-mpi FC=ifx CC=icc MPIFC=mpiifx MPI_INC="${I_MPI_ROOT}/include"
427+
./configure --enable-debug --with-mpi FC=ifx CC=icx MPIFC=mpiifx MPI_INC="${I_MPI_ROOT}/include"
427428
428429
- name: make parallel debug
429430
run: |

flags.guess

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,9 @@ case $my_FC in
103103
# Intel ifx Fortran for Linux
104104
# check: https://www.intel.com/content/www/us/en/developer/articles/guide/porting-guide-for-ifort-to-ifx.html
105105
#
106-
DEF_FFLAGS="-xHost -fpe0 -ftz -assume buffered_io -assume byterecl -align sequence -std08 -diag-disable 6477 -implicitnone -gen-interfaces -warn all,noexternal" # -mcmodel=medium -shared-intel
106+
DEF_FFLAGS="-xHost -fpe0 -ftz -assume buffered_io -assume byterecl -align sequence -std08 -diag-disable 6477 -implicitnone -gen-interfaces -warn all,noexternal"
107107
OPT_FFLAGS="-O3 -check nobounds"
108108
DEBUG_FFLAGS="-check all -debug -g -O0 -fp-stack-check -traceback -ftrapuv"
109-
# option "-openmp" is soon deprecated and replaced by "-qopenmp" for versions > 17.x
110109
OMP_FFLAGS="-qopenmp"
111110
;;
112111
gfortran|*/gfortran|f95|*/f95)

0 commit comments

Comments
 (0)