Skip to content

Commit 81471d6

Browse files
committed
CI: Switch to MPI builds of HDF5
This will also: - Build tests with MPI - Fix definition of AMREX_HOME - Clean up flock and LOCKED_FILE variable
1 parent 08ff82b commit 81471d6

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

.gitlab-ci.yml

+13-11
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111
rhel8/global
1212
openmpi/4.1.1/gcc-9.4.0-epagguv
1313
gcc/9.4.0/gcc-11.2.0-72sgv5z
14-
hdf5/1.12.1
14+
hdf5/1.10.7/openmpi-4.1.1/gcc-9.4.0-krjrm53
1515
BUILD_CONFIG: >
1616
USE_CUDA=TRUE
1717
CUDA_ARCH=80
@@ -20,6 +20,7 @@ variables:
2020
TEST=TRUE
2121
USE_ASSERTION=TRUE
2222
USE_HDF5=TRUE
23+
USE_MPI=TRUE
2324
SRUN_FLAGS: >
2425
--qos=INTR
2526
--nodes=1
@@ -32,8 +33,8 @@ variables:
3233
--abs_tol 1e-10
3334
--rel_tol 1e-10
3435
--abort_if_not_all_found
35-
LOCKED_FILENAME: >
36-
file.lock
36+
#We can only run a single job at a time with --qos=INTR
37+
QOS_INTR_LOCK_FILE: qos-intr.lock
3738

3839

3940
csd3-a100:
@@ -44,25 +45,26 @@ csd3-a100:
4445
- module purge
4546
- module use ${MODULEPATHS_A100}
4647
- module load ${MODULES_A100}
47-
- if [[ -d ../amrex ]]; then
48-
- cd ../amrex
48+
- export HDF5_HOME=$(which h5diff | sed 's/bin\/h5diff//') #Override system version of hdf5
49+
- export AMREX_HOME=$(realpath ${HOME}/${CI_PROJECT_DIR}/../amrex)
50+
- if [[ -d ${AMREX_HOME} ]]; then
51+
- cd ${AMREX_HOME}
4952
- git fetch --depth 1
5053
- git reset --hard origin/development
5154
- else
52-
- git clone --depth 1 https://github.com/AMReX-Codes/amrex.git ../amrex
55+
- git clone --depth 1 https://github.com/AMReX-Codes/amrex.git ${AMREX_HOME}
5356
- fi
54-
- AMREX_HOME="$PWD"
5557
- cd ${AMREX_HOME}/Tools/Plotfile
5658
- make -j 8 COMP=gnu programs=fcompare
5759
- cd ${HOME}/${CI_PROJECT_DIR}/Tests
5860
- make -j 8 ${BUILD_CONFIG}
59-
- flock ${HOME}/${CI_PROJECT_DIR}/${LOCKED_FILENAME} srun ${SRUN_FLAGS} make run ${BUILD_CONFIG}
61+
- flock ${HOME}/${QOS_INTR_LOCK_FILE} srun ${SRUN_FLAGS} make run ${BUILD_CONFIG}
6062
- cd ${HOME}/${CI_PROJECT_DIR}/Examples/BinaryBH
61-
- make -j 8 ${BUILD_CONFIG} USE_HDF5=FALSE
62-
- flock ${HOME}/${CI_PROJECT_DIR}/${LOCKED_FILENAME} srun ${SRUN_FLAGS} ./main3d.gnu.DEBUG.MPI.CUDA.ex ./params_test.txt
63+
- make -j 8 ${BUILD_CONFIG}
64+
- flock ${HOME}/${QOS_INTR_LOCK_FILE} srun ${SRUN_FLAGS} ./main3d.gnu.DEBUG.MPI.CUDA.ex ./params_test.txt
6365
- ${AMREX_HOME}/Tools/Plotfile/fcompare.gnu.ex ${FCOMPARE_FLAGS} plt00008 ${HOME}/${CI_PROJECT_DIR}/.github/workflows/data/plt00008_compare/
6466
after_script:
65-
- rm -rf ${HOME}/${CI_PROJECT_DIR}/${LOCKED_FILENAME}
67+
- rm -rf ${HOME}/${QOS_INTR_LOCK_FILE}
6668

6769

6870

0 commit comments

Comments
 (0)