Skip to content
Draft
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
10 changes: 9 additions & 1 deletion EESSI-extend-easybuild.eb
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,17 @@ elseif eessi_site_install then
LmodError("You cannot use EESSI_SITE_INSTALL in combination with any other EESSI_*_INSTALL environment variables")
end
easybuild_installpath = os.getenv("EESSI_SITE_SOFTWARE_PATH")
-- enforce accelerator subdirectory usage for site installs (only if an accelerator install is requested)
-- Check that the plain EESSI_SITE_SOFTWARE_PATH exists
if not isDir(easybuild_installpath) then
LmodError("The location of EESSI_SITE_SOFTWARE_PATH (" .. easybuild_installpath .. ") does not exist or is not a folder")
end
Comment on lines +147 to +149
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EasyBuild will happily create the folder later on first run (if it is allowed), could just be a warning

-- enforce accelerator subdirectory usage for site installs (only if an accelerator install is requested)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
-- enforce accelerator subdirectory usage for site installs (only if an accelerator install is requested)
-- enforce accelerator subdirectory usage for site 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
easybuild_installpath = pathJoin(easybuild_installpath, eessi_accelerator_target)
-- Check that the EESSI_SITE_SOFTWARE_PATH with eessi_accelerator_target prefix exists
if not isDir(easybuild_installpath) then
LmodError("The easybuild install directory (" .. easybuild_installpath ..") does not exist or is not a folder")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, it doesn't have to exist.

The site paths are special because they are exposed by default. I'll need to check the other PR to make sure there is no check for their existence before adding them to MODULEPATH...when I build something for the site I expect everyone to see it even if their session started before the path existed. Lmod is fine with adding non-existent paths.

end
end
else
-- Deal with user and project installs
Expand Down
Loading