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

ArchSpec: fix constraint satisfaction for targets

Browse Source 
fixes #13111

Due to a missing case we were treating a single target that was not
equal to the one we were comparing to as a range open on the right.
This commit is contained in:
Massimiliano Culpo 2019-10-09 23:32:27 +02:00 committed by Todd Gamblin
parent 7af8c206ac
commit 77444dff10
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/spec.py
View File

@ -395,6 +395,10 @@ def _satisfies_target(self, other_target, strict):
if not sep and self_target == t_min: if not sep and self_target == t_min:
return True return True
if not sep and self_target != t_min:
return False
# Check against a range
min_ok = self_target.microarchitecture >= t_min if t_min else True min_ok = self_target.microarchitecture >= t_min if t_min else True
max_ok = self_target.microarchitecture <= t_max if t_max else True max_ok = self_target.microarchitecture <= t_max if t_max else True

5
lib/spack/spack/test/spec_semantics.py
View File

@ -972,7 +972,12 @@ def test_forwarding_of_architecture_attributes(self):
('libelf target=haswell', 'target=:haswell', True), ('libelf target=haswell', 'target=:haswell', True),
('libelf target=haswell', 'target=icelake,:nocona', False), ('libelf target=haswell', 'target=icelake,:nocona', False),
('libelf target=haswell', 'target=haswell,:nocona', True), ('libelf target=haswell', 'target=haswell,:nocona', True),
# Check that a single target is not treated as the start
# or the end of an open range
('libelf target=haswell', 'target=x86_64', False),
('libelf target=x86_64', 'target=haswell', False),
]) ])
@pytest.mark.regression('13111')
def test_target_constraints(self, spec, constraint, expected_result): def test_target_constraints(self, spec, constraint, expected_result):
s = Spec(spec) s = Spec(spec)
assert s.satisfies(constraint) is expected_result assert s.satisfies(constraint) is expected_result