Skip to content

Commit

Permalink
Merge pull request #3067 from branfosj/20240105092842_new_pr_aocc
Browse files Browse the repository at this point in the history
bypass .mod file in Clang, AOCC, AOMP, and CPLEX
  • Loading branch information
jfgrimm authored Jan 11, 2024
2 parents 437a74c + aed6f67 commit 5efd54d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 0 deletions.
3 changes: 3 additions & 0 deletions easybuild/easyblocks/a/aocc.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ def __init__(self, *args, **kwargs):

self.clangversion = self.cfg['clangversion']

# Bypass the .mod file check for GCCcore installs
self.cfg['skip_mod_files_sanity_check'] = True

def _aocc_guess_clang_version(self):
map_aocc_to_clang_ver = {
'2.3.0': '11.0.0',
Expand Down
2 changes: 2 additions & 0 deletions easybuild/easyblocks/a/aomp.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ def __init__(self, *args, **kwargs):
super(EB_AOMP, self).__init__(*args, **kwargs)
self.cfg['extract_sources'] = True
self.cfg['dontcreateinstalldir'] = True
# Bypass the .mod file check for GCCcore installs
self.cfg['skip_mod_files_sanity_check'] = True

def configure_step(self):
"""Configure AOMP build and let 'Binary' install"""
Expand Down
3 changes: 3 additions & 0 deletions easybuild/easyblocks/c/clang.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ def __init__(self, *args, **kwargs):
self.make_parallel_opts = ""
self.runtime_lib_path = "lib"

# Bypass the .mod file check for GCCcore installs
self.cfg['skip_mod_files_sanity_check'] = True

if not self.cfg['llvm_projects']:
self.cfg['llvm_projects'] = []
if not self.cfg['llvm_runtimes']:
Expand Down
3 changes: 3 additions & 0 deletions easybuild/easyblocks/c/cplex.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ def __init__(self, *args, **kwargs):
self.with_python = False
self.multi_python = 'Python' in self.cfg['multi_deps']

# Bypass the .mod file check for GCCcore installs
self.cfg['skip_mod_files_sanity_check'] = True

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

0 comments on commit 5efd54d

Please sign in to comment.