Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

concretize.lp: fix issue with reuse of conditional variants #43676

Merged
merged 4 commits into from
Apr 16, 2024
Merged

concretize.lp: fix issue with reuse of conditional variants #43676

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1930bff
concretize.lp: fix reuse of conditional variants
haampie Apr 16, 2024
e7218dd
add a test
haampie Apr 16, 2024
b742fcc
Update lib/spack/spack/test/concretize.py
haampie Apr 16, 2024
dc3766c
Update lib/spack/spack/test/concretize.py
haampie Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions lib/spack/spack/solver/concretize.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,12 +891,8 @@ error(100, "{0} variant '{1}' cannot have values '{2}' and '{3}' as they come fr
Set1 < Set2, % see[1]
build(node(ID, Package)).

% variant_set is an explicitly set variant value. If it's not 'set',
% we revert to the default value. If it is set, we force the set value
attr("variant_value", PackageNode, Variant, Value)
:- attr("node", PackageNode),
node_has_variant(PackageNode, Variant),
attr("variant_set", PackageNode, Variant, Value).
:- attr("variant_set", node(ID, Package), Variant, Value),
not attr("variant_value", node(ID, Package), Variant, Value).

% The rules below allow us to prefer default values for variants
% whenever possible. If a variant is set in a spec, or if it is
Expand Down
15 changes: 15 additions & 0 deletions lib/spack/spack/test/concretize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,21 @@ def test_reuse_installed_packages_when_package_def_changes(
# Structure and package hash will be different without reuse
assert root.dag_hash() != new_root_without_reuse.dag_hash()

@pytest.mark.only_clingo("Use case not supported by the original concretizer")
def test_no_reuse_when_variant_condition_does_not_hold(self, mutable_database, mock_packages):
haampie marked this conversation as resolved.
Show resolved Hide resolved
spack.config.set("concretizer:reuse", True)

# Install a spec which for which the `version_based` variant condition does not hold
haampie marked this conversation as resolved.
Show resolved Hide resolved
old = Spec("conditional-variant-pkg @1").concretized()
old.package.do_install(fake=True, explicit=True)

# Then explicitly require a spec with `+version_based`, which shouldn't reuse previous spec
new1 = Spec("conditional-variant-pkg +version_based").concretized()
assert new1.satisfies("@2 +version_based")

new2 = Spec("conditional-variant-pkg +two_whens").concretized()
assert new2.satisfies("@2 +two_whens +version_based")

@pytest.mark.only_clingo("Use case not supported by the original concretizer")
def test_reuse_with_flags(self, mutable_database, mutable_config):
spack.config.set("concretizer:reuse", True)
Expand Down