Skip to content

Fix use of CUDA CCs in LLVM easyblock and cleanup #3755

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
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Fix use of CUDA CCs in LLVM easyblock and cleanup #3755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
98be9dd
Fix use of CUDA CCs in LLVM easyblock and cleanup
Flamefire Jun 4, 2025
605a6f8
Fix quoting
Flamefire Jun 4, 2025
b2f1907
Fix quoting
Flamefire Jun 4, 2025
5b2b41a
Introduce list_to_cmake_arg
Flamefire Jun 4, 2025
965c2a8
Use 'required' parameter for CUDA template
Flamefire Jun 4, 2025
5dd7210
Fix line length
Flamefire Jun 4, 2025
fc5be7e
Use f-string
Flamefire Jun 4, 2025
2f6f142
Don't modify global variables
Flamefire Jun 6, 2025
ffca4ec
Install OpenMP alias symlinks
Flamefire Jun 6, 2025
fb94686
Merge branch 'develop' into 20250604092520_new_pr_llvm
Flamefire Jun 8, 2025
0c36df5
Fix general_opts usage after merge
Flamefire Jun 8, 2025
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
7 changes: 6 additions & 1 deletion easybuild/easyblocks/generic/cmakemake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ def extra_options(extra_vars=None):
})
return extra_vars

@staticmethod
def list_to_cmake_arg(lst):
"""Convert iterable of strings to a value that can be passed as a CLI argument to CMake resulting in a list"""
return "'%s'" % ';'.join(lst)

def __init__(self, *args, **kwargs):
"""Constructor for CMakeMake easyblock"""
super().__init__(*args, **kwargs)
Expand Down Expand Up @@ -356,7 +361,7 @@ def configure_step(self, srcdir=None, builddir=None):
options['CMAKE_CUDA_COMPILER'] = which('nvcc')
cuda_cc = build_option('cuda_compute_capabilities') or self.cfg['cuda_compute_capabilities']
if cuda_cc:
options['CMAKE_CUDA_ARCHITECTURES'] = '"%s"' % ';'.join([cc.replace('.', '') for cc in cuda_cc])
options['CMAKE_CUDA_ARCHITECTURES'] = self.list_to_cmake_arg(cc.replace('.', '') for cc in cuda_cc)
else:
raise EasyBuildError('List of CUDA compute capabilities must be specified, either via '
'cuda_compute_capabilities easyconfig parameter or via '
Expand Down
Loading