Skip to content

Alternative refactoring and fix for LLVM easyblock #3818

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

Closed
Flamefire wants to merge 13 commits into from
Closed

Alternative refactoring and fix for LLVM easyblock #3818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
194ef5d
Remove super() arguments
Flamefire Jun 30, 2025
bb67396
Introduce list_to_cmake_arg
Flamefire Jun 4, 2025
97d145b
Don't modify global variables
Flamefire Jun 6, 2025
2961940
Rename usepolly to use_polly
Flamefire Jun 30, 2025
cb5c9bf
Don't overwrite use_polly if set
Flamefire Jul 1, 2025
619e7b3
Warn when using unknown CPU architecture
Flamefire Jun 30, 2025
8569ddd
Don't check for .mod files
Flamefire Jun 30, 2025
4d7f071
Refactor LLVM easyblock
Flamefire Jun 30, 2025
bfdfd39
Don't repeatedly/reduntantly construct a LooseVersion instance
Flamefire Jun 30, 2025
d6a7e63
Install OpenMP alias symlinks
Flamefire Jun 6, 2025
2f82839
Use cfg.get_cuda_cc_template_value to get CUDA CCs
Flamefire Jun 30, 2025
631bb23
Fix use of CUDA CCs in LLVM easyblock and cleanup
Flamefire Jun 4, 2025
5ae5722
Set LIBOMPTARGET_DEVICE_ARCHITECTURES only for LLVM 19
Flamefire Jul 1, 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