GitLab CI updates (#2070)

increase lassen gpu test time time ci commands do not fail pipeline if job is not found
erf-model · Jan 16, 2025 · 8dab916 · 8dab916
1 parent fc4fbb2
commit 8dab916
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 40 deletions.
diff --git a/.gitlab/LC/.gitlab-ci.yml b/.gitlab/LC/.gitlab-ci.yml
@@ -79,6 +79,7 @@ lassen_gcc_12_2_1:
 
 lassen_gcc_12_2_1_cuda:
   variables:
+    ALLOC_TIME: 90
     MODULE_LIST: cmake/3.23.1 gcc/12.2.1 cuda/12.2.2
     ERF_ENABLE_CUDA: "ON"
     # NOTE: c++ and cc are used here over mpicxx/mpicc due to cmake issue finding mpi with cuda?

diff --git a/.gitlab/LC/gitlab_test.sh b/.gitlab/LC/gitlab_test.sh
@@ -47,19 +47,19 @@ then
     cd "${build_dir}_cpu"
     pwd
 
-    cmake -DCMAKE_INSTALL_PREFIX:PATH=./install \
-          -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER:-"mpicxx"} \
-          -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER:-"mpicc"} \
-          -DCMAKE_Fortran_COMPILER:STRING=${CMAKE_Fortran_COMPILER:-"mpifort"} \
-          -DCMAKE_BUILD_TYPE:STRING=Release \
-          -DERF_DIM:STRING=3 \
-          -DERF_ENABLE_MPI:BOOL=ON \
-          -DERF_ENABLE_CUDA:BOOL=OFF \
-          -DERF_ENABLE_TESTS:BOOL=OFF \
-          -DERF_ENABLE_FCOMPARE:BOOL=ON \
-          -DERF_ENABLE_DOCUMENTATION:BOOL=OFF \
-          -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON ..
-    make -j fcompare
+    time cmake -DCMAKE_INSTALL_PREFIX:PATH=./install \
+         -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER:-"mpicxx"} \
+         -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER:-"mpicc"} \
+         -DCMAKE_Fortran_COMPILER:STRING=${CMAKE_Fortran_COMPILER:-"mpifort"} \
+         -DCMAKE_BUILD_TYPE:STRING=Release \
+         -DERF_DIM:STRING=3 \
+         -DERF_ENABLE_MPI:BOOL=ON \
+         -DERF_ENABLE_CUDA:BOOL=OFF \
+         -DERF_ENABLE_TESTS:BOOL=OFF \
+         -DERF_ENABLE_FCOMPARE:BOOL=ON \
+         -DERF_ENABLE_DOCUMENTATION:BOOL=OFF \
+         -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON ..
+    time make -j fcompare
 
     FCOMPARE_EXE="$(pwd)/Submodules/AMReX/Tools/Plotfile/amrex_fcompare"
 
@@ -101,28 +101,29 @@ mkdir ${build_dir}
 cd ${build_dir}
 pwd
 
