add cmake version

GEOS-DEV · Jun 20, 2024 · 05eced0 · 05eced0
1 parent 84a25a8
commit 05eced0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/scripts/setupLC-TPL-helper.bash b/scripts/setupLC-TPL-helper.bash
@@ -6,7 +6,9 @@ GEOS_DIR=$1
 INSTALL_DIR=$2
 MACHINE=$3
 COMPILER=$4
-GET_A_NODE=$5
+CMAKE_VERSION=$5
+GET_A_NODE=$6
+
 
 ## Eat up the command line arguments so the rest can be forwarded to config-build.
 shift
@@ -25,7 +27,7 @@ echo "Building the TPLs on $MACHINE for $HOST_CONFIG to be installed at $INSTALL
 ssh $MACHINE -t "
 . /etc/profile  &&
 cd $PWD &&
-module load cmake/3.23.1 &&
+module load cmake/$CMAKE_VERSION &&
 python3 scripts/config-build.py -hc $HOST_CONFIG -bt Release -ip $INSTALL_DIR $@ &&
 cd build-$CONFIG-release &&
 $GET_A_NODE make &&

diff --git a/scripts/setupLC-TPL.bash b/scripts/setupLC-TPL.bash
@@ -27,12 +27,12 @@ rm -rf toBeDeleted &
 echo "Building all LC TPLs from $GEOS_DIR to be installed at $INSTALL_DIR"
 chmod -R g+rx $INSTALL_DIR
 chgrp -R GEOS $INSTALL_DIR
-./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby clang-14 "srun -N 1 -t 90 -n 1 -A vortex" $@ &
-./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby gcc-12 "srun -N 1 -t 90 -n 1 -A vortex" $@ &
-./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen gcc-8-cuda-11       "lalloc 1 -qpdebug" $@ &
-./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-13-cuda-11       "lalloc 1 -qpdebug" $@ &
-./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-10-cuda-11       "lalloc 1 -qpdebug" $@ &
-./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-13-cuda-12       "lalloc 1 -qpdebug" $@ &
+./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby clang-14           "3.26.3" "srun -N 1 -t 90 -n 1 -A vortex" $@ &
+./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby gcc-12             "3.26.3" "srun -N 1 -t 90 -n 1 -A vortex" $@ &
+./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen gcc-8-cuda-11    "3.26.3" "lalloc 1 -qpdebug"  $@ &
+./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-13-cuda-11 "3.29.2" "lalloc 1 -qpdebug"  $@ &
+./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-10-cuda-11 "3.29.2" "lalloc 1 -qpdebug"  $@ &
+./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-13-cuda-12 "3.29.2" "lalloc 1 -qpdebug"  $@ &
 
 wait
 echo "Complete"