diff options
| -rw-r--r-- | var/spack/packages/scorep/package.py | 14 | ||||
| -rw-r--r-- | var/spack/packages/tau/package.py | 16 |
2 files changed, 9 insertions, 21 deletions
diff --git a/var/spack/packages/scorep/package.py b/var/spack/packages/scorep/package.py index fa9e339a49..0820f2d8ac 100644 --- a/var/spack/packages/scorep/package.py +++ b/var/spack/packages/scorep/package.py @@ -37,9 +37,8 @@ class Scorep(Package): version('1.4.2', '3b9a042b13bdd5836452354e6567f71e', url='http://www.vi-hps.org/upload/packages/scorep/scorep-1.4.2.tar.gz') - #version('1.3', '9db6f957b7f51fa01377a9537867a55c', - # url='http://www.vi-hps.org/upload/packages/scorep/scorep-1.3.tar.gz') - #version('1.2.3', '4978084e7cbd05b94517aa8beaea0817') + version('1.3', '9db6f957b7f51fa01377a9537867a55c', + url='http://www.vi-hps.org/upload/packages/scorep/scorep-1.3.tar.gz') ########## # Dependencies for SCORE-P are quite tight. See the homepage for more information. @@ -48,14 +47,11 @@ class Scorep(Package): depends_on('opari2@1.1.4', when='@1.4.2') depends_on('cube@4.3:4.4', when='@1.4.2') # SCOREP 1.3 - + depends_on("otf2@1.4", when='@1.3') + depends_on("opari2@1.1.4", when='@1.3') + depends_on("cube@4.2.3", when='@1.3') ########## - # FIXME : check version for 1.3 - #depends_on("otf2") - #depends_on("opari2") - #depends_on("cube") - depends_on("mpi") depends_on("papi") diff --git a/var/spack/packages/tau/package.py b/var/spack/packages/tau/package.py index 69f00ae4ea..9febb647b3 100644 --- a/var/spack/packages/tau/package.py +++ b/var/spack/packages/tau/package.py @@ -44,22 +44,22 @@ class Tau(Package): version('2.24', '57ce33539c187f2e5ec68f0367c76db4') version('2.23.1', '6593b47ae1e7a838e632652f0426fe72') - # FIXME : shmem variant missing - variant('download', default=True, description='Downloads and builds various dependencies') + # TODO : shmem variant missing + variant('download', default=False, description='Downloads and builds various dependencies') variant('openmp', default=True, description='Use OpenMP threads') variant('mpi', default=True, description='Specify use of TAU MPI wrapper library') variant('phase', default=True, description='Generate phase based profiles') variant('comm', default=True, description=' Generate profiles with MPI communicator info') + # TODO : Try to build direct OTF2 support? Some parts of the OTF support library in TAU are non-conformant, + # TODO : and fail at compile-time. Further, SCOREP is compiled with OTF2 support. depends_on('pdt') # Required for TAU instrumentation depends_on('scorep') - #depends_on('otf2', when='%gcc') # FIXME : still missing logic for intel and other compilers depends_on('binutils', when='~download') depends_on('mpi', when='+mpi') def set_compiler_options(self): - name = self.compiler.name # Name of the current toolchain useropt = ["-O2", self.rpath_args] ########## @@ -77,11 +77,6 @@ class Tau(Package): '-cc=%s' % self.compiler.cc_names[0]] if self.compiler.fc: compiler_options.append('-fortran=%s' % self.compiler.fc_names[0]) - # It turns out that some parts of the OTF support library in TAU are non-conformant, so if we want - # to compile them we must suppress some warnings. With Clang it seems impossible to do so, so OTF - # support is not built - #if name == 'gcc': - # useropt.append("-fpermissive") ########## # Construct the string of custom compiler flags and append it to compiler related options @@ -102,9 +97,6 @@ class Tau(Package): "-iowrapper", "-pdt=%s" % spec['pdt'].prefix, "-scorep=%s" % spec['scorep'].prefix] - # FIXME : I give up trying to compile OTF support with clang, as it seems there is no easy way to ignore errors - #if 'otf2' in spec: - # options.append("-otf=%s" % spec['otf2'].prefix) # If download is active, download and build suggested dependencies if '+download' in spec: options.extend(['-bfd=download', |