-cmake -DCMAKE_INSTALL_PREFIX:PATH=./install \
-      -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER:-"mpicxx"} \
-      -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER:-"mpicc"} \
-      -DCMAKE_Fortran_COMPILER:STRING=${CMAKE_Fortran_COMPILER:-"mpifort"} \
-      -DMPIEXEC_EXECUTABLE="${mpiexec_executable}" \
-      -DMPIEXEC_PREFLAGS:STRING="${mpiexec_preflags}" \
-      -DCMAKE_BUILD_TYPE:STRING="${build_type}" \
-      -DERF_DIM:STRING=3 \
-      -DERF_ENABLE_MPI:BOOL=ON \
-      -DERF_ENABLE_CUDA:BOOL="${ERF_ENABLE_CUDA}" \
-      -DAMReX_CUDA_ARCH:STRING="${CUDA_ARCH:-""}" \
-      -DERF_ENABLE_HIP:BOOL="${ERF_ENABLE_HIP:-"OFF"}" \
-      -DAMReX_AMD_ARCH:STRING="${AMD_ARCH:-""}" \
-      -DERF_ENABLE_TESTS:BOOL=ON \
-      -DERF_TEST_NRANKS:STRING=${ERF_TEST_NRANKS:-"4"} \
-      -DERF_ENABLE_FCOMPARE:BOOL=ON \
-      -DERF_ENABLE_DOCUMENTATION:BOOL=OFF \
-      -DFCOMPARE_EXE="${FCOMPARE_EXE:-"$(pwd)/Submodules/AMReX/Tools/Plotfile/amrex_fcompare"}" \
-      -DERF_TEST_GOLD_FILES_DIRECTORY="${ERF_TEST_GOLD_FILES_DIRECTORY:-"$(pwd)/../Tests/ERFGoldFiles"}" \
-      -DERF_TEST_FCOMPARE_RTOL="${ERF_TEST_FCOMPARE_RTOL:-"5.0e-9"}" \
-      -DERF_TEST_FCOMPARE_ATOL="${ERF_TEST_FCOMPARE_ATOL:-"2.0e-10"}" \
-      -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
-      ..
-make -j ${OMP_NUM_THREADS:-16}
-ctest -VV --output-on-failure
+time cmake \
+     -DCMAKE_INSTALL_PREFIX:PATH=./install \
+     -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER:-"mpicxx"} \
+     -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER:-"mpicc"} \
+     -DCMAKE_Fortran_COMPILER:STRING=${CMAKE_Fortran_COMPILER:-"mpifort"} \
+     -DMPIEXEC_EXECUTABLE="${mpiexec_executable}" \
+     -DMPIEXEC_PREFLAGS:STRING="${mpiexec_preflags}" \
+     -DCMAKE_BUILD_TYPE:STRING="${build_type}" \
+     -DERF_DIM:STRING=3 \
+     -DERF_ENABLE_MPI:BOOL=ON \
+     -DERF_ENABLE_CUDA:BOOL="${ERF_ENABLE_CUDA}" \
+     -DAMReX_CUDA_ARCH:STRING="${CUDA_ARCH:-""}" \
+     -DERF_ENABLE_HIP:BOOL="${ERF_ENABLE_HIP:-"OFF"}" \
+     -DAMReX_AMD_ARCH:STRING="${AMD_ARCH:-""}" \
+     -DERF_ENABLE_TESTS:BOOL=ON \
+     -DERF_TEST_NRANKS:STRING=${ERF_TEST_NRANKS:-"4"} \
+     -DERF_ENABLE_FCOMPARE:BOOL=ON \
+     -DERF_ENABLE_DOCUMENTATION:BOOL=OFF \
+     -DFCOMPARE_EXE="${FCOMPARE_EXE:-"$(pwd)/Submodules/AMReX/Tools/Plotfile/amrex_fcompare"}" \
+     -DERF_TEST_GOLD_FILES_DIRECTORY="${ERF_TEST_GOLD_FILES_DIRECTORY:-"$(pwd)/../Tests/ERFGoldFiles"}" \
+     -DERF_TEST_FCOMPARE_RTOL="${ERF_TEST_FCOMPARE_RTOL:-"5.0e-9"}" \
+     -DERF_TEST_FCOMPARE_ATOL="${ERF_TEST_FCOMPARE_ATOL:-"2.0e-10"}" \
+     -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
+     ..
+time make -j ${OMP_NUM_THREADS:-16}
+time ctest -VV --output-on-failure
diff --git a/.gitlab/LC/runners/dane.yml b/.gitlab/LC/runners/dane.yml
@@ -43,7 +43,7 @@ release_resources_dane:
   stage: release
   script:
     - export JOBID=$(squeue -h --name=${ALLOC_NAME} --format=%A)
-    - ([[ -n "${JOBID}" ]] && scancel ${JOBID})
+    - ([[ -n "${JOBID}" ]] && scancel ${JOBID} || exit 0)
   when: always
 
 .job_on_dane:

diff --git a/.gitlab/LC/runners/tioga.yml b/.gitlab/LC/runners/tioga.yml
@@ -43,7 +43,7 @@ release_resources_tioga:
   stage: release
   script:
     - export JOBID=$(flux jobs -n --name=${ALLOC_NAME} --format="{id}")
-    - ([[ -n "${JOBID}" ]] && flux cancel ${JOBID})
+    - ([[ -n "${JOBID}" ]] && flux cancel ${JOBID} || exit 0)
   when: always
 
 .job_on_tioga: