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

improved concretize efficiency for determining whether compilers come from the proper strategy

Browse Source
This commit is contained in:
Gregory Becker 2016-01-05 19:03:25 -08:00
parent 93c9c45580
commit 61b03b72b0
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,11 +265,9 @@ def concretize_compiler(self, spec):
#Although this usually means changed, this means awaiting other changes #Although this usually means changed, this means awaiting other changes
return True return True
# Examine only those compilers found by the proper compiler strategy for this architecture # Only use a matching compiler if it is of the proper style
# Takes advantage of the proper logic already existing in compiler_for_spec # Takes advantage of the proper logic already existing in compiler_for_spec
# Should be redone more efficiently if this works # Should think whether this can be more efficient
all_compilers = spack.compilers.all_compilers()
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.compiler_strategy == 'PATH':
@ -278,8 +276,8 @@ def _proper_compiler_style(cspec, target):
filter(lambda c: c.modules, compilers) filter(lambda c: c.modules, compilers)
return compilers return compilers
filter(lambda c: _proper_compiler_style(c, spec.architecture), all_compilers)
all_compilers = spack.compilers.all_compilers()
if (spec.compiler and if (spec.compiler and
spec.compiler.concrete and spec.compiler.concrete and
@ -306,7 +304,12 @@ def _proper_compiler_style(cspec, target):
raise UnavailableCompilerVersionError(other_compiler) raise UnavailableCompilerVersionError(other_compiler)
# copy concrete version into other_compiler # copy concrete version into other_compiler
spec.compiler = matches[-1].copy() index = len(matches)-1
while not _proper_compiler_style(matches[index], spec.architecture):
index -= 1
if index == 0:
raise NoValidVersionError(spec)
spec.compiler = matches[index].copy()
assert(spec.compiler.concrete) assert(spec.compiler.concrete)
return True # things changed. return True # things changed.