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

changed some variables to account for the fact that target is now a tuple

Browse Source
This commit is contained in:
Mario Melara 2016-02-11 11:15:19 -08:00
parent 77e93e1b79
commit b9d09202c9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/spack/spack/concretize.py
View File

@ -212,7 +212,7 @@ def concretize_version(self, spec):
def _concretize_operating_system(self, arch, platform): def _concretize_operating_system(self, arch, platform):
""" Future method for concretizing operating system """ """ Future method for concretizing operating system """
if isinstance(arch.arch_os, OperatingSystem): if isinstance(arch.arch_os, spack.architecture.OperatingSystem):
return False return False
else: else:
arch.arch_os = platform.operating_system('default') arch.arch_os = platform.operating_system('default')
@ -240,13 +240,12 @@ def concretize_target(self, spec):
Arch = collections.namedtuple("Arch", "arch_os target") Arch = collections.namedtuple("Arch", "arch_os target")
spec.target = Arch(arch_os=platform.operating_system('default'), spec.target = Arch(arch_os=platform.operating_system('default'),
target=platform.target('default')) target=platform.target('default'))
return True return True
# If there is a target and it is a tuple and has both filled return # If there is a target and it is a tuple and has both filled return
# False # False
if not isinstance(spec.target, basestring): if not isinstance(spec.target, basestring):
return any((self._concretize_operating_system(spec.target, platform), return any((self._concretize_operating_system(spec.target, platform),
self._concretize_arch_target(spec.target, plarform))) self._concretize_arch_target(spec.target, platform)))
else: else:
spec.add_target_from_string(spec.target) spec.add_target_from_string(spec.target)
@ -316,9 +315,9 @@ def concretize_compiler(self, spec):
# Should think whether this can be more efficient # Should think whether this can be more efficient
def _proper_compiler_style(cspec, target): def _proper_compiler_style(cspec, target):
compilers = spack.compilers.compilers_for_spec(cspec) compilers = spack.compilers.compilers_for_spec(cspec)
if target.compiler_strategy == 'PATH': if target.target.compiler_strategy == 'PATH':
filter(lambda c: not c.modules, compilers) filter(lambda c: not c.modules, compilers)
if target.compiler_strategy == 'MODULES': if target.target.compiler_strategy == 'MODULES':
filter(lambda c: c.modules, compilers) filter(lambda c: c.modules, compilers)
return compilers return compilers