From 704824a63ffa9a7bf74901e8cd82b85779f7d0c5 Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen <33718780+casparvl@users.noreply.github.com> Date: Tue, 21 Nov 2023 18:15:31 +0100 Subject: [PATCH 1/2] Update eessi-2023.06-eb-4.8.2-2023a.yml Co-authored-by: Kenneth Hoste --- eessi-2023.06-eb-4.8.2-2023a.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.2-2023a.yml b/eessi-2023.06-eb-4.8.2-2023a.yml index 01a47bbc99..cbcc3caca0 100644 --- a/eessi-2023.06-eb-4.8.2-2023a.yml +++ b/eessi-2023.06-eb-4.8.2-2023a.yml @@ -1,2 +1,7 @@ easyconfigs: - - CUDA-Samples-12.1-GCC-12.3.0-CUDA-12.1.1.eb + - 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 From b42b2d76464112f54f734ccd7055a8fa883e54f4 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Tue, 21 Nov 2023 22:37:35 +0100 Subject: [PATCH 2/2] Update EESSI-pilot-install-software.sh Co-authored-by: Kenneth Hoste --- EESSI-pilot-install-software.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh index 9baa987b01..de921b8855 100755 --- 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