From 811557ed36e2885b9652fe782c73d6e1fc2ac18d Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Mon, 17 Jul 2017 21:19:06 -0500 Subject: [PATCH] Add additional modifications for changing the krell packages from Package to CMakePackage and fixing Travis erros --- .../builtin/packages/cbtf-argonavis/package.py | 12 +++++------- .../repos/builtin/packages/cbtf-krell/package.py | 7 +++---- .../repos/builtin/packages/cbtf-lanl/package.py | 10 ++++------ var/spack/repos/builtin/packages/cbtf/package.py | 15 ++++++--------- .../builtin/packages/openspeedshop/package.py | 8 +++----- 5 files changed, 21 insertions(+), 31 deletions(-) diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index b801bbe9b1e..3ef5859e51c 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -76,14 +76,13 @@ def cmake_args(self): cmake_prefix_path = join_path( spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix) - cmake_args = [] - cmake_args.extend( - ['-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path, + cmake_args = [ + '-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path, '-DCUDA_DIR=%s' % spec['cuda'].prefix, '-DCUDA_INSTALL_PATH=%s' % spec['cuda'].prefix, '-DCUDA_TOOLKIT_ROOT_DIR=%s' % spec['cuda'].prefix, - '-DCUPTI_DIR=%s' %spec['cuda'].prefix.extras.CUPTI, - '-DCUPTI_ROOT=%s' %spec['cuda'].prefix.extras.CUPTI, + '-DCUPTI_DIR=%s' % spec['cuda'].prefix.extras.CUPTI, + '-DCUPTI_ROOT=%s' % spec['cuda'].prefix.extras.CUPTI, '-DPAPI_ROOT=%s' % spec['papi'].prefix, '-DCBTF_DIR=%s' % spec['cbtf'].prefix, '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, @@ -91,7 +90,7 @@ def cmake_args(self): '-DBoost_DIR=%s' % spec['boost'].prefix, '-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib, '-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 # type, etc to be @@ -124,4 +123,3 @@ def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions): ]) cmakeOptions.extend(BuildTypeOptions) - diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index dbad746d4d2..e62ca14fce1 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -163,9 +163,8 @@ def cmake_args(self): # Add in paths for finding package config files that tell us # where to find these packages - cmake_args = [] - cmake_args.extend( - ['-DCBTF_DIR=%s' % spec['cbtf'].prefix, + cmake_args = [ + '-DCBTF_DIR=%s' % spec['cbtf'].prefix, '-DBINUTILS_DIR=%s' % spec['binutils'].prefix, '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix, '-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix, @@ -173,7 +172,7 @@ def cmake_args(self): '-DBOOST_DIR=%s' % spec['boost'].prefix, '-DMRNET_DIR=%s' % spec['mrnet'].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 self.set_mpi_cmakeOptions(spec, cmake_args) diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index 4d4a9b403ef..a6a7b69aa03 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -74,20 +74,19 @@ def cmake_args(self): cmake_prefix_path = join_path( spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix) - cmake_args = [] - cmake_args.extend( - ['-DCBTF_DIR=%s' % spec['cbtf'].prefix, + cmake_args = [ + '-DCBTF_DIR=%s' % spec['cbtf'].prefix, '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, '-DMRNET_DIR=%s' % spec['mrnet'].prefix, '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix, '-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_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 # type, etc to be self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args) - return cmake_args + return cmake_args def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions): # Sets build type parameters into cmakeOptions the options that will @@ -114,4 +113,3 @@ def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions): ]) cmakeOptions.extend(BuildTypeOptions) - diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 35458657b40..ec96de462c4 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -86,14 +86,13 @@ def cmake_args(self): # Install message tag include file for use in Intel MIC # cbtf-krell build # FIXME - cmake_args = [] - cmake_args.extend( - ['-DBoost_NO_SYSTEM_PATHS=TRUE', + cmake_args = [ + '-DBoost_NO_SYSTEM_PATHS=TRUE', '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix, '-DBOOST_ROOT=%s' % spec['boost'].prefix, '-DMRNET_DIR=%s' % spec['mrnet'].prefix, '-DCMAKE_MODULE_PATH=%s' % join_path( - prefix.share, 'KrellInstitute', 'cmake')]) + prefix.share, 'KrellInstitute', 'cmake')] # Add in the standard cmake arguments cmake_args.extend(std_cmake_args) @@ -103,14 +102,13 @@ def cmake_args(self): self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args) else: - cmake_args = [] - cmake_args.extend( - ['-DBoost_NO_SYSTEM_PATHS=TRUE', + cmake_args = [ + '-DBoost_NO_SYSTEM_PATHS=TRUE', '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix, '-DBOOST_ROOT=%s' % spec['boost'].prefix, '-DMRNET_DIR=%s' % spec['mrnet'].prefix, '-DCMAKE_MODULE_PATH=%s' % join_path( - prefix.share, 'KrellInstitute', 'cmake')]) + prefix.share, 'KrellInstitute', 'cmake')] # Add in the standard cmake arguments cmake_args.extend(std_cmake_args) @@ -143,4 +141,3 @@ def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions): ]) cmakeOptions.extend(BuildTypeOptions) - diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 2b5bc40233a..128428b42fa 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -148,12 +148,11 @@ def cmake_args(self): instrumentor_setting = "offline" if '+runtime' in spec: - cmake_args = [] - cmake_args.extend([ + cmake_args = [ '-DINSTRUMENTOR=%s' % instrumentor_setting, '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].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 self.set_mpi_cmakeOptions(spec, cmake_args) @@ -260,7 +259,7 @@ def cmake_args(self): # ones for this build self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args) - return cmake_args + return cmake_args def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions): # Sets build type parameters into cmakeOptions the @@ -393,4 +392,3 @@ def setup_environment(self, spack_env, run_env): run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mvapich2') if '+openmpi' in self.spec: run_env.set('OPENSS_MPI_IMPLEMENTATION', 'openmpi') -