Skip to content

Apply hooks in install_cuda_and_libraries #165

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

Merged
ocaisa merged 2 commits into from
Feb 20, 2026
Merged

Apply hooks in install_cuda_and_libraries #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f061827
Make sure the hooks are applied in install_cuda_and_libraries, but th…
Feb 19, 2026
7241eb8
Merge branch 'main' into apply_hooks_to_cuda_installs
ocaisa Feb 20, 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
6 changes: 3 additions & 3 deletions eb_hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ def pre_fetch_hook_check_installation_path(self, *args, **kwargs):
strict_eessi_installation = (
bool(re.search(EESSI_INSTALLATION_REGEX, self.installdir)) or
self.installdir.startswith(HOST_INJECTIONS_LOCATION))
if strict_eessi_installation:
if strict_eessi_installation and not os.getenv("EESSI_OVERRIDE_STRICT_INSTALLPATH_CHECK"):
dependency_names = self.cfg.dependency_names()
if self.cfg.name in accelerator_deps or any(dep in dependency_names for dep in accelerator_deps):
# Make sure the path is an accelerator location
Expand Down Expand Up @@ -1093,7 +1093,7 @@ def pre_configure_hook_graphviz(self, *args, **kwargs):
# Replace --with-ltdl-lib and --with-zlibdir options defined in the EC to point to compat layer
lib_dir = os.path.join(usr_dir, 'lib64')
new_items = set()
# Add to the new_items all the old items except the `--with-ltdl-lib` and `--with-ltdl-lib` for
# Add to the new_items all the old items except the `--with-ltdl-lib` and `--with-ltdl-lib` for
# which we fix the lib dir to lib64 instead of lib
for item in old_items:
if item.startswith('--with-ltdl-lib'):
Expand Down Expand Up @@ -1487,7 +1487,7 @@ def pre_test_hook_ignore_failing_tests_OpenBabel_a64fx(self, *args, **kwargs):
Pre-test hook for OpenBabel: skip timeout tests for OpenBabel 3.1.1 on aarch64/a64fx
see https://github.com/EESSI/software-layer/pull/1332#issuecomment-3877255228
the `testroundtrip.py` test reads and writes tens of thousands of small files.
The test works fine when manually ran with EESSI-extend either directly or inside an eessi_container, but
The test works fine when manually ran with EESSI-extend either directly or inside an eessi_container, but
consistently fails with the bot
"""
cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
Expand Down
10 changes: 3 additions & 7 deletions scripts/gpu_support/nvidia/install_cuda_and_libraries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,9 @@ for EASYSTACK_FILE in ${TOPDIR}/easystacks/eessi-*CUDA*.yml; do
MODULEPATH=${EASYBUILD_INSTALLPATH}/.modules/all
echo "set MODULEPATH=${MODULEPATH}"

# We don't want hooks used in this install, we need vanilla installations
touch "${tmpdir}"/none.py
export EASYBUILD_HOOKS="${tmpdir}/none.py"

# We need to skip the hook that checks if CUDA software installed in an accelerator-specific prefix
export EESSI_OVERRIDE_STRICT_INSTALLPATH_CHECK=1

# show EasyBuild configuration
echo "Show EasyBuild configuration"
eb --show-config
Expand Down Expand Up @@ -238,8 +237,6 @@ for EASYSTACK_FILE in ${TOPDIR}/easystacks/eessi-*CUDA*.yml; do
# is run, it is not reinstalled.
# - ${accept_eula_opt}: We only set the --accept-eula-for=CUDA option if CUDA will be installed and if
# this script was called with the argument --accept-cuda-eula.
# - hooks: We don't want hooks used in this install, we need vanilla
# installations of CUDA and/or other libraries
# - easystack: Path to easystack file that defines which packages shall be
# installed
accept_eula_opt=
Expand All @@ -256,7 +253,6 @@ for EASYSTACK_FILE in ${TOPDIR}/easystacks/eessi-*CUDA*.yml; do
touch "$tmpdir"/none.py
eb_args="--prefix=$tmpdir"
eb_args="$eb_args --installpath-modules=${EASYBUILD_INSTALLPATH}/.modules"
eb_args="$eb_args --hooks="$tmpdir"/none.py"
eb_args="$eb_args --easystack ${EASYSTACK_FILE}"
if [[ ! -z ${accept_eula_opt} ]]; then
eb_args="$eb_args --accept-eula-for=$accept_eula_opt"
Expand Down