Merge pull request #32 from ocaisa/remove_configure_easybuild

Remove `configure_easybuild` script

Author: casparvl

bot/inspect.sh

@@ -382,15 +382,12 @@ else
     fatal_error "Failed to initialize Lmod?! (see output in ${ml_version_out}"
 fi
 
-echo ">> Configuring EasyBuild..."
-source $TOPDIR/configure_easybuild
-
 echo ">> Setting up \$MODULEPATH..."
 # make sure no modules are loaded
 module --force purge
 # ignore current $MODULEPATH entirely
 module unuse $MODULEPATH
-module use $EASYBUILD_INSTALLPATH/modules/all
+module use $EESSI_SOFTWARE_PATH/modules/all
 if [[ -z ${MODULEPATH} ]]; then
     fatal_error "Failed to set up \$MODULEPATH?!"
 else
@@ -405,14 +402,15 @@ echo " - job directory is $HOME (\$HOME), check for slurm-*.out file"
 echo " - temporary data of the job is available at /tmp"
 echo " - note, the prefix $EESSI_PREFIX is writable"
 echo
-echo "You may want to load an EasyBuild module. The inspect.sh script does not load"
-echo "that automatically, because multiple versions might have been used by the job."
+echo "You may want to load an EasyBuild/EESSI-extend module. The inspect.sh script does not"
+echo "load those automatically, because multiple versions might have been used by the job."
 echo "Choose an EasyBuild version (see installed versions with 'module avail EasyBuild')"
 echo "and simply run"
 echo
 echo "module load EasyBuild/_VERSION_"
+echo "module load EEESSI-extend"
 echo
-echo "Replace _VERSION_ with the version you want to use."
+echo "Replace _VERSION_ with the EasyBuild version you want/need to use."
 echo
 
 EOF

check_missing_installations.sh

@@ -27,7 +27,8 @@ LOCAL_TMPDIR=$(mktemp -d)
 
 source $TOPDIR/scripts/utils.sh
 
-source $TOPDIR/configure_easybuild
+# configure EasyBuild via EESSI-extend
+module load EESSI-extend/${EESSI_VERSION}-easybuild
 
 echo ">> Active EasyBuild configuration when checking for missing installations:"
 ${EB:-eb} --show-config

configure_easybuild

@@ -5,7 +5,7 @@ set -e
 base_dir=$(dirname $(realpath $0))
 
 if [ $# -ne 5 ]; then
-    echo "ERROR: Usage: $0 <EESSI tmp dir (example: /tmp/$USER/EESSI)> <version (example: 2023.06)> <CPU arch subdir (example: x86_64/amd/zen2)> <accelerator subdir (example: nvidia/cc80)> <path to tarball>" >&2
+    echo "ERROR: Usage: $0 <EESSI tmp dir (example: /tmp/$USER/EESSI)> <version (example: 2023.06)> <CPU arch subdir (example: x86_64/amd/zen2)> <accelerator subdir (example: accel/nvidia/cc80)> <path to tarball>" >&2
     exit 1
 fi
 eessi_tmpdir=$1
@@ -63,7 +63,7 @@ if [ -d ${eessi_version}/init ]; then
 fi
 
 # consider both CPU-only and accelerator subdirectories
-for subdir in ${cpu_arch_subdir} ${cpu_arch_subdir}/accel/${accel_subdir}; do
+for subdir in ${cpu_arch_subdir} ${cpu_arch_subdir}/${accel_subdir}; do
 
     if [ -d ${eessi_version}/software/${os}/${subdir}/modules ]; then
         # module files

create_tarball.sh

@@ -96,7 +96,7 @@ if [ "${install_eessi_extend}" = true ] || [ "${rebuild_eessi_extend}" = true ];
     ORIG_PATH=${PATH}
     ORIG_PYTHONPATH=${PYTHONPATH}
 
-    # source configure_easybuild to use correct eb settings
+    # minimally configure easybuild to get EESSI-extend in the right place
     (
         export EASYBUILD_PREFIX=${TMPDIR}/easybuild
         export EASYBUILD_READ_ONLY_INSTALLDIR=1