Skip to content

Allow Clang easyblock to work with --module-only #16

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
mboisson merged 2 commits into from
Nov 22, 2022
Merged

Allow Clang easyblock to work with --module-only #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7488928
Allow Clang easyblock to work with `--module-only`
ocaisa Nov 22, 2022
23ca7c9
Fix lint
ocaisa Nov 22, 2022
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
83 changes: 42 additions & 41 deletions easybuild/easyblocks/c/clang.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,42 @@ def __init__(self, *args, **kwargs):
if 'libcxx' in self.cfg['llvm_runtimes']:
self.cfg.update('llvm_runtimes', 'libcxxabi', allow_duplicate=False)

build_targets = self.cfg['build_targets']
# define build_targets if not set
if build_targets is None:
arch = get_cpu_architecture()
try:
default_targets = DEFAULT_TARGETS_MAP[arch][:]
# If CUDA is included as a dep, add NVPTX as a target
if get_software_root("CUDA"):
default_targets += ["NVPTX"]
# For AMDGPU support we need ROCR-Runtime and
# ROCT-Thunk-Interface, however, since ROCT is a dependency of
# ROCR we only check for the ROCR-Runtime here
# https://openmp.llvm.org/SupportAndFAQ.html#q-how-to-build-an-openmp-amdgpu-offload-capable-compiler
if get_software_root("ROCR-Runtime"):
default_targets += ["AMDGPU"]
self.cfg['build_targets'] = build_targets = default_targets
self.log.debug("Using %s as default build targets for CPU/GPU architecture %s.", default_targets, arch)
except KeyError:
raise EasyBuildError("No default build targets defined for CPU architecture %s.", arch)

# carry on with empty list from this point forward if no build targets are specified
if build_targets is None:
self.cfg['build_targets'] = build_targets = []

unknown_targets = [target for target in build_targets if target not in CLANG_TARGETS]

if unknown_targets:
raise EasyBuildError("Some of the chosen build targets (%s) are not in %s.",
', '.join(unknown_targets), ', '.join(CLANG_TARGETS))

if LooseVersion(self.version) < LooseVersion('3.4') and "R600" in build_targets:
raise EasyBuildError("Build target R600 not supported in < Clang-3.4")

if LooseVersion(self.version) > LooseVersion('3.3') and "MBlaze" in build_targets:
raise EasyBuildError("Build target MBlaze is not supported anymore in > Clang-3.3")

def check_readiness_step(self):
"""Fail early on RHEL 5.x and derivatives because of known bug in libc."""
super(EB_Clang, self).check_readiness_step()
Expand Down Expand Up @@ -270,45 +306,6 @@ def find_source_dir(globpatterns, targetdir):
src['finalpath'] = new_path
break

def prepare_step(self, *args, **kwargs):
"""Prepare build environment."""
super(EB_Clang, self).prepare_step(*args, **kwargs)

build_targets = self.cfg['build_targets']
if build_targets is None:
arch = get_cpu_architecture()
try:
default_targets = DEFAULT_TARGETS_MAP[arch][:]
# If CUDA is included as a dep, add NVPTX as a target
if get_software_root("CUDA"):
default_targets += ["NVPTX"]
# For AMDGPU support we need ROCR-Runtime and
# ROCT-Thunk-Interface, however, since ROCT is a dependency of
# ROCR we only check for the ROCR-Runtime here
# https://openmp.llvm.org/SupportAndFAQ.html#q-how-to-build-an-openmp-amdgpu-offload-capable-compiler
if get_software_root("ROCR-Runtime"):
default_targets += ["AMDGPU"]
self.cfg['build_targets'] = build_targets = default_targets
self.log.debug("Using %s as default build targets for CPU/GPU architecture %s.", default_targets, arch)
except KeyError:
raise EasyBuildError("No default build targets defined for CPU architecture %s.", arch)

# carry on with empty list from this point forward if no build targets are specified
if build_targets is None:
self.cfg['build_targets'] = build_targets = []

unknown_targets = [target for target in build_targets if target not in CLANG_TARGETS]

if unknown_targets:
raise EasyBuildError("Some of the chosen build targets (%s) are not in %s.",
', '.join(unknown_targets), ', '.join(CLANG_TARGETS))

if LooseVersion(self.version) < LooseVersion('3.4') and "R600" in build_targets:
raise EasyBuildError("Build target R600 not supported in < Clang-3.4")

if LooseVersion(self.version) > LooseVersion('3.3') and "MBlaze" in build_targets:
raise EasyBuildError("Build target MBlaze is not supported anymore in > Clang-3.3")

def configure_step(self):
"""Run CMake for stage 1 Clang."""

Expand Down Expand Up @@ -699,8 +696,12 @@ def sanity_check_step(self):
if LooseVersion(self.version) >= LooseVersion('3.8'):
custom_paths['files'].extend(["lib/libomp.%s" % shlib_ext, "lib/clang/%s/include/omp.h" % self.version])

custom_paths['files'].extend(["lib/libomptarget.%s" % shlib_ext,
"lib/libomptarget.rtl.%s.%s" % (arch, shlib_ext)])
if LooseVersion(self.version) >= LooseVersion('12'):
omp_target_libs = ["lib/libomptarget.%s" % shlib_ext, "lib/libomptarget.rtl.%s.%s" % (arch, shlib_ext)]
else:
omp_target_libs = ["lib/libomptarget.%s" % shlib_ext]
custom_paths['files'].extend(omp_target_libs)

# If building for CUDA check that OpenMP target library was created
if 'NVPTX' in self.cfg['build_targets']:
custom_paths['files'].append("lib/libomptarget.rtl.cuda.%s" % shlib_ext)
Expand Down