diff --git a/.github/workflows/linuxWF.yml b/.github/workflows/linuxWF.yml index 4140b4e526..b3bdc14cc4 100644 --- a/.github/workflows/linuxWF.yml +++ b/.github/workflows/linuxWF.yml @@ -124,9 +124,11 @@ jobs: sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-mkl intel-oneapi-mkl-devel intel-oneapi-compiler-fortran source /opt/intel/oneapi/setvars.sh printenv >> $GITHUB_ENV + which icx + which ifx echo "CXX=icpx" >> $GITHUB_ENV echo "CC=icx" >> $GITHUB_ENV - echo "FC=ifort" >> $GITHUB_ENV + echo "FC=ifx" >> $GITHUB_ENV - name: Install MPI # install MPI at last since it modifies CC and CXX if: contains( matrix.variant, '-mpi-' ) diff --git a/regtest/scripts/fixzeroes.sh b/regtest/scripts/fixzeroes.sh index 551d2a241f..9d3896eacb 100755 --- a/regtest/scripts/fixzeroes.sh +++ b/regtest/scripts/fixzeroes.sh @@ -6,7 +6,7 @@ grep -E '[^[:print:]]' $file 2> /dev/null && exit 0 sed "s/-\(0\.0*0 \)/ \1/g; s/-\(0\.0*0$\)/ \1/g" $file > $file.$$.tmp -sed "s/-\(nan \)/ \1/g; - s/-\(nan$\)/ \1/g" $file.$$.tmp > $file.$$.tmp2 +sed "s/-\(nan \)/\1/g; + s/-\(nan$\)/\1/g" $file.$$.tmp > $file.$$.tmp2 mv $file.$$.tmp2 $file