Skip to content

Commit b6812e5

Browse files
authored
Merge pull request #217 from casparvl/make_eb_hooks_amd_accelerator_aware
2 parents 61c183e + bc39341 commit b6812e5

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

eb_hooks.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,13 +717,18 @@ def pre_fetch_hook(self, *args, **kwargs):
717717
def pre_fetch_hook_check_installation_path(self, *args, **kwargs):
718718
# When we know the CUDA status, we will need to verify the installation path
719719
# if we are doing an EESSI or host_injections installation
720-
accelerator_deps = ['CUDA']
720+
accelerator_deps = ['CUDA', 'ROCm-LLVM']
721+
accelerator_toolchains = ['rocm-compilers', 'rompi', 'rfbf', 'rfoss']
721722
strict_eessi_installation = (
722723
bool(re.search(EESSI_INSTALLATION_REGEX, self.installdir)) or
723724
self.installdir.startswith(HOST_INJECTIONS_LOCATION))
724725
if strict_eessi_installation and not os.getenv("EESSI_OVERRIDE_STRICT_INSTALLPATH_CHECK"):
725726
dependency_names = self.cfg.dependency_names()
726-
if self.cfg.name in accelerator_deps or any(dep in dependency_names for dep in accelerator_deps):
727+
if (
728+
self.cfg.name in accelerator_deps
729+
or any(dep in dependency_names for dep in accelerator_deps)
730+
or self.toolchain.name in accelerator_toolchains
731+
):
727732
# Make sure the path is an accelerator location
728733
if "/accel/" not in self.installdir:
729734
raise EasyBuildError(

0 commit comments

Comments
 (0)