Skip to content

add EESSI/2025.06 module file (+ populate scripts for all CPU targets in 2025.06 software layer) #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions EESSI-install-software.sh
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,20 @@ else
fatal_error "Failed to initialize Lmod?! (see output in ${ml_version_out}"
fi

# install any additional required scripts
# order is important: these are needed to install a full CUDA SDK in host_injections
# for now, this just reinstalls all scripts. Note the most elegant, but works

# the install_scripts.sh script relies on knowing the location of the PR diff
# assume there's only one diff file that corresponds to the PR patch file
pr_diff=$(ls [0-9]*.diff | head -1)
export PR_DIFF="$PWD/$pr_diff"

# Only run install_scripts.sh if not in dev.eessi.io for security
if [[ -z ${EESSI_DEV_PROJECT} ]]; then
${TOPDIR}/install_scripts.sh --prefix ${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION} --eessi-version ${EESSI_VERSION}
fi

# Make sure we start with no modules and clean $MODULEPATH
echo ">> Setting up \$MODULEPATH..."
module --force purge
Expand Down Expand Up @@ -238,20 +252,6 @@ if [ ! -f ${_lmod_sitepackage_file} ]; then
python3 ${TOPDIR}/create_lmodsitepackage.py ${_eessi_software_path}
fi

# install any additional required scripts
# order is important: these are needed to install a full CUDA SDK in host_injections
# for now, this just reinstalls all scripts. Note the most elegant, but works

# the install_scripts.sh script relies on knowing the location of the PR diff
# assume there's only one diff file that corresponds to the PR patch file
pr_diff=$(ls [0-9]*.diff | head -1)
export PR_DIFF="$PWD/$pr_diff"

# Only run install_scripts.sh if not in dev.eessi.io for security
if [[ -z ${EESSI_DEV_PROJECT} ]]; then
${TOPDIR}/install_scripts.sh --prefix ${EESSI_PREFIX}
fi

echo ">> Configuring EasyBuild..."

# Make sure EESSI-extend is not loaded, and configure location variables for a
Expand Down
1 change: 1 addition & 0 deletions init/modules/EESSI/2023.06.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ More information
whatis("Description: The European Environment for Scientific Software Installations (EESSI, pronounced as easy) is a collaboration between different European partners in HPC community. The goal of this project is to build a common stack of scientific software installations for HPC systems and beyond, including laptops, personal workstations and cloud infrastructure.")
whatis("URL: https://www.eessi.io/docs/")
conflict("EESSI")
-- this is a version-agnostic module file, works for EESSI/2023.06, EESSI/2025.06, etc.
local eessi_version = myModuleVersion()
local eessi_repo = "/cvmfs/software.eessi.io"
if (subprocess("uname -m"):gsub("\n$","") == "riscv64") then
Expand Down
1 change: 1 addition & 0 deletions init/modules/EESSI/2025.06.lua
16 changes: 15 additions & 1 deletion install_scripts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ POSITIONAL_ARGS=()

while [[ $# -gt 0 ]]; do
case $1 in
--eessi-version)
EESSI_VERSION="$2"
shift 2
;;
-p|--prefix)
INSTALL_PREFIX="$2"
shift 2
Expand All @@ -149,6 +153,16 @@ while [[ $# -gt 0 ]]; do
esac
done

if [ -z "${INSTALL_PREFIX}" ]; then
echo "EESSI prefix not specified, you must use --prefix" >&2
exit 2
fi

if [ -z "${EESSI_VERSION}" ]; then
echo "EESSI version not specified, you must use --eessi-version" >&2
exit 3
fi

set -- "${POSITIONAL_ARGS[@]}"

TOPDIR=$(dirname $(realpath $0))
Expand All @@ -175,7 +189,7 @@ copy_files_by_list ${TOPDIR}/init/Magic_Castle ${INSTALL_PREFIX}/init/Magic_Cast

# Copy for init/modules/EESSI directory
mc_files=(
2023.06.lua
${EESSI_VERSION}.lua
)
copy_files_by_list ${TOPDIR}/init/modules/EESSI ${INSTALL_PREFIX}/init/modules/EESSI "${mc_files[@]}"

Expand Down