benchs: update

.gitlab-ci.yml

@@ -83,12 +83,19 @@ benchmark:
   tags: ['plafrim']
   #extends: .only-main-mr
   needs: []
+  variables:
+    CI_HOSTNAME: zonda
+  cache:
+    key: "$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG"
+    paths:
+      - build
   script:
     - ./scripts/plafrim_level1.sh
   artifacts:
     when: always
     paths:
-      - bench.sqlite3
+      - ./*.out
+      - ./*.sqlite3
       - ./*.csv
 
 pages:

scripts/plafrim_level1.sh

@@ -2,7 +2,7 @@
 set -x
 
 # Submit slurm jobs
-sbatch --wait --job-name=scalfmm --output=scalfmm.out --nodes=1 --time=01:00:00 --constraint=suroit --exclusive --ntasks-per-node=1 ./scripts/plafrim_level2.sh
+sbatch --wait --job-name=scalfmm --output=scalfmm.out --nodes=1 --time=03:00:00 --constraint=$CI_HOSTNAME --exclusive --ntasks-per-node=1 ./scripts/plafrim_level2.sh
 err=$?
 
 cat scalfmm.out

scripts/plafrim_level2.sh

@@ -2,19 +2,20 @@
 set -x
 
 # to avoid a lock during fetching git branches in parallel
-export XDG_CACHE_HOME=/tmp/guix-$$
+#export XDG_CACHE_HOME=/tmp/guix-$$
 
 # save guix commits
+#guix describe --format=json > guix.json
 guix time-machine -C .guix/scalfmm-channels.scm -- describe --format=json > guix.json
 
-exec guix time-machine -C .guix/scalfmm-channels.scm -- shell \
-       --pure --preserve="^CI|proxy$|^SLURM" \
-       -m .guix/scalfmm-manifest-gcc-mkl-bench.scm \
-       -- /bin/bash --norc ./scripts/plafrim_level3.sh
+#exec guix shell --pure --preserve="^CI|proxy$|^SLURM" \
+exec guix time-machine -C .guix/scalfmm-channels.scm -- shell --pure --preserve="^CI|proxy$|^SLURM" \
+  -m .guix/scalfmm-manifest-gcc-mkl-bench.scm \
+  -- /bin/bash --norc ./scripts/plafrim_level3.sh
 err=$?
 
 # clean tmp
-rm -rf /tmp/guix-$$
+#rm -rf /tmp/guix-$$
 
 # exit with error code from the guix command
 exit $err

scripts/plafrim_level3.sh

@@ -19,12 +19,10 @@ if [[ -z "${CI_HOSTNAME}" ]]; then
 fi
 
 # configuration and compilation
-#if [ -d build ]; then
-#  rm build -r
-#fi
 cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -march=native" -Dscalfmm_BUILD_BENCH=ON -Dscalfmm_USE_MKL=ON
-cmake --build build --target fmm-computation-seq
-cmake --build build --target fmm-computation-omp
+cmake --build build --target fmm-computation-seq &
+cmake --build build --target fmm-computation-omp &
+wait
 export SCALFMM_EXE_DIR=$PWD/build/bench/Release
 
 # clean old benchmarks