slurm version has been updated on plafrim. default slurm version in guix...

slurm version has been updated on plafrim. default slurm version in guix should be compatible with the plafrim server one now

tools/bench/plafrim/run.sh

@@ -64,24 +64,24 @@ else
   echo "$0: Please set the MPI environnement variable to openmpi or nmad."
   exit -1
 fi
-GUIX_ADHOC="coreutils gawk grep jube perl python python-click python-certifi python-elasticsearch python-gitpython python-matplotlib python-pandas python-seaborn r-ggplot2 r-plyr r-reshape2 sed slurm@19 mkl"
-GUIX_RULE="$GUIX_ENV $GUIX_ENV_MPI --ad-hoc $GUIX_ADHOC $GUIX_ADHOC_MPI"
+GUIX_ADHOC="coreutils gawk grep jube perl python python-click python-certifi python-elasticsearch python-gitpython python-matplotlib python-pandas python-seaborn r-ggplot2 r-plyr r-reshape2 sed slurm mkl"
+GUIX_RULE="-D $GUIX_ENV $GUIX_ENV_MPI $GUIX_ADHOC $GUIX_ADHOC_MPI"
 
 # Submit jobs
 
 # OpenMPI version
-exec guix environment --pure \
-                      --preserve=PLATFORM \
-                      --preserve=NODE \
-                      --preserve=LD_PRELOAD \
-                      --preserve=^CI \
-                      --preserve=^SLURM \
-                      --preserve=^JUBE \
-                      --preserve=^MPI \
-                      --preserve=^STARPU \
-                      --preserve=^CHAMELEON \
-                      $GUIX_RULE \
-                      -- /bin/bash --norc ./tools/bench/plafrim/slurm.sh
+exec guix shell --pure \
+                --preserve=PLATFORM \
+                --preserve=NODE \
+                --preserve=LD_PRELOAD \
+                --preserve=^CI \
+                --preserve=^SLURM \
+                --preserve=^JUBE \
+                --preserve=^MPI \
+                --preserve=^STARPU \
+                --preserve=^CHAMELEON \
+                $GUIX_RULE \
+                -- /bin/bash --norc ./tools/bench/plafrim/slurm.sh
 
 echo "####################### End Chameleon benchmarks #######################"