zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openfoam: correspond to build with Fujitsu compiler. (#15941)

Browse Source 
* openfoam: correspond to build with Fujitsu compiler.

* openfoam: add rules for Fujitsu compiler (on linuxARM64)

- the Fujitsu compiler is a clang derivative, so use a modified
  version of the clang rules if upstream does not supply anything
This commit is contained in:
Tomoki, Karatsu 2020-05-07 11:55:09 +09:00 committed by GitHub
parent 50a2690ce1
commit 830f3f79d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
var/spack/repos/builtin/packages/openfoam/package.py
View File

@ -540,6 +540,35 @@ def patch(self):
rcfile,
backup=False)
@when('@1906: %fj')
@run_before('configure')
def make_fujitsu_rules(self):
"""Create Fujitsu rules (clang variant) unless supplied upstream.
Implemented for 1906 and newer - older rules are messier to edit
"""
general_rules = 'wmake/rules/General'
arch_rules = join_path('wmake/rules/linuxARM64') # self.arch
src = arch_rules + 'Clang'
dst = arch_rules + 'Fujitsu' # self.compiler
if os.path.exists(dst):
return
tty.info('Add Fujitsu wmake rules')
copy_tree(src, dst)
for cfg in ['c', 'c++', 'general']:
rule = join_path(dst, cfg)
filter_file('Clang', 'Fujitsu', rule, backup=False)
src = join_path(general_rules, 'Clang')
dst = join_path(general_rules, 'Fujitsu') # self.compiler
copy_tree(src, dst)
filter_file('clang', spack_cc, join_path(dst, 'c'),
backup=False, string=True)
filter_file('clang++', spack_cxx, join_path(dst, 'c++'),
backup=False, string=True)
def configure(self, spec, prefix):
"""Make adjustments to the OpenFOAM configuration files in their various
locations: etc/bashrc, etc/config.sh/FEATURE and customizations that
@ -800,7 +829,7 @@ class OpenfoamArch(object):
#: Map spack compiler names to OpenFOAM compiler names
# By default, simply capitalize the first letter
compiler_mapping = {'intel': 'icc'}
compiler_mapping = {'intel': 'Icc', 'fj': 'Fujitsu'}
def __init__(self, spec, **kwargs):
# Some user settings, to be adjusted manually or via variants
@ -855,10 +884,9 @@ def __init__(self, spec, **kwargs):
self.arch = platform
# Capitalized version of the compiler name, which usually corresponds
# to how OpenFOAM will camel-case things.
# Capitalized version of the compiler name, which corresponds
# to how OpenFOAM handles things (eg, gcc -> Gcc).
# Use compiler_mapping to handing special cases.
# Also handle special compiler options (eg, KNL)
comp = spec.compiler.name
if comp in self.compiler_mapping: