hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

concretizer: fixed test on compiler preferences

Browse source
This commit is contained in:
Massimiliano Culpo 2020-10-12 20:59:50 +02:00 committed by Todd Gamblin
parent d4b83daa48
commit 67344326c3
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/spack/spack/solver/asp.py
View file

@ -790,7 +790,7 @@ def package_compiler_defaults(self, pkg):
"""Facts about packages' compiler prefs.""" """Facts about packages' compiler prefs."""
packages = spack.config.get("packages") packages = spack.config.get("packages")
pkg_prefs = packages.get(pkg) pkg_prefs = packages.get(pkg.name)
if not pkg_prefs or "compiler" not in pkg_prefs: if not pkg_prefs or "compiler" not in pkg_prefs:
return return

2
lib/spack/spack/solver/concretize.lp
View file

@ -310,7 +310,7 @@ compiler_version_match(Package, 1)
#defined compiler_supports_os/3. #defined compiler_supports_os/3.
#defined allow_compiler/2. #defined allow_compiler/2.
% compilers weighted by preference acccording to packages.yaml % compilers weighted by preference according to packages.yaml
compiler_weight(Package, Weight) compiler_weight(Package, Weight)
:- node_compiler(Package, Compiler), :- node_compiler(Package, Compiler),
node_compiler_version(Package, Compiler, V), node_compiler_version(Package, Compiler, V),

2
lib/spack/spack/test/concretize_preferences.py
View file

@ -112,7 +112,7 @@ def test_preferred_compilers(self):
# Try the last available compiler # Try the last available compiler
compiler = str(compiler_list[-1]) compiler = str(compiler_list[-1])
update_packages('mpileaks', 'compiler', [compiler]) update_packages('mpileaks', 'compiler', [compiler])
spec = concretize('mpileaks os=redhat6 target=x86') spec = concretize('mpileaks os=redhat6')
assert spec.compiler == spack.spec.CompilerSpec(compiler) assert spec.compiler == spack.spec.CompilerSpec(compiler)
def test_preferred_target(self, mutable_mock_repo): def test_preferred_target(self, mutable_mock_repo):