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

Updating TAU package. Fixing compiler specification for OSX (#12720)

Browse Source 
and making Fortran an option that can be disabled.  Also added
support for the POSIX I/O wrapper and OMPT for OpenMP.
This commit is contained in:
Kevin Huck 2019-09-07 20:44:40 -07:00 committed by Adam J. Stewart
parent 1a38285be9
commit 35221c127e
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
var/spack/repos/builtin/packages/tau/package.py
View File

@ -58,6 +58,8 @@ class Tau(Package):
variant('shmem', default=False, description='Activates SHMEM support') variant('shmem', default=False, description='Activates SHMEM support')
variant('gasnet', default=False, description='Activates GASNET support') variant('gasnet', default=False, description='Activates GASNET support')
variant('cuda', default=False, description='Activates CUDA support') variant('cuda', default=False, description='Activates CUDA support')
variant('fortran', default=True, description='Activates Fortran support')
variant('io', default=True, description='Activates POSIX I/O support')
# Support cross compiling. # Support cross compiling.
# This is a _reasonable_ subset of the full set of TAU # This is a _reasonable_ subset of the full set of TAU
@ -88,7 +90,7 @@ class Tau(Package):
filter_compiler_wrappers('tau_cc.sh', 'Makefile.tau', relative_root='bin') filter_compiler_wrappers('tau_cc.sh', 'Makefile.tau', relative_root='bin')
def set_compiler_options(self): def set_compiler_options(self, spec):
useropt = ["-O2 -g", self.rpath_args] useropt = ["-O2 -g", self.rpath_args]
@ -108,10 +110,10 @@ def set_compiler_options(self):
compiler_path = os.path.dirname(self.compiler.cc) compiler_path = os.path.dirname(self.compiler.cc)
os.environ['PATH'] = ':'.join([compiler_path, os.environ['PATH']]) os.environ['PATH'] = ':'.join([compiler_path, os.environ['PATH']])
compiler_options = ['-c++=%s' % self.compiler.cxx, compiler_options = ['-c++=%s' % os.path.basename(self.compiler.cxx),
'-cc=%s' % self.compiler.cc] '-cc=%s' % os.path.basename(self.compiler.cc)]
if self.compiler.fc: if '+fortran' in spec and self.compiler.fc:
compiler_options.append('-fortran=%s' % self.compiler.fc_names[0]) compiler_options.append('-fortran=%s' % self.compiler.fc_names[0])
########## ##########
@ -171,6 +173,12 @@ def install(self, spec, prefix):
if '+opari' in spec: if '+opari' in spec:
options.append('-opari') options.append('-opari')
if '+ompt' in spec:
options.append('-ompt')
if '+io' in spec:
options.append('-iowrapper')
if '+binutils' in spec: if '+binutils' in spec:
options.append("-bfd=%s" % spec['binutils'].prefix) options.append("-bfd=%s" % spec['binutils'].prefix)
@ -231,7 +239,7 @@ def install(self, spec, prefix):
break break
options.append("-pythonlib=%s" % lib_path) options.append("-pythonlib=%s" % lib_path)
compiler_specific_options = self.set_compiler_options() compiler_specific_options = self.set_compiler_options(spec)
options.extend(compiler_specific_options) options.extend(compiler_specific_options)
configure(*options) configure(*options)
make("install") make("install")