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

Add additional modifications for changing the krell packages from Package to CMakePackage and fixing Travis erros

Browse Source
This commit is contained in:
Jim Galarowicz 2017-07-17 21:19:06 -05:00
parent 6b694aecde
commit 811557ed36
5 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,14 +76,13 @@ def cmake_args(self):
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)
cmake_args = [] cmake_args = [
cmake_args.extend( '-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' %spec['cuda'].prefix.extras.CUPTI, '-DCUPTI_DIR=%s' % spec['cuda'].prefix.extras.CUPTI,
'-DCUPTI_ROOT=%s' %spec['cuda'].prefix.extras.CUPTI, '-DCUPTI_ROOT=%s' % 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,
@ -91,7 +90,7 @@ def cmake_args(self):
'-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']
# 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
@ -124,4 +123,3 @@ def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions):
]) ])
cmakeOptions.extend(BuildTypeOptions) cmakeOptions.extend(BuildTypeOptions)

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

@ -163,9 +163,8 @@ def cmake_args(self):
# Add in paths for finding package config files that tell us # Add in paths for finding package config files that tell us
# where to find these packages # where to find these packages
cmake_args = [] cmake_args = [
cmake_args.extend( '-DCBTF_DIR=%s' % spec['cbtf'].prefix,
['-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DBINUTILS_DIR=%s' % spec['binutils'].prefix, '-DBINUTILS_DIR=%s' % spec['binutils'].prefix,
'-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix, '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix,
'-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix, '-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix,
@ -173,7 +172,7 @@ def cmake_args(self):
'-DBOOST_DIR=%s' % spec['boost'].prefix, '-DBOOST_DIR=%s' % spec['boost'].prefix,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix, '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
'-DDYNINST_DIR=%s' % spec['dyninst'].prefix, '-DDYNINST_DIR=%s' % spec['dyninst'].prefix,
'-DXERCESC_DIR=%s' % spec['xerces-c'].prefix]) '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix]
# Add any MPI implementations coming from variant settings # Add any MPI implementations coming from variant settings
self.set_mpi_cmakeOptions(spec, cmake_args) self.set_mpi_cmakeOptions(spec, cmake_args)

8
var/spack/repos/builtin/packages/cbtf-lanl/package.py
View File

@ -74,15 +74,14 @@ def cmake_args(self):
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)
cmake_args = [] cmake_args = [
cmake_args.extend( '-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,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix, '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
'-DXERCESC_DIR=%s' % spec['xerces-c'].prefix, '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix,
'-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path, '-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path,
'-DCMAKE_MODULE_PATH=%s' % join_path( '-DCMAKE_MODULE_PATH=%s' % join_path(
prefix.share, 'KrellInstitute', 'cmake')]) prefix.share, 'KrellInstitute', 'cmake')]
# 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
@ -114,4 +113,3 @@ def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions):
]) ])
cmakeOptions.extend(BuildTypeOptions) cmakeOptions.extend(BuildTypeOptions)

15
var/spack/repos/builtin/packages/cbtf/package.py
View File

@ -86,14 +86,13 @@ def cmake_args(self):
# Install message tag include file for use in Intel MIC # Install message tag include file for use in Intel MIC
# cbtf-krell build # cbtf-krell build
# FIXME # FIXME
cmake_args = [] cmake_args = [
cmake_args.extend( '-DBoost_NO_SYSTEM_PATHS=TRUE',
['-DBoost_NO_SYSTEM_PATHS=TRUE',
'-DXERCESC_DIR=%s' % spec['xerces-c'].prefix, '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix,
'-DBOOST_ROOT=%s' % spec['boost'].prefix, '-DBOOST_ROOT=%s' % spec['boost'].prefix,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix, '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
'-DCMAKE_MODULE_PATH=%s' % join_path( '-DCMAKE_MODULE_PATH=%s' % join_path(
prefix.share, 'KrellInstitute', 'cmake')]) prefix.share, 'KrellInstitute', 'cmake')]
# Add in the standard cmake arguments # Add in the standard cmake arguments
cmake_args.extend(std_cmake_args) cmake_args.extend(std_cmake_args)
@ -103,14 +102,13 @@ def cmake_args(self):
self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args) self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args)
else: else:
cmake_args = [] cmake_args = [
cmake_args.extend( '-DBoost_NO_SYSTEM_PATHS=TRUE',
['-DBoost_NO_SYSTEM_PATHS=TRUE',
'-DXERCESC_DIR=%s' % spec['xerces-c'].prefix, '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix,
'-DBOOST_ROOT=%s' % spec['boost'].prefix, '-DBOOST_ROOT=%s' % spec['boost'].prefix,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix, '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
'-DCMAKE_MODULE_PATH=%s' % join_path( '-DCMAKE_MODULE_PATH=%s' % join_path(
prefix.share, 'KrellInstitute', 'cmake')]) prefix.share, 'KrellInstitute', 'cmake')]
# Add in the standard cmake arguments # Add in the standard cmake arguments
cmake_args.extend(std_cmake_args) cmake_args.extend(std_cmake_args)
@ -143,4 +141,3 @@ def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions):
]) ])
cmakeOptions.extend(BuildTypeOptions) cmakeOptions.extend(BuildTypeOptions)

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

@ -148,12 +148,11 @@ def cmake_args(self):
instrumentor_setting = "offline" instrumentor_setting = "offline"
if '+runtime' in spec: if '+runtime' in spec:
cmake_args = [] cmake_args = [
cmake_args.extend([
'-DINSTRUMENTOR=%s' % instrumentor_setting, '-DINSTRUMENTOR=%s' % instrumentor_setting,
'-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix, '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix,
'-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix, '-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix,
'-DPAPI_DIR=%s' % spec['papi'].prefix]) '-DPAPI_DIR=%s' % spec['papi'].prefix]
# Add any MPI implementations coming from variant settings # Add any MPI implementations coming from variant settings
self.set_mpi_cmakeOptions(spec, cmake_args) self.set_mpi_cmakeOptions(spec, cmake_args)
@ -393,4 +392,3 @@ def setup_environment(self, spack_env, run_env):
run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mvapich2') run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mvapich2')
if '+openmpi' in self.spec: if '+openmpi' in self.spec:
run_env.set('OPENSS_MPI_IMPLEMENTATION', 'openmpi') run_env.set('OPENSS_MPI_IMPLEMENTATION', 'openmpi')