Skip to content
Closed
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
2 changes: 1 addition & 1 deletion EESSI-extend-easybuild.eb
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ if eessi_cvmfs_install then
end
easybuild_installpath = os.getenv("EESSI_SOFTWARE_PATH")
-- enforce accelerator subdirectory usage for CVMFS installs (only if an accelerator install is requested)
if (eessi_accelerator_target ~= nil) and (cuda_compute_capability ~= nil) and (os.getenv("EESSI_ACCELERATOR_INSTALL") ~= nil) then
if (eessi_accelerator_target ~= nil) and (cuda_compute_capability ~= nil or amd_compute_capability ~= nil) and (os.getenv("EESSI_ACCELERATOR_INSTALL") ~= nil) then
easybuild_installpath = pathJoin(easybuild_installpath, eessi_accelerator_target)
end
elseif eessi_site_install then
Expand Down
8 changes: 8 additions & 0 deletions EESSI-install-software.sh
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ module --force purge
module unuse $MODULEPATH

# Initialize the EESSI environment
export EESSI_DEBUG_INIT=1
module use $TOPDIR/init/modules
module load EESSI/$EESSI_VERSION

Expand Down Expand Up @@ -314,9 +315,16 @@ elif [[ -n "$EESSI_ACCELERATOR_TARGET_OVERRIDE" ]]; then
export EESSI_ACCELERATOR_INSTALL=1
fi

echo "EESSI environment before loading EESSI-extend:"
env | grep EESSI

echo "DEBUG: before loading EESSI-extend // EASYBUILD_INSTALLPATH='${EASYBUILD_INSTALLPATH}'"
source $TOPDIR/load_eessi_extend_module.sh ${EESSI_VERSION}
unset EESSI_DEBUG_INIT
echo "DEBUG: after loading EESSI-extend // EASYBUILD_INSTALLPATH='${EASYBUILD_INSTALLPATH}'"
echo "EESSI environment after loading EESSI-extend:"
env | grep EESSI


# Install full CUDA SDK and cu* libraries in host_injections
# (This is done *before* configuring EasyBuild as it may rely on an older EB version)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
easyconfigs:
- ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb
9 changes: 7 additions & 2 deletions eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -717,13 +717,18 @@ def pre_fetch_hook(self, *args, **kwargs):
def pre_fetch_hook_check_installation_path(self, *args, **kwargs):
# When we know the CUDA status, we will need to verify the installation path
# if we are doing an EESSI or host_injections installation
accelerator_deps = ['CUDA']
accelerator_deps = ['CUDA', 'ROCm-LLVM']
accelerator_toolchains = ['rocm-compilers', 'rompi', 'rfbf', 'rfoss']
strict_eessi_installation = (
bool(re.search(EESSI_INSTALLATION_REGEX, self.installdir)) or
self.installdir.startswith(HOST_INJECTIONS_LOCATION))
if strict_eessi_installation and not os.getenv("EESSI_OVERRIDE_STRICT_INSTALLPATH_CHECK"):
dependency_names = self.cfg.dependency_names()
if self.cfg.name in accelerator_deps or any(dep in dependency_names for dep in accelerator_deps):
if (
self.cfg.name in accelerator_deps
or any(dep in dependency_names for dep in accelerator_deps)
or self.toolchain.name in accelerator_toolchains
):
# Make sure the path is an accelerator location
if "/accel/" not in self.installdir:
raise EasyBuildError(
Expand Down
Loading