hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

compilers: update clang fortran compiler wrapper selection (#9678)

Browse source 
Clang has support for using different fortran compilers with the Clang executable.

Spack includes logic to select a compiler wrapper symlink which refers to the fortran executable (since some build systems depend on the name of the compiler, e.g. 'gfortran' or 'flang').

This selection was previously based on the architecture, and chose incorrectly in some situations (e.g. for clang/gfortran on Linux). This replaces architecture-based wrapper selection with a selection that is based on the name of the Fortran compiler executable.
This commit is contained in:
Todd Gamblin 2018-10-30 23:00:43 -07:00 committed by GitHub
parent c10d432a2e
commit 2912cf3e17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
lib/spack/spack/compilers/clang.py
View file

@ -16,6 +16,25 @@
from spack.version import ver from spack.version import ver
#: compiler symlink mappings for mixed f77 compilers
f77_mapping = [
('gfortran', 'clang/gfortran'),
('xlf_r', 'xl_r/xlf_r'),
('xlf', 'xl/xlf'),
('pgfortran', 'pgi/pgfortran'),
('ifort', 'intel/ifort')
]
#: compiler symlink mappings for mixed f90/fc compilers
fc_mapping = [
('gfortran', 'clang/gfortran'),
('xlf90_r', 'xl_r/xlf90_r'),
('xlf90', 'xl/xlf90'),
('pgfortran', 'pgi/pgfortran'),
('ifort', 'intel/ifort')
]
class Clang(Compiler): class Clang(Compiler):
# Subclasses use possible names of C compiler # Subclasses use possible names of C compiler
cc_names = ['clang'] cc_names = ['clang']
@ -29,22 +48,31 @@ class Clang(Compiler):
# Subclasses use possible names of Fortran 90 compiler # Subclasses use possible names of Fortran 90 compiler
fc_names = ['flang', 'gfortran', 'xlf90_r'] fc_names = ['flang', 'gfortran', 'xlf90_r']
# Named wrapper links within lib/spack/env # Clang has support for using different fortran compilers with the
link_paths = {'cc': 'clang/clang', # clang executable.
'cxx': 'clang/clang++'} @property
def link_paths(self):
# clang links are always the same
link_paths = {'cc': 'clang/clang',
'cxx': 'clang/clang++'}
if sys.platform == 'darwin': # fortran links need to look at the actual compiler names from
# Use default wrappers for fortran, in case provided in # compilers.yaml to figure out which named symlink to use
# compilers.yaml for compiler_name, link_path in f77_mapping:
link_paths['f77'] = 'clang/gfortran' if self.f77 and compiler_name in self.f77:
link_paths['fc'] = 'clang/gfortran' link_paths['f77'] = link_path
elif spack.architecture.sys_type() == 'linux-rhel7-ppc64le': break
# This platform uses clang with IBM XL Fortran compiler else:
link_paths['f77'] = 'xl_r/xlf_r' link_paths['f77'] = 'clang/flang'
link_paths['fc'] = 'xl_r/xlf90_r'
else: for compiler_name, link_path in fc_mapping:
link_paths['f77'] = 'clang/flang' if self.fc and compiler_name in self.fc:
link_paths['fc'] = 'clang/flang' link_paths['fc'] = link_path
break
else:
link_paths['fc'] = 'clang/flang'
return link_paths
@property @property
def is_apple(self): def is_apple(self):