@@ -107,17 +107,12 @@ jobs:
107107 os : [ubuntu-latest]
108108 mpi : [nompi]
109109 socket : [nosocket, socket]
110- fc : [ifort ]
110+ fc : [ifx ]
111111 cc : [icx]
112112 env :
113113 FC : ${{ matrix.fc }}
114114 CC : ${{ matrix.cc }}
115115 WITH_MPI : false
116- APT_PACKAGES : >-
117- intel-oneapi-compiler-fortran
118- intel-oneapi-compiler-dpcpp-cpp
119- intel-oneapi-mkl
120- intel-oneapi-mkl-devel
121116 CMAKE_OPTIONS : >-
122117 -DCMAKE_BUILD_TYPE=RelWithDebInfo
123118 -DFYPP_FLAGS='-DTRAVIS'
@@ -131,34 +126,28 @@ jobs:
131126 with :
132127 python-version : 3.x
133128
134- - name : Add Intel repository
135- if : contains(matrix.os, 'ubuntu')
136- run : |
137- 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
138- 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
139- sudo apt-get update
129+ - name : Setup Intel compiler
130+ uses : rscohn2/setup-oneapi@v0
131+ with :
132+ components : |
133+ 134+ 135+ 140136
141- - name : Install Intel oneAPI compiler
142- if : contains(matrix.os, 'ubuntu')
137+ - name : Setup Intel environment
143138 run : |
144- sudo apt-get update
145- sudo apt-get install ${APT_PACKAGES}
146139 source /opt/intel/oneapi/setvars.sh
147- printenv >> $GITHUB_ENV
140+ printenv >> ${GITHUB_ENV}
141+ echo "FC=ifx" >> ${GITHUB_ENV}
142+ echo "CC=icx" >> ${GITHUB_ENV}
148143
149- - name : Install HDF5 (gcc)
150- if : contains(matrix.os, 'ubuntu')
151- run : |
152- sudo apt-get update
153- sudo apt-get install hdf5-tools libhdf5-dev libhdf5-103
154-
155- - name : Install HDF5 (intel)
144+ - name : Install HDF5
156145 if : contains(matrix.os, 'ubuntu')
157146 run : |
158- wget https://support.hdfgroup.org/ftp/HDF5/ releases/hdf5-1.13/hdf5-1.13.2/src/CMake- hdf5-1.13.2 .tar.gz
159- tar xfz CMake- hdf5-1.13.2 .tar.gz
160- cd CMake- hdf5-1.13.2/hdf5-1.13.2 /
161- CC=icx CXX=icx FC=ifort F9X=ifort ./configure --prefix=${PWD}/hdf5 --enable-fortran --with-default-api-version=v110 --enable-shared
147+ wget https://support.hdfgroup.org/releases/hdf5/v1_14/v1_14_4/downloads/ hdf5-1.14.4-3 .tar.gz
148+ tar xfz hdf5-1.14.4-3 .tar.gz
149+ cd hdf5-1.14.4-3 /
150+ CC=icx CXX=icx FC=ifx F9X=ifx ./configure --prefix=${PWD}/hdf5 --enable-fortran --enable-shared
162151 make -j -l2
163152 make install
164153 export HDF5_ROOT=${PWD}/hdf5
@@ -169,7 +158,7 @@ jobs:
169158 if : contains(matrix.mpi, 'nompi')
170159 run : |
171160 echo "WITH_MPI=false" >> $GITHUB_ENV
172- echo "FC=ifort " >> $GITHUB_ENV
161+ echo "FC=ifx " >> $GITHUB_ENV
173162
174163 - name : Enable socket build
175164 if : contains(matrix.socket, 'socket')
@@ -198,7 +187,7 @@ jobs:
198187 - name : Run regression tests
199188 run : |
200189 pushd ${BUILD_DIR}
201- ctest -j 2 --output-on-failure
190+ ctest -j2 --output-on-failure
202191 popd
203192
204193 - name : Install project
0 commit comments