cbtf-argonavis-gui: add openspeedshop-utils package to address qt conflicts (#8066)
Fixes #7946 Creates an openspeedshop-utils package that does not depend on qt3 and can be used to resolve the needs of cbtf-argonavis-gui. Changes for creating a release versus develop build are also included. There are package versions which are no longer relevant (e.g. 1.3.0 for cbtf-argonavis-gui has been replaced with 1.3.0.0) but these versions need to be kept to allow uninstalling them; issue #8173 has been created to investigate this.
This commit is contained in:

committed by
scheibelp

parent
de7d13b0e8
commit
dfd168d557
@@ -41,7 +41,6 @@
|
||||
##########################################################################
|
||||
|
||||
from spack import *
|
||||
import os
|
||||
|
||||
|
||||
class CbtfArgonavis(CMakePackage):
|
||||
@@ -51,9 +50,15 @@ class CbtfArgonavis(CMakePackage):
|
||||
"""
|
||||
homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
|
||||
|
||||
version('1.9.1.0', branch='1.9.1.0',
|
||||
git='https://github.com/OpenSpeedShop/cbtf-argonavis.git')
|
||||
|
||||
version('1.9.1', branch='master',
|
||||
git='https://github.com/OpenSpeedShop/cbtf-argonavis.git')
|
||||
|
||||
version('develop', branch='master',
|
||||
git='https://github.com/OpenSpeedShop/cbtf-argonavis.git')
|
||||
|
||||
variant('cti', default=False,
|
||||
description="Build MRNet with the CTI startup option")
|
||||
variant('crayfe', default=False,
|
||||
@@ -65,17 +70,52 @@ class CbtfArgonavis(CMakePackage):
|
||||
description='CMake build type')
|
||||
|
||||
depends_on("cmake@3.0.2:", type='build')
|
||||
depends_on("boost@1.50.0:")
|
||||
depends_on("papi")
|
||||
depends_on("libmonitor")
|
||||
depends_on("mrnet@5.0.1:+lwthreads")
|
||||
depends_on("mrnet@5.0.1:+cti", when='+cti')
|
||||
depends_on("cbtf")
|
||||
depends_on("cbtf+cti", when='+cti')
|
||||
depends_on("cbtf+runtime", when='+runtime')
|
||||
depends_on("cbtf-krell")
|
||||
depends_on("cbtf-krell+cti", when="+cti")
|
||||
depends_on("cbtf-krell+runtime", when="+runtime")
|
||||
|
||||
# To specify ^elfutils@0.170 on the command line spack
|
||||
# apparently needs/wants this dependency explicity here
|
||||
# even though it is referenced downstream
|
||||
depends_on("elf", type="link")
|
||||
|
||||
# For boost
|
||||
depends_on("boost@1.50.0:", when='@develop')
|
||||
depends_on("boost@1.66.0", when='@1.9.1.0')
|
||||
|
||||
# For MRNet
|
||||
depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
|
||||
depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop~cti')
|
||||
depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0+cti')
|
||||
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0~cti')
|
||||
|
||||
# For CBTF
|
||||
depends_on("cbtf@develop", when='@develop')
|
||||
depends_on("cbtf@1.9.1.0", when='@1.9.1.0')
|
||||
|
||||
# For CBTF with cti
|
||||
depends_on("cbtf@develop+cti", when='@develop+cti')
|
||||
depends_on("cbtf@1.9.1.0+cti", when='@1.9.1.0+cti')
|
||||
|
||||
# For CBTF with runtime
|
||||
depends_on("cbtf@develop+runtime", when='@develop+runtime')
|
||||
depends_on("cbtf@1.9.1.0+runtime", when='@1.9.1.0+runtime')
|
||||
|
||||
# For libmonitor
|
||||
depends_on("libmonitor+krellpatch")
|
||||
|
||||
# For PAPI
|
||||
depends_on("papi", when='@develop')
|
||||
depends_on("papi@5.5.1", when='@1.9.1.0')
|
||||
|
||||
# For CBTF-KRELL
|
||||
depends_on("cbtf-krell@develop", when='@develop')
|
||||
depends_on("cbtf-krell@1.9.1.0", when='@1.9.1.0')
|
||||
|
||||
depends_on('cbtf-krell@develop+cti', when='@develop+cti')
|
||||
depends_on('cbtf-krell@1.9.1.0+cti', when='@1.9.1.0+cti')
|
||||
|
||||
depends_on('cbtf-krell@develop+runtime', when='@develop+runtime')
|
||||
depends_on('cbtf-krell@1.9.1.0+runtime', when='@1.9.1.0+runtime')
|
||||
|
||||
# For CUDA
|
||||
depends_on("cuda")
|
||||
|
||||
parallel = False
|
||||
@@ -109,12 +149,6 @@ def cmake_args(self):
|
||||
def setup_environment(self, spack_env, run_env):
|
||||
"""Set up the compile and runtime environments for a package."""
|
||||
|
||||
if os.environ.get('LD_LIBRARY_PATH'):
|
||||
cupti_path = self.spec['cuda'].prefix + '/extras/CUPTI/lib64'
|
||||
os.environ['LD_LIBRARY_PATH'] += cupti_path
|
||||
else:
|
||||
os.environ['LD_LIBRARY_PATH'] = cupti_path
|
||||
|
||||
run_env.prepend_path(
|
||||
'LD_LIBRARY_PATH',
|
||||
self.spec['cuda'].prefix + '/extras/CUPTI/lib64')
|
||||
|
Reference in New Issue
Block a user