Skip to content

Commit 00cd08a

Browse files
committed
updates tests
1 parent a8e5908 commit 00cd08a

File tree

3 files changed

+69
-19
lines changed

3 files changed

+69
-19
lines changed

.github/workflows/CI.yml

+53-12
Original file line numberDiff line numberDiff line change
@@ -176,31 +176,67 @@ jobs:
176176
sudo echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
177177
sudo apt-get update
178178
echo ""
179-
echo "packages intel oneapi:"
180-
sudo apt-get install -y intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-mpi intel-oneapi-mpi-devel
179+
# info
180+
#sudo -E apt-cache pkgnames intel | grep intel-oneapi
181+
#echo ""
182+
echo "installing packages intel oneapi:"
183+
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 intel-oneapi-mpi-devel
184+
echo ""
181185
182186
- name: compiler infos
183187
run: |
184188
echo ""
185189
source /opt/intel/oneapi/setvars.sh
186190
echo ""
187191
echo "compiler versions:"
192+
echo "icx --version"
193+
which icx
194+
icx --version
195+
echo ""
188196
echo "icc --version"
197+
which icc
189198
icc --version
199+
echo ""
200+
echo "ifx --version"
201+
which ifx
202+
ifx --version
203+
echo ""
190204
echo "ifort --version"
205+
which ifort
191206
ifort --version
207+
echo ""
192208
echo "mpiifort --version"
209+
which mpiifort
193210
mpiifort --version
211+
echo ""
194212
echo "mpif90 --version"
213+
which mpif90
195214
mpif90 --version
196215
echo ""
216+
# infos
217+
which ifort
218+
which icc
219+
which mpiifort
220+
echo "mpirun:"
221+
which mpirun
222+
echo ""
223+
# intel setup for running tests
224+
echo ""
225+
echo "replacing mpif90 with mpiifort link:"
226+
sudo ln -sf $(which mpiifort) $(which mpif90)
227+
mpif90 --version
228+
echo ""
229+
# debug
230+
#export I_MPI_DEBUG=5,pid,host
231+
#export I_MPI_LIBRARY_KIND=debug
232+
# remove -ftrapuv which leads to issues for running tests
233+
sed -i "s/-ftrapuv//g" flags.guess
234+
# environment setting
197235
export TERM=xterm
236+
# export info
198237
echo "exports:"
199238
export
200239
echo ""
201-
which ifort
202-
which icc
203-
which mpiifort
204240
echo ""
205241
printenv >> $GITHUB_ENV
206242
echo "CXX=icpc" >> $GITHUB_ENV
@@ -209,7 +245,8 @@ jobs:
209245
echo ""
210246
211247
- name: configure debug
212-
run: ./configure --enable-debug FC=ifort CC=icc
248+
run: |
249+
./configure --enable-debug FC=ifort CC=icc
213250
214251
- name: make debug
215252
run: |
@@ -218,15 +255,17 @@ jobs:
218255
make clean
219256
220257
- name: configure
221-
run: ./configure FC=ifort CC=icc
258+
run: |
259+
./configure FC=ifort CC=icc
222260
223261
- name: make
224262
run: |
225263
make -j2 all
226264
make clean
227265
228266
- name: configure parallel debug
229-
run: ./configure --enable-debug --with-mpi FC=ifort CC=icc MPIFC=mpiifort MPI_INC="${I_MPI_ROOT}/include"
267+
run: |
268+
./configure --enable-debug --with-mpi FC=ifort CC=icc MPIFC=mpiifort MPI_INC="${I_MPI_ROOT}/include"
230269
231270
- name: make parallel debug
232271
run: |
@@ -235,16 +274,18 @@ jobs:
235274
make clean
236275
237276
- name: configure parallel
238-
run: ./configure --with-mpi FC=ifort CC=icc MPIFC=mpiifort MPI_INC="${I_MPI_ROOT}/include"
277+
run: |
278+
./configure --with-mpi FC=ifort CC=icc MPIFC=mpiifort MPI_INC="${I_MPI_ROOT}/include"
239279
240280
- name: make parallel
241281
run: |
242282
make -j2 all
243283
make clean
244284
245-
# fails due to MPI issue on virtual nodes
246-
#- name: make tests
247-
# run: make tests
285+
# note: fails with -ftrapuv flag due to MPI issue on virtual nodes
286+
- name: make tests
287+
run: |
288+
make tests
248289
249290
250291
linuxTest_0:

.travis.yml

+14-6
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,20 @@ before_install:
201201
#- test -n $CC && unset CC
202202

203203
# updates repository
204-
# in case travis fails randomly due to missing key
205-
- |
206-
travis_retry sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
207-
travis_retry sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 78BD65473CB3BD13
208-
travis_retry sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157
209-
travis_retry sudo apt-get update
204+
# (fails currently...)
205+
#- |
206+
# travis_retry sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
207+
# travis_retry sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 78BD65473CB3BD13
208+
# travis_retry sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157
209+
# apt explicit update
210+
#- |
211+
# echo "update apt-get"
212+
# travis_retry sudo apt-get update
213+
# echo
214+
addons:
215+
# apt update
216+
apt:
217+
update: true
210218

211219

212220
install:

flags.guess

+2-1
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ case $my_FC in
9090
# I/O throughput lingers at 2.5 MB/s, with it it can increase to ~44 MB/s
9191
# However it does not make much of a difference on NFS mounted volumes or with SFS 3.1.1 / Lustre 1.6.7.1
9292
#
93+
# warnings about external function calls can be suppressed by "-warn all,noexternal" for version > 2018
9394
# optimization report: "-vec-report0" is old and will be replaced by "-qopt-report0 -qopt-report-phase=vec" for v >=15.0
94-
DEF_FFLAGS="-xHost -fpe0 -ftz -assume buffered_io -assume byterecl -align sequence -std08 -diag-disable 6477 -implicitnone -gen-interfaces -warn all" # -mcmodel=medium -shared-intel
95+
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
9596
OPT_FFLAGS="-O3 -check nobounds"
9697
DEBUG_FFLAGS="-check all -debug -g -O0 -fp-stack-check -traceback -ftrapuv"
9798
# option "-openmp" is soon deprecated and replaced by "-qopenmp" for versions > 17.x

0 commit comments

Comments
 (0)