Merge branch 'cuda_install' of github.com:ocaisa/software-layer into …

…cuda_install
EESSI · Nov 30, 2023 · 9ff5157 · 9ff5157
2 parents 9d275fe + b42b2d7
commit 9ff5157
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
@@ -229,7 +229,8 @@ done
 
 echo ">> Creating/updating Lmod cache..."
 export LMOD_RC="${EASYBUILD_INSTALLPATH}/.lmod/lmodrc.lua"
-if [ ! -f $LMOD_RC ] || 'create_lmodrc.py' == $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^create_lmodrc.py$' | egrep -v 'known-issues|missing'); then
+lmodrc_changed=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^create_lmodrc.py$' > /dev/null; echo $?)
+if [ ! -f $LMOD_RC ] || [ ${lmodrc_changed} == '0' ]; then
     python3 $TOPDIR/create_lmodrc.py ${EASYBUILD_INSTALLPATH}
     check_exit_code $? "$LMOD_RC created" "Failed to create $LMOD_RC"
 fi

diff --git a/eessi-2023.06-eb-4.8.2-2023a.yml b/eessi-2023.06-eb-4.8.2-2023a.yml
@@ -1,4 +1,7 @@
 easyconfigs:
-  - CUDA-Samples-12.1-GCC-12.3.0-CUDA-12.1.1.eb
-      options:
-        from-pr: 19189
+  - CUDA-Samples-12.1-GCC-12.3.0-CUDA-12.1.1.eb:
+       # use easyconfig that only install subset of CUDA samples,
+       # to circumvent problem with nvcc linking to glibc of host OS;
+       # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19189
+       options:
+         from-pr: 19189