Skip to content

Commit 0814703

Browse files
committed
Remove hook and add EESSI warning for aarch+amdgpu
1 parent e8e31e1 commit 0814703

2 files changed

Lines changed: 3 additions & 15 deletions

File tree

eb_hooks.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555

5656
# Make sure a single environment variable name is used for this throughout the hooks
5757
EESSI_IGNORE_ZEN4_GCC1220_ENVVAR="EESSI_IGNORE_LMOD_ERROR_ZEN4_GCC1220"
58-
EESSI_IGNORE_AARCH64_ROCMLLVM641_ENVVAR="EESSI_IGNORE_LMOD_ERROR_AARCH64_ROCMLLVM641"
5958

6059
STACK_REPROD_SUBDIR = 'reprod'
6160

@@ -841,20 +840,6 @@ def is_unsupported_module(self):
841840
setattr(self, EESSI_UNSUPPORTED_MODULE_ATTR, UnsupportedModule(envvar=var,errmsg=errmsg))
842841
return True
843842

844-
# ROCm-LLVM 6.4.1 is not supported on aarch64
845-
# see: https://github.com/EESSI/software-layer/pull/1473#issuecomment-4370846033
846-
if not os.getenv("EESSI_OVERRIDE_ROCM_VERSION_CHECK"):
847-
if self.cfg.name == 'ROCm-LLVM' and self.cfg.version in ('6.4.1',):
848-
if get_eessi_envvar('EESSI_CPU_FAMILY') == 'aarch64':
849-
msg += "Building with '--module-only --force' and injecting an LmodError into the modulefile."
850-
msg += "You can override this behaviour by setting the EESSI_OVERRIDE_ROCM_VERSION_CHECK environment variable."
851-
print_warning(msg)
852-
errmsg = "ROCm-LLVM/6.4.1 is not supported on the aarch64 architecture."
853-
errmsg += "For more details, see: https://github.com/EESSI/software-layer/pull/1473#issuecomment-4370846033"
854-
var=EESSI_IGNORE_AARCH64_ROCMLLVM641_ENVVAR
855-
setattr(self, EESSI_UNSUPPORTED_MODULE_ATTR, UnsupportedModule(envvar=var, errmsg=errmsg))
856-
return True
857-
858843
# If all the above logic passed, this module is supported
859844
setattr(self, EESSI_SUPPORTED_MODULE_ATTR, True)
860845
return False

init/modules/EESSI/2023.06.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ if not (archdetect_accel == nil or archdetect_accel == '') then
180180
-- /cvmfs/software.eessi.io/versions/<EESSI_VERSION>/software/linux/x86_64/amd/zen3/accel/nvidia/cc80/modules/all
181181
eessi_module_path_accel = pathJoin(eessi_accel_software_path, archdetect_accel, eessi_modules_subdir)
182182
eessiDebug("Checking if " .. eessi_module_path_accel .. " exists")
183+
if eessi_cpu_family == "aarch64" and archdetect_accel:match("^accel/amd/") then
184+
LmodMessage("aarch64 CPU detected, no support for AMD GPUs in production repository yet.")
185+
end
183186
if not isDir(eessi_module_path_accel) then
184187
-- fall back to major version GPU arch if the exact one is not an option (i.e, 7.5 -> 7.0)
185188
local original_archdetect_accel = archdetect_accel

0 commit comments

Comments
 (0)