Skip to content

Allow different overrides for compat (i.e. CPU family) and modules (i.e. SOFTWARE_SUBDIR) #222

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.

Sign up for GitHub

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
casparvl wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −2
Open

Allow different overrides for compat (i.e. CPU family) and modules (i.e. SOFTWARE_SUBDIR) #222

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
992f790
Facilitate checking of e.g. RISCV modules on an X86_64 host. This is …
May 6, 2026
b47610c
Merge branch 'main' into allow_cpu_family_override_and_respect_riscv_…
ocaisa May 7, 2026
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
13 changes: 11 additions & 2 deletions init/modules/EESSI/2023.06.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ local eessi_init_prefix = pathJoin(eessi_prefix, "init")
local eessi_software_layer_version_suffix = ""
local eessi_os_type = "linux"
-- for RISC-V clients we need to do some overrides, as things are stored in different CVMFS repositories
if (subprocess("uname -m"):gsub("\n$","") == "riscv64") then
local eessi_software_subdir_override = os.getenv("EESSI_SOFTWARE_SUBDIR_OVERRIDE")
if (
subprocess("uname -m"):gsub("\n$","") == "riscv64"
or (eessi_software_subdir_override and string.find(eessi_software_subdir_override, "riscv64"))
) then
if (eessi_version == "2023.06" or eessi_version == "20240402") then
eessi_version_override = os.getenv("EESSI_VERSION_OVERRIDE") or ""
index_suffix = string.find(eessi_version_override, '-')
Expand Down Expand Up @@ -114,7 +118,12 @@ local archdetect = archdetect_cpu()
-- archdetect_accel() attempts to identify an accelerator, e.g., accel/nvidia/cc80
local archdetect_accel = archdetect_accel()
-- eessi_cpu_family is derived from the archdetect match, e.g., x86_64
local eessi_cpu_family = archdetect:match("([^/]+)")
local eessi_cpu_family
if os.getenv("EESSI_CPU_FAMILY_OVERRIDE") then
eessi_cpu_family = os.getenv("EESSI_CPU_FAMILY_OVERRIDE")
else
eessi_cpu_family = archdetect:match("([^/]+)")
end
local eessi_software_subdir = archdetect
-- eessi_eprefix is the base location of the compat layer, e.g., /cvmfs/software.eessi.io/versions/<EESSI_VERSION>/compat/linux/x86_64
local eessi_eprefix = pathJoin(eessi_compat_prefix, eessi_os_type, eessi_cpu_family)
Expand Down
Loading