Skip to content
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

{2023.06} Rebuild EESSI-extend module to use $EESSI_ACCELERATOR_TARGET #810

Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
a122c6e
adjust installpath if EESSI_ACCELERATOR_TARGET is set
truib Nov 12, 2024
7cead8e
add rebuild easystack for EESSI-extend
truib Nov 12, 2024
58c1da5
adding changes from PR #812 to validate them here
truib Nov 13, 2024
679d180
use script that loads and installs EESSI-extend
truib Nov 13, 2024
f9243d8
facilitate a bit debugging
truib Nov 13, 2024
68a882f
fix module command arg typo
truib Nov 13, 2024
37c1e9c
run module avail with --ignore_cache
truib Nov 13, 2024
a83cde8
use previous overlay-upper dir(s) as left-most lowerdirs
truib Nov 13, 2024
16dce19
use alternative approach to remove software to be rebuilt
truib Nov 13, 2024
bcb0b65
fix syntax error
truib Nov 13, 2024
0fb455d
remove script is not run by root anymore
truib Nov 13, 2024
75e9c35
add debug info
truib Nov 13, 2024
5ba88d3
set 777 perms
truib Nov 13, 2024
47fe73c
add more debug info
truib Nov 13, 2024
acf987c
add even more debug info
truib Nov 13, 2024
32e6d69
add lower dirs to build step
truib Nov 13, 2024
afa1356
limit perm to 700
truib Nov 13, 2024
9eebad7
source configure_easybuild and run in subshell
truib Nov 13, 2024
2af57ee
set 770 perms
truib Nov 13, 2024
2184b30
alternative approach to remove files/directories; one-by-one in depth…
truib Nov 14, 2024
2438c47
pre-package hook for EESSI-extend that stats all files/dirs in instal…
truib Nov 14, 2024
29004ce
fix syntax error
truib Nov 14, 2024
cf076be
fix another code error
truib Nov 14, 2024
60b3f31
print file permissions
truib Nov 14, 2024
ace7d7e
convert permissions to octal value
truib Nov 14, 2024
f760fd2
show file creation time too
truib Nov 14, 2024
7315145
disable hook, use recursive rm and do ls on specific directory
truib Nov 14, 2024
ea6a842
recreate 'installdir/easybuild' and use keeppreviousinstall option
truib Nov 14, 2024
e5d3692
remove using keeppreviousinstall
truib Nov 14, 2024
0fe18c2
show contents and recreate specific/problematic directory
truib Nov 15, 2024
ddfec84
only make directories and module file writable
truib Nov 15, 2024
c7916ec
remove hooks
truib Nov 15, 2024
1c24b7a
clean up lower dir changes
truib Nov 15, 2024
5fd8fd7
need to create directory for module file in lower_dirs
truib Nov 15, 2024
f7baeaf
add try-amend keeppreviousinstal=True option in easystack
truib Nov 15, 2024
3db71ef
need keeppreviousinstall already in load_eessi_... script
truib Nov 15, 2024
c56712e
revert to using standard method (fakeroot) to remove existing install…
truib Nov 15, 2024
d1264e1
first load/install EESSI-extend module, then install CUDA and libraries
truib Nov 15, 2024
d226151
Merge branch '2023.06-software.eessi.io' of github-trz:EESSI/software…
truib Nov 18, 2024
fedfd77
tweak script to just load EESSI-extend, and exit if it couldn't be lo…
truib Nov 18, 2024
8401bdd
Merge branch '2023.06-software.eessi.io' of github-trz:EESSI/software…
truib Nov 18, 2024
8e87c33
various changes to address suggestions
truib Nov 20, 2024
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
15 changes: 15 additions & 0 deletions EESSI-extend-2023.06-easybuild.eb
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@ if (os.getenv("EESSI_CVMFS_INSTALL") ~= nil) then
end
eessi_cvmfs_install = true
easybuild_installpath = os.getenv("EESSI_SOFTWARE_PATH")
eessi_accelerator_target = os.getenv("EESSI_ACCELERATOR_TARGET")
ocaisa marked this conversation as resolved.
Show resolved Hide resolved
if (eessi_accelerator_target ~= nil) then
cuda_compute_capability = string.match(eessi_accelerator_target, "^nvidia/cc([0-9][0-9])$")
if (cuda_compute_capability ~= nil) then
easybuild_installpath = pathJoin(easybuild_installpath, 'accel', eessi_accelerator_target)
easybuild_cuda_compute_capabilities = cuda_compute_capability:sub(1, 1) .. "." .. cuda_compute_capability:sub(2, 2)
else
LmodError("Incorrect value for $EESSI_ACCELERATOR_TARGET: " .. eessi_accelerator_target)
ocaisa marked this conversation as resolved.
Show resolved Hide resolved
end
end
elseif (os.getenv("EESSI_SITE_INSTALL") ~= nil) then
-- Make sure no other EESSI install environment variables are set
if ((os.getenv("EESSI_PROJECT_INSTALL") ~= nil) or (os.getenv("EESSI_USER_INSTALL") ~= nil)) then
Expand Down Expand Up @@ -146,6 +156,11 @@ setenv ("EASYBUILD_UMASK", "022")
-- Allow this module to be loaded when running EasyBuild
setenv ("EASYBUILD_ALLOW_LOADED_MODULES", "EasyBuild,EESSI-extend")

-- Set environment variables if building for CUDA compute capabilities
if (easybuild_cuda_compute_capabilities ~= nil) then
setenv ("EASYBUILD_CUDA_COMPUTE_CAPABILITIES", easybuild_cuda_compute_capabilities)
end

-- Set all related environment variables if we have project or user installations (including extending MODULEPATH)
if (user_modulepath ~= nil) then
-- Use a more restrictive umask for this case
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# 2024.11.12
# for installations under /cvmfs, if EESSI_ACCELERATOR_TARGET is set,
# EESSI-extend should adjust EASYBUILD_INSTALLPATH and set
# EASYBUILD_CUDA_COMPUTE_CAPABILITIES
easyconfigs:
- EESSI-extend-2023.06-easybuild.eb