summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2023-10-31 17:50:13 +0100
committerGitHub <noreply@github.com>2023-10-31 17:50:13 +0100
commit544a121248ff2f3b526b5c38cc4b14affb96ee57 (patch)
treec0597c9c6dd848a9410a5a8c7214783e0372a9b9 /lib
parentcd6bb9e159ea18c46f399958558dfeb39bfb04a0 (diff)
downloadspack-544a121248ff2f3b526b5c38cc4b14affb96ee57.tar.gz
spack-544a121248ff2f3b526b5c38cc4b14affb96ee57.tar.bz2
spack-544a121248ff2f3b526b5c38cc4b14affb96ee57.tar.xz
spack-544a121248ff2f3b526b5c38cc4b14affb96ee57.zip
Fix interaction of spec literals that propagate variants with unify:false (#40789)
* Add tests to ensure variant propagation syntax can round-trip to/from string * Add a regression test for the bug in 35298 * Reconstruct the spec constraints in the worker process Specs do not preserve any information on propagation of variants when round-tripping to/from JSON (which we use to pickle), but preserve it when round-tripping to/from strings. Therefore, we pass a spec literal to the worker and reconstruct the Spec objects there.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/environment/environment.py3
-rw-r--r--lib/spack/spack/test/env.py26
-rw-r--r--lib/spack/spack/test/spec_syntax.py25
3 files changed, 53 insertions, 1 deletions
diff --git a/lib/spack/spack/environment/environment.py b/lib/spack/spack/environment/environment.py
index 9998161df2..cd2a5a7533 100644
--- a/lib/spack/spack/environment/environment.py
+++ b/lib/spack/spack/environment/environment.py
@@ -1484,7 +1484,7 @@ class Environment:
for uspec, uspec_constraints in zip(self.user_specs, self.user_specs.specs_as_constraints):
if uspec not in old_concretized_user_specs:
root_specs.append(uspec)
- args.append((i, uspec_constraints, tests))
+ args.append((i, [str(x) for x in uspec_constraints], tests))
i += 1
# Ensure we don't try to bootstrap clingo in parallel
@@ -2403,6 +2403,7 @@ def _concretize_from_constraints(spec_constraints, tests=False):
def _concretize_task(packed_arguments) -> Tuple[int, Spec, float]:
index, spec_constraints, tests = packed_arguments
+ spec_constraints = [Spec(x) for x in spec_constraints]
with tty.SuppressOutput(msg_enabled=False):
start = time.time()
spec = _concretize_from_constraints(spec_constraints, tests)
diff --git a/lib/spack/spack/test/env.py b/lib/spack/spack/test/env.py
index e88af08761..f6b89e2108 100644
--- a/lib/spack/spack/test/env.py
+++ b/lib/spack/spack/test/env.py
@@ -690,3 +690,29 @@ def test_removing_spec_from_manifest_with_exact_duplicates(
assert "zlib" in manifest.read_text()
with ev.Environment(tmp_path) as env:
assert len(env.user_specs) == 1
+
+
+@pytest.mark.regression("35298")
+@pytest.mark.only_clingo("Propagation not supported in the original concretizer")
+def test_variant_propagation_with_unify_false(tmp_path, mock_packages):
+ """Spack distributes concretizations to different processes, when unify:false is selected and
+ the number of roots is 2 or more. When that happens, the specs to be concretized need to be
+ properly reconstructed on the worker process, if variant propagation was requested.
+ """
+ manifest = tmp_path / "spack.yaml"
+ manifest.write_text(
+ """
+ spack:
+ specs:
+ - parent-foo ++foo
+ - c
+ concretizer:
+ unify: false
+ """
+ )
+ with ev.Environment(tmp_path) as env:
+ env.concretize()
+
+ root = env.matching_spec("parent-foo")
+ for node in root.traverse():
+ assert node.satisfies("+foo")
diff --git a/lib/spack/spack/test/spec_syntax.py b/lib/spack/spack/test/spec_syntax.py
index d731fcd31c..e7a760dc93 100644
--- a/lib/spack/spack/test/spec_syntax.py
+++ b/lib/spack/spack/test/spec_syntax.py
@@ -525,6 +525,31 @@ def specfile_for(default_mock_concretization):
],
"zlib@git.foo/bar",
),
+ # Variant propagation
+ (
+ "zlib ++foo",
+ [
+ Token(TokenType.UNQUALIFIED_PACKAGE_NAME, "zlib"),
+ Token(TokenType.PROPAGATED_BOOL_VARIANT, "++foo"),
+ ],
+ "zlib++foo",
+ ),
+ (
+ "zlib ~~foo",
+ [
+ Token(TokenType.UNQUALIFIED_PACKAGE_NAME, "zlib"),
+ Token(TokenType.PROPAGATED_BOOL_VARIANT, "~~foo"),
+ ],
+ "zlib~~foo",
+ ),
+ (
+ "zlib foo==bar",
+ [
+ Token(TokenType.UNQUALIFIED_PACKAGE_NAME, "zlib"),
+ Token(TokenType.PROPAGATED_KEY_VALUE_PAIR, "foo==bar"),
+ ],
+ "zlib foo==bar",
+ ),
],
)
def test_parse_single_spec(spec_str, tokens, expected_roundtrip):