From b0cafac955a04b0885b6bdaa3d57e46326237e9c Mon Sep 17 00:00:00 2001 From: Markus Battarbee Date: Thu, 13 Jun 2024 14:38:37 +0300 Subject: [PATCH 1/5] Updates to reference data building script --- .github/workflows/generate-reference-data.yml | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/.github/workflows/generate-reference-data.yml b/.github/workflows/generate-reference-data.yml index 91a2e6161..509a9854a 100644 --- a/.github/workflows/generate-reference-data.yml +++ b/.github/workflows/generate-reference-data.yml @@ -1,4 +1,4 @@ -name: Generate testpackage reference data +name: Generate testpackage reference data on Carrington on: # Only run when triggered manually @@ -12,8 +12,17 @@ jobs: runs-on: carrington steps: + - name: Clean workspace + run: | + RUN_STRING=$( cat << MORO + rm -rf libraries library-build testpackage + rm -f libraries.tar.zst testpackage_check_description.txt testpackage-output.tar.gz metrics.txt stdout.txt stderr.txt testpackage_output_variables.txt + rm -f *.xml + MORO + ) + srun -M carrington bash -c "$RUN_STRING" - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Make clean @@ -21,13 +30,16 @@ jobs: - uses: ursg/gcc-problem-matcher@master - name: Compile vlasiator (Testpackage build) run: | - export VLASIATOR_ARCH=carrington_gcc_openmpi - srun -M carrington --job-name tp_compile --interactive --nodes=1 -n 1 -c 16 --mem=40G -p short -t 0:10:0 bash -c 'module purge; module load GCC/11.2.0; module load OpenMPI/4.1.1-GCC-11.2.0 ; module load PMIx/4.1.0-GCCcore-11.2.0; module load PAPI/6.0.0.1-GCCcore-11.2.0; export VLASIATOR_ARCH=carrington_gcc_openmpi; make -j 16 testpackage; sleep 10s' - - name: Sleep for 10 seconds - run: sleep 10s - shell: bash + srun -M carrington --job-name CI_ref_tp_compile --interactive --nodes=1 -n 1 -c 16 --mem=40G -p short -t 0:10:0 bash -c 'module purge; module load GCC/11.2.0; module load OpenMPI/4.1.1-GCC-11.2.0 ; module load PMIx/4.1.0-GCCcore-11.2.0; module load PAPI/6.0.0.1-GCCcore-11.2.0; export VLASIATOR_ARCH=carrington_gcc_openmpi; make -j 16 testpackage; sleep 10s' + - name: Make sure the output binary is visible in lustre + uses: nick-fields/retry@v3 + with: + timeout_seconds: 15 + max_attempts: 3 + retry_on: error + command: ls vlasiator - name: Upload testpackage binary - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: vlasiator-testpackage path: vlasiator @@ -45,11 +57,11 @@ jobs: steps: - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Download testpackage binary - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: vlasiator-testpackage - name: Run testpackage From 61ead870b64bafd138a88138ed6ce1077605aa74 Mon Sep 17 00:00:00 2001 From: Markus Battarbee Date: Thu, 13 Jun 2024 14:38:55 +0300 Subject: [PATCH 2/5] Move workspace cleaning to run on cluster --- .github/workflows/github-ci.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index abda7738d..f28fddad5 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -80,7 +80,11 @@ jobs: submodules: true - name: Clean workspace run: | + RUN_STRING=$( cat << MORO rm -rf libraries library-build libraries-arriesgado.tar.gz + MORO + ) + srun -M carrington bash -c "$RUN_STRING" - name: Submit library job run: | #srun --interactive -p arriesgado-jammy -J vlasiator-libs -n 1 -c 4 -t 01:00:00 bash -lc 'module load openmpi; ./build_libraries.sh arriesgado' @@ -130,9 +134,13 @@ jobs: steps: - name: Clean workspace run: | + RUN_STRING=$( cat << MORO rm -rf libraries library-build testpackage rm -f libraries.tar.zst testpackage_check_description.txt testpackage-output.tar.gz metrics.txt stdout.txt stderr.txt testpackage_output_variables.txt rm -f *.xml + MORO + ) + srun -M carrington bash -c "$RUN_STRING" - name: Checkout source uses: actions/checkout@v4 with: @@ -174,9 +182,13 @@ jobs: submodules: true - name: Clean workspace run: | + RUN_STRING=$( cat << MORO rm -rf libraries library-build libraries-arriesgado.tar.gz - rm -rf stdout.txt stderr.txt metrics.txt - rm -rf *.xml + rm -f stdout.txt stderr.txt metrics.txt + rm -f *.xml + MORO + ) + srun -M carrington bash -c "$RUN_STRING" - name: Download libraries uses: actions/download-artifact@v4 with: @@ -240,9 +252,13 @@ jobs: steps: - name: Clean workspace run: | + RUN_STRING=$( cat << MORO rm -rf libraries library-build testpackage rm -f libraries.tar.zstd testpackage_check_description.txt testpackage-output.tar.gz metrics.txt stdout.txt stderr.txt testpackage_output_variables.txt rm -f *.xml + MORO + ) + srun -M carrington bash -c "$RUN_STRING" - name: Checkout source uses: actions/checkout@v4 with: From 4d3c8a5b83b3e7aa4081247102f2d458ee2a9eb8 Mon Sep 17 00:00:00 2001 From: Markus Battarbee Date: Thu, 13 Jun 2024 14:51:00 +0300 Subject: [PATCH 3/5] yaml syntax fix --- .github/workflows/github-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index f28fddad5..96168779a 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -84,7 +84,7 @@ jobs: rm -rf libraries library-build libraries-arriesgado.tar.gz MORO ) - srun -M carrington bash -c "$RUN_STRING" + srun -M carrington bash -c "$RUN_STRING" - name: Submit library job run: | #srun --interactive -p arriesgado-jammy -J vlasiator-libs -n 1 -c 4 -t 01:00:00 bash -lc 'module load openmpi; ./build_libraries.sh arriesgado' From 6a3f1bfd44dad490cbfabd2333cb7995bd0453b6 Mon Sep 17 00:00:00 2001 From: Markus Battarbee Date: Thu, 13 Jun 2024 14:58:40 +0300 Subject: [PATCH 4/5] don't bother with cleanup fix on arriesgado --- .github/workflows/github-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index 96168779a..5c54ffdcf 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -80,11 +80,7 @@ jobs: submodules: true - name: Clean workspace run: | - RUN_STRING=$( cat << MORO rm -rf libraries library-build libraries-arriesgado.tar.gz - MORO - ) - srun -M carrington bash -c "$RUN_STRING" - name: Submit library job run: | #srun --interactive -p arriesgado-jammy -J vlasiator-libs -n 1 -c 4 -t 01:00:00 bash -lc 'module load openmpi; ./build_libraries.sh arriesgado' From 6103734513a4cf46e6d3b8270f730b51668c4ed9 Mon Sep 17 00:00:00 2001 From: Markus Battarbee Date: Thu, 13 Jun 2024 14:59:33 +0300 Subject: [PATCH 5/5] don't bother with cleanup fix on arriesgado mk2 --- .github/workflows/github-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index 5c54ffdcf..e56cbe738 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -178,13 +178,9 @@ jobs: submodules: true - name: Clean workspace run: | - RUN_STRING=$( cat << MORO rm -rf libraries library-build libraries-arriesgado.tar.gz rm -f stdout.txt stderr.txt metrics.txt rm -f *.xml - MORO - ) - srun -M carrington bash -c "$RUN_STRING" - name: Download libraries uses: actions/download-artifact@v4 with: