Skip to content

Make the use of the required keyword conditional on the EB version #179

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 3 commits into from
Mar 11, 2026
Merged

Make the use of the required keyword conditional on the EB version #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd982fb
Make the use of the required keyword conditional on the EB version
Mar 11, 2026
2f025d0
Move EESSI-extend unload up to avoid EASYBUILD_ config variables ling…
Mar 11, 2026
dc8f387
Clarify comment
Mar 11, 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
17 changes: 15 additions & 2 deletions eb_hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,19 @@ def print_warning(*args, **kwargs):
orig_print_warning(*args, **kwargs)


def get_cuda_cc_string(self):
# required keyword was introduce in 5.1.1
if EASYBUILD_VERSION >= '5.1.1':
cuda_ccs_string = self.cfg.get_cuda_cc_template_value('cuda_compute_capabilities', required=False)
# mimic the 'required=False' behavior pre-EB 5.1.1
else:
try:
cuda_ccs_string = self.cfg.get_cuda_cc_template_value('cuda_compute_capabilities')
except:
cuda_ccs_string = ''
return cuda_ccs_string


def is_gcccore_1220_based(**kwargs):
# ecname, ecversion, tcname, tcversion):
"""
Expand Down Expand Up @@ -760,7 +773,7 @@ def is_unsupported_module(self):
cudnn_ver = get_dependency_software_version("cuDNN", ec=self.cfg, check_deps=True, check_builddeps=True)
if cudnn_ver:
# cuda_ccs_string is e.g. "8.0,9.0"
cuda_ccs_string = self.cfg.get_cuda_cc_template_value('cuda_compute_capabilities', required=False)
cuda_ccs_string = get_cuda_cc_string(self)
# cuda_ccs is empty if none are defined
if cuda_ccs_string:
# cuda_ccs is a comma-seperated string. Convert to list for easier handling
Expand Down Expand Up @@ -788,7 +801,7 @@ def is_unsupported_module(self):
cudaver = get_dependency_software_version("CUDA", ec=self.cfg, check_deps=True, check_builddeps=True)
if cudaver:
# cuda_ccs_string is e.g. "8.0,9.0"
cuda_ccs_string = self.cfg.get_cuda_cc_template_value('cuda_compute_capabilities', required=False)
cuda_ccs_string = get_cuda_cc_string(self)
# cuda_ccs is empty if none are defined
if cuda_ccs_string:
# cuda_ccs is a comma-seperated string. Convert to list for easier handling
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -107,6 +107,8 @@ for EASYSTACK_FILE in ${TOPDIR}/easystacks/eessi-*CUDA*.yml; do
echo_yellow ">> No EasyBuild/${eb_version} module found: skipping step to install easystack file ${easystack_file} (see output in ${module_avail_out})"
continue
fi
# Safer to unload EESSI-extend before loading an EasyBuild version, in case unload behavior ever becomes dependent on EasyBuild version
module unload EESSI-extend
module load EasyBuild/${eb_version}

# Make sure EESSI-extend does a site install here
Expand All @@ -115,7 +117,6 @@ for EASYSTACK_FILE in ${TOPDIR}/easystacks/eessi-*CUDA*.yml; do
unset EESSI_PROJECT_INSTALL
unset EESSI_USER_INSTALL
export EESSI_SITE_INSTALL=1
module unload EESSI-extend
ml_av_eessi_extend_out=${tmpdir}/ml_av_eessi_extend.out
# need to use --ignore_cache to avoid the case that the module was removed (to be
# rebuilt) but it is still in the cache and the rebuild failed
Expand Down
Loading