Skip to content

Commit e3fdd59

Browse files
committed
call install_scripts.sh earlier, since it installs files required by EESSI/<version> module being loaded
1 parent 0b4ff7d commit e3fdd59

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

EESSI-install-software.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,20 @@ else
183183
fatal_error "Failed to initialize Lmod?! (see output in ${ml_version_out}"
184184
fi
185185

186+
# install any additional required scripts
187+
# order is important: these are needed to install a full CUDA SDK in host_injections
188+
# for now, this just reinstalls all scripts. Note the most elegant, but works
189+
190+
# the install_scripts.sh script relies on knowing the location of the PR diff
191+
# assume there's only one diff file that corresponds to the PR patch file
192+
pr_diff=$(ls [0-9]*.diff | head -1)
193+
export PR_DIFF="$PWD/$pr_diff"
194+
195+
# Only run install_scripts.sh if not in dev.eessi.io for security
196+
if [[ -z ${EESSI_DEV_PROJECT} ]]; then
197+
${TOPDIR}/install_scripts.sh --prefix ${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION} --eessi-version ${EESSI_VERSION}
198+
fi
199+
186200
# Make sure we start with no modules and clean $MODULEPATH
187201
echo ">> Setting up \$MODULEPATH..."
188202
module --force purge
@@ -238,20 +252,6 @@ if [ ! -f ${_lmod_sitepackage_file} ]; then
238252
python3 ${TOPDIR}/create_lmodsitepackage.py ${_eessi_software_path}
239253
fi
240254

241-
# install any additional required scripts
242-
# order is important: these are needed to install a full CUDA SDK in host_injections
243-
# for now, this just reinstalls all scripts. Note the most elegant, but works
244-
245-
# the install_scripts.sh script relies on knowing the location of the PR diff
246-
# assume there's only one diff file that corresponds to the PR patch file
247-
pr_diff=$(ls [0-9]*.diff | head -1)
248-
export PR_DIFF="$PWD/$pr_diff"
249-
250-
# Only run install_scripts.sh if not in dev.eessi.io for security
251-
if [[ -z ${EESSI_DEV_PROJECT} ]]; then
252-
${TOPDIR}/install_scripts.sh --prefix ${EESSI_PREFIX} --eessi-version ${EESSI_VERSION}
253-
fi
254-
255255
echo ">> Configuring EasyBuild..."
256256

257257
# Make sure EESSI-extend is not loaded, and configure location variables for a

0 commit comments

Comments
 (0)