ASP-based solver: minimize weights over edges (#40632)

With the introduction of multiple build dependencies from the same package in the DAG, we need to minimize a few weights accounting for edges rather than nodes. If we don't do that we might have multiple "optimal" solutions that differ only in how the same nodes are connected together. This commit ensures optimal versions are picked per parent in case of multiple choices for a dependency.
This commit is contained in:
Massimiliano Culpo 2023-10-20 14:37:07 +02:00 committed by GitHub
parent 06fc24df5e
commit cbc39977ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 74 additions and 0 deletions

View file

@ -1535,6 +1535,17 @@ opt_criterion(5, "non-preferred targets").
build_priority(PackageNode, Priority)
}.
% Choose more recent versions for nodes
opt_criterion(1, "edge wiring").
#minimize{ 0@201: #true }.
#minimize{ 0@1: #true }.
#minimize{
Weight@1,ParentNode,PackageNode
: version_weight(PackageNode, Weight),
not attr("root", PackageNode),
depends_on(ParentNode, PackageNode)
}.
%-----------
% Notes
%-----------

View file

@ -2228,6 +2228,43 @@ def test_pure_build_virtual_dependency(self, strategy):
s = Spec("virtual-build").concretized()
assert s["pkgconfig"].name == "pkg-config"
@pytest.mark.regression("40595")
def test_no_multiple_solutions_with_different_edges_same_nodes(self):
r"""Tests that the root node, which has a dependency on py-setuptools without constraint,
doesn't randomly pick one of the two setuptools (@=59, @=60) needed by its dependency.
o py-floating@1.25.0/3baitsp
|\
| |\
| | |\
| o | | py-shapely@1.25.0/4hep6my
|/| | |
| |\| |
| | |/
| |/|
| | o py-setuptools@60/cwhbthc
| |/
|/|
| o py-numpy@1.25.0/5q5fx4d
|/|
| |\
| o | py-setuptools@59/jvsa7sd
|/ /
o | python@3.11.2/pdmjekv
o | gmake@3.0/jv7k2bl
/
o gmake@4.1/uo6ot3d
"""
spec_str = "py-floating"
root = spack.spec.Spec(spec_str).concretized()
assert root["py-shapely"].satisfies("^py-setuptools@=60")
assert root["py-numpy"].satisfies("^py-setuptools@=59")
edges = root.edges_to_dependencies("py-setuptools")
assert len(edges) == 1
assert edges[0].spec.satisfies("@=60")
@pytest.mark.parametrize(
"v_str,v_opts,checksummed",

View file

@ -0,0 +1,26 @@
# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack.package import *
class PyFloating(Package):
"""An extension that depends on:
- py-setuptools without further constraints
- py-shapely, which depends on py-setuptools@=60
- py-numpy, which depends on py-setuptools@=59
We need to ensure that by default the root node gets the best version
of setuptools it could.
"""
homepage = "http://www.example.com"
url = "http://www.example.com/tdep-1.0.tar.gz"
version("1.25.0", md5="0123456789abcdef0123456789abcdef")
extends("python")
depends_on("py-numpy", type=("build", "run"))
depends_on("py-shapely", type=("build", "run"))
depends_on("py-setuptools", type="build")