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

Fix issues with the cbtf-argonavis build, update to use dyninst-9.3.2, fixes to openspeedshop package build.

Browse Source
This commit is contained in:
Jim Galarowicz 2017-07-14 10:38:19 -05:00
parent 803f4ee649
commit 0780f39cdf
3 changed files with 73 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
var/spack/repos/builtin/packages/cbtf-argonavis/package.py
View File

@ -51,8 +51,8 @@ class CbtfArgonavis(Package):
homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
# Mirror access template example # Mirror access template example
# url = "file:/home/jeg/OpenSpeedShop_ROOT/SOURCES/cbtf-argonavis-1.6.tar.gz" #url = "file:/home/jeg/cbtf-argonavis-1.8.1.tar.gz"
# version('1.6', '0fafa0008478405c2c2319450f174ed4') #version('1.8.1', 'b63db444fff92370a88197882a8d54d0')
version('1.8', branch='master', version('1.8', branch='master',
git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') git='https://github.com/OpenSpeedShop/cbtf-argonavis.git')
@ -101,39 +101,38 @@ def install(self, spec, prefix):
cmake_prefix_path = join_path( cmake_prefix_path = join_path(
spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix) spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix)
with working_dir('CUDA'): with working_dir('build', create=True):
with working_dir('build', create=True):
cmakeOptions = [] cmakeOptions = []
cmakeOptions.extend( cmakeOptions.extend(
['-DCMAKE_INSTALL_PREFIX=%s' % prefix, ['-DCMAKE_INSTALL_PREFIX=%s' % prefix,
'-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path, '-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path,
'-DCUDA_DIR=%s' % spec['cuda'].prefix, '-DCUDA_DIR=%s' % spec['cuda'].prefix,
'-DCUDA_INSTALL_PATH=%s' % spec['cuda'].prefix, '-DCUDA_INSTALL_PATH=%s' % spec['cuda'].prefix,
'-DCUDA_TOOLKIT_ROOT_DIR=%s' % spec['cuda'].prefix, '-DCUDA_TOOLKIT_ROOT_DIR=%s' % spec['cuda'].prefix,
'-DCUPTI_DIR=%s' % join_path( '-DCUPTI_DIR=%s' % join_path(
spec['cuda'].prefix + '/extras/CUPTI'), spec['cuda'].prefix + '/extras/CUPTI'),
'-DCUPTI_ROOT=%s' % join_path( '-DCUPTI_ROOT=%s' % join_path(
spec['cuda'].prefix + '/extras/CUPTI'), spec['cuda'].prefix + '/extras/CUPTI'),
'-DPAPI_ROOT=%s' % spec['papi'].prefix, '-DPAPI_ROOT=%s' % spec['papi'].prefix,
'-DCBTF_DIR=%s' % spec['cbtf'].prefix, '-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
'-DBOOST_ROOT=%s' % spec['boost'].prefix, '-DBOOST_ROOT=%s' % spec['boost'].prefix,
'-DBoost_DIR=%s' % spec['boost'].prefix, '-DBoost_DIR=%s' % spec['boost'].prefix,
'-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib, '-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix, '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
'-DBoost_NO_SYSTEM_PATHS=ON']) '-DBoost_NO_SYSTEM_PATHS=ON'])
# Add in the standard cmake arguments # Add in the standard cmake arguments
cmakeOptions.extend(std_cmake_args) cmakeOptions.extend(std_cmake_args)
# Adjust the standard cmake arguments to what we want the build # Adjust the standard cmake arguments to what we want the build
# type, etc to be # type, etc to be
self.adjustBuildTypeParams_cmakeOptions(spec, cmakeOptions) self.adjustBuildTypeParams_cmakeOptions(spec, cmakeOptions)
# Invoke cmake # Invoke cmake
cmake('..', *cmakeOptions) cmake('..', *cmakeOptions)
make("clean") make("clean")
make() make()
make("install") make("install")

2
var/spack/repos/builtin/packages/cbtf-krell/package.py
View File

@ -81,7 +81,7 @@ class CbtfKrell(Package):
# collectionTool # collectionTool
depends_on("boost@1.50.0:1.59.0") depends_on("boost@1.50.0:1.59.0")
depends_on("dyninst@9.2.0") depends_on("dyninst@9.3.2")
depends_on("mrnet@5.0.1:+lwthreads") depends_on("mrnet@5.0.1:+lwthreads")
depends_on("xerces-c@3.1.1:") depends_on("xerces-c@3.1.1:")

65
var/spack/repos/builtin/packages/openspeedshop/package.py
View File

@ -83,8 +83,8 @@ class Openspeedshop(Package):
to point to target build.") to point to target build.")
variant('cuda', default=False, variant('cuda', default=False,
description="build with cuda packages included.") description="build with cuda packages included.")
variant('ptgf', default=False, variant('noqt3gui', default=False,
description="build with the PTGF based gui package enabled.") description="build without the build Qt3 gui package enabled.")
variant('rtfe', default=False, variant('rtfe', default=False,
description="build for clusters heterogeneous processors \ description="build for clusters heterogeneous processors \
on fe/be nodes.") on fe/be nodes.")
@ -115,15 +115,13 @@ class Openspeedshop(Package):
depends_on("bison", type='build') depends_on("bison", type='build')
depends_on("flex", type='build') depends_on("flex", type='build')
depends_on("binutils@2.24+krellpatch", type='build') depends_on("binutils@2.24+krellpatch", type='build')
# TODO: when using dyninst@9.3.0:, we will need to use elf depends_on("elf", type="link")
# depends_on("elf", type="link")
depends_on("libelf")
depends_on("libdwarf") depends_on("libdwarf")
depends_on("sqlite") depends_on("sqlite")
depends_on("boost@1.50.0:1.59.0") depends_on("boost@1.50.0:1.59.0")
depends_on("dyninst@9.2.0") depends_on("dyninst@9.3.2")
depends_on("libxml2+python") depends_on("libxml2+python")
depends_on("qt@3.3.8b+krellpatch") depends_on("qt@3.3.8b+krellpatch", when='~noqt3gui')
# Dependencies only for the openspeedshop offline package. # Dependencies only for the openspeedshop offline package.
depends_on("libunwind", when='+offline') depends_on("libunwind", when='+offline')
@ -174,7 +172,7 @@ def set_defaultbase_cmakeOptions(self, spec, cmakeOptions):
BaseOptions = [] BaseOptions = []
BaseOptions.append('-DBINUTILS_DIR=%s' % spec['binutils'].prefix) BaseOptions.append('-DBINUTILS_DIR=%s' % spec['binutils'].prefix)
BaseOptions.append('-DLIBELF_DIR=%s' % spec['libelf'].prefix) BaseOptions.append('-DLIBELF_DIR=%s' % spec['elf'].prefix)
BaseOptions.append('-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix) BaseOptions.append('-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix)
BaseOptions.append('-DPYTHON_EXECUTABLE=%s' % python_exe) BaseOptions.append('-DPYTHON_EXECUTABLE=%s' % python_exe)
BaseOptions.append('-DPYTHON_INCLUDE_DIR=%s' % python_include) BaseOptions.append('-DPYTHON_INCLUDE_DIR=%s' % python_include)
@ -387,23 +385,40 @@ def install(self, spec, prefix):
# Appends base options to cmakeOptions # Appends base options to cmakeOptions
self.set_defaultbase_cmakeOptions(spec, cmakeOptions) self.set_defaultbase_cmakeOptions(spec, cmakeOptions)
cmakeOptions.extend( if '+noqt3gui' in self.spec:
['-DCMAKE_INSTALL_PREFIX=%s' cmakeOptions.extend(
% prefix, ['-DCMAKE_INSTALL_PREFIX=%s'
'-DCMAKE_PREFIX_PATH=%s' % prefix,
% cmake_prefix_path, '-DCMAKE_PREFIX_PATH=%s'
'-DINSTRUMENTOR=%s' % cmake_prefix_path,
% instrumentor_setting, '-DINSTRUMENTOR=%s'
'-DSQLITE3_DIR=%s' % instrumentor_setting,
% spec['sqlite'].prefix, '-DSQLITE3_DIR=%s'
'-DCBTF_DIR=%s' % spec['sqlite'].prefix,
% spec['cbtf'].prefix, '-DCBTF_DIR=%s'
'-DCBTF_KRELL_DIR=%s' % spec['cbtf'].prefix,
% spec['cbtf-krell'].prefix, '-DCBTF_KRELL_DIR=%s'
'-DQTLIB_DIR=%s' % spec['cbtf-krell'].prefix,
% spec['qt'].prefix, '-DMRNET_DIR=%s'
'-DMRNET_DIR=%s' % spec['mrnet'].prefix])
% spec['mrnet'].prefix]) else:
cmakeOptions.extend(
['-DCMAKE_INSTALL_PREFIX=%s'
% prefix,
'-DCMAKE_PREFIX_PATH=%s'
% cmake_prefix_path,
'-DINSTRUMENTOR=%s'
% instrumentor_setting,
'-DSQLITE3_DIR=%s'
% spec['sqlite'].prefix,
'-DCBTF_DIR=%s'
% spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s'
% spec['cbtf-krell'].prefix,
'-DQTLIB_DIR=%s'
% spec['qt'].prefix,
'-DMRNET_DIR=%s'
% spec['mrnet'].prefix])
# Adjust the build options to the favored # Adjust the build options to the favored
# ones for this build # ones for this build