diff options
3 files changed, 63 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 0ec1114211..3c1bb0de49 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -94,7 +94,7 @@ class CbtfArgonavis(CMakePackage): depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime') # For libmonitor - depends_on("libmonitor+krellpatch") + depends_on("libmonitor@2013.02.18+krellpatch") # For PAPI depends_on("papi", when='@develop') diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 6ca54a8433..62d6833adf 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -120,7 +120,7 @@ class CbtfKrell(CMakePackage): depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime') # for services and collectors - depends_on("libmonitor+krellpatch") + depends_on("libmonitor@2013.02.18+krellpatch") depends_on("libunwind", when='@develop') depends_on("libunwind@1.1", when='@1.9.1.0:9999') diff --git a/var/spack/repos/builtin/packages/libmonitor/package.py b/var/spack/repos/builtin/packages/libmonitor/package.py index 168389d450..db6c755778 100644 --- a/var/spack/repos/builtin/packages/libmonitor/package.py +++ b/var/spack/repos/builtin/packages/libmonitor/package.py @@ -26,16 +26,71 @@ from spack import * class Libmonitor(AutotoolsPackage): - """Libmonitor is a library for process and thread control.""" + """Libmonitor is a library providing callback functions for the + begin and end of processes and threads. It provides a layer on + which to build process monitoring tools and profilers.""" homepage = "https://github.com/HPCToolkit/libmonitor" git = "https://github.com/HPCToolkit/libmonitor.git" - version('20130218', commit='4f2311e') + version('master', branch='master') + version('2018.07.18', commit='d28cc1d3c08c02013a68a022a57a6ac73db88166', + preferred=True) + version('2013.02.18', commit='4f2311e413fd90583263d6f20453bbe552ccfef3') + # Configure for Rice HPCToolkit. + variant('hpctoolkit', default=False, + description='Configure for HPCToolkit') + + variant('bgq', default=False, + description='Configure for Blue Gene/Q') + + # Configure for Krell and OpenSpeedshop. variant('krellpatch', default=False, - description="build with openspeedshop based patch.") + description="Build with openspeedshop based patch.") + + patch('libmonitorkrell-0000.patch', when='@2013.02.18+krellpatch') + patch('libmonitorkrell-0001.patch', when='@2013.02.18+krellpatch') + patch('libmonitorkrell-0002.patch', when='@2013.02.18+krellpatch') + + signals = 'SIGBUS, SIGSEGV, SIGPROF, 36, 37, 38' + + # Set default cflags (-g -O2) and move to the configure line. + def flag_handler(self, name, flags): + if name != 'cflags': + return (flags, None, None) + + if '-g' not in flags: + flags.append('-g') + for flag in flags: + if flag.startswith('-O'): + break + else: + flags.append('-O2') + + return (None, None, flags) + + def configure_args(self): + args = [] + + if '+hpctoolkit' in self.spec: + args.append('--enable-client-signals=%s' % self.signals) + + # TODO: Spack has trouble finding cross-compilers; the +bgq variant + # manually specifies the appropriate compiler to build for BGQ (by + # setting that here, Spack's choice of CC is overridden). + # If the user manually defines an entry in compilers.yaml, the bgq + # variant should not be required if the user specifies the bgq + # architecture for the libmonitor package. See #8860 + # TODO: users want to build this for the backend and dependents for the + # frontend. Spack ought to make that easy by finding the appropriate + # compiler for each if the root and libmonitor are designated to build + # on the frontend and backend, respectively. As of now though, there + # is an issue with compiler concretization such that spack will attempt + # to assign the compiler chosen for libmonitor to the root (unless the + # user specifies the compiler for each in addition to the arch). + # See #8859 + if '+bgq' in self.spec: + args.append('CC=powerpc64-bgq-linux-gcc') - patch('libmonitorkrell-0000.patch', when='@20130218+krellpatch') - patch('libmonitorkrell-0001.patch', when='@20130218+krellpatch') - patch('libmonitorkrell-0002.patch', when='@20130218+krellpatch') + return args |