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

Update target comparison semantic for a few packages (#12947)

Browse Source 
Use spec.target.family instead of spec.architecture.target
This commit is contained in:
Massimiliano Culpo 2019-09-26 10:25:12 +02:00 committed by GitHub
parent 31e5318c24
commit 90236bc9f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/blast-plus/package.py
View File

@ -105,7 +105,7 @@ def configure_args(self):
'--without-boost', '--without-boost',
] ]
if 'aarch64' not in spec.architecture.target.lower(): if spec.target.family != 'aarch64':
config_args.append('--with-64') config_args.append('--with-64')
if '+static' in spec: if '+static' in spec:
config_args.append('--with-static') config_args.append('--with-static')

3
var/spack/repos/builtin/packages/catalyst/package.py
View File

@ -225,8 +225,7 @@ def nvariant_bool(feature):
else: else:
cmake_args.append('-DPARAVIEW_ENABLE_PYTHON:BOOL=OFF') cmake_args.append('-DPARAVIEW_ENABLE_PYTHON:BOOL=OFF')
arch = spec.architecture if spec.platform == 'linux' and spec.target == 'aarch64':
if(arch.platform == 'linux' and arch.target == 'aarch64'):
cmake_args.append('-DCMAKE_CXX_FLAGS=-DPNG_ARM_NEON_OPT=0') cmake_args.append('-DCMAKE_CXX_FLAGS=-DPNG_ARM_NEON_OPT=0')
cmake_args.append('-DCMAKE_C_FLAGS=-DPNG_ARM_NEON_OPT=0') cmake_args.append('-DCMAKE_C_FLAGS=-DPNG_ARM_NEON_OPT=0')

3
var/spack/repos/builtin/packages/hpctoolkit/package.py
View File

@ -90,7 +90,6 @@ class Hpctoolkit(AutotoolsPackage):
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec
target = spec.architecture.target
args = [ args = [
'--with-binutils=%s' % spec['binutils'].prefix, '--with-binutils=%s' % spec['binutils'].prefix,
@ -117,7 +116,7 @@ def configure_args(self):
if spec.satisfies('@gpu'): if spec.satisfies('@gpu'):
args.append('--with-mbedtls=%s' % spec['mbedtls'].prefix) args.append('--with-mbedtls=%s' % spec['mbedtls'].prefix)
if target == 'x86_64': if spec.target.family == 'x86_64':
args.append('--with-xed=%s' % spec['intel-xed'].prefix) args.append('--with-xed=%s' % spec['intel-xed'].prefix)
if '+papi' in spec: if '+papi' in spec:

4
var/spack/repos/builtin/packages/openfoam/package.py
View File

@ -788,8 +788,8 @@ def __init__(self, spec, **kwargs):
# spec.architecture.platform is like `uname -s`, but lower-case # spec.architecture.platform is like `uname -s`, but lower-case
platform = spec.architecture.platform platform = spec.architecture.platform
# spec.architecture.target is like `uname -m` # spec.target.family is like `uname -m`
target = spec.architecture.target target = spec.target.family
if platform == 'linux': if platform == 'linux':
if target == 'x86_64': if target == 'x86_64':

2
var/spack/repos/builtin/packages/ross/package.py
View File

@ -26,7 +26,7 @@ def cmake_args(self):
args = [] args = []
args.append("-DBUILD_SHARED_LIBS=ON") args.append("-DBUILD_SHARED_LIBS=ON")
args.append("-DARCH=%s" % self.spec.architecture.target) args.append("-DARCH=%s" % self.spec.target)
args.append("-DCMAKE_C_COMPILER=%s" % self.spec['mpi'].mpicc) args.append("-DCMAKE_C_COMPILER=%s" % self.spec['mpi'].mpicc)
args.append("-DCMAKE_CXX_COMPILER=%s" % self.spec['mpi'].mpicxx) args.append("-DCMAKE_CXX_COMPILER=%s" % self.spec['mpi'].mpicxx)

14
var/spack/repos/builtin/packages/templight/package.py
View File

@ -135,16 +135,18 @@ def cmake_args(self):
targets = ['NVPTX', 'AMDGPU'] targets = ['NVPTX', 'AMDGPU']
if 'x86' in spec.architecture.target.lower(): if spec.target.family == 'x86' or spec.target.family == 'x86_64':
targets.append('X86') targets.append('X86')
elif 'arm' in spec.architecture.target.lower(): elif spec.target.family == 'arm':
targets.append('ARM') targets.append('ARM')
elif 'aarch64' in spec.architecture.target.lower(): elif spec.target.family == 'aarch64':
targets.append('AArch64') targets.append('AArch64')
elif 'sparc' in spec.architecture.target.lower(): elif spec.target.family == 'sparc' or spec.target.family == 'sparc64':
targets.append('Sparc') targets.append('Sparc')
elif ('ppc' in spec.architecture.target.lower() or elif (spec.target.family == 'ppc64' or
'power' in spec.architecture.target.lower()): spec.target.family == 'ppc64le' or
spec.target.family == 'ppc' or
spec.target.family == 'ppcle'):
targets.append('PowerPC') targets.append('PowerPC')
cmake_args.append( cmake_args.append(