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

solver: remove indirection for dependency conditions

Browse Source
This commit is contained in:
Gregory Becker 2022-12-12 13:51:30 -08:00
parent edc07dab27
commit 9d20be5fe5
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/solver/asp.py
View File

@ -1294,11 +1294,13 @@ def package_dependencies_rules(self, pkg):
msg += " when %s" % cond msg += " when %s" % cond
condition_id = self.condition(cond, dep.spec, pkg.name, msg) condition_id = self.condition(cond, dep.spec, pkg.name, msg)
self.gen.fact(fn.dependency_condition(condition_id, pkg.name, dep.spec.name)) self.gen.fact(fn.condition_requirement(condition_id, "spack_installed", pkg.name))
for t in sorted(deptypes): for t in sorted(deptypes):
# there is a declared dependency of type t # there is a declared dependency of type t
self.gen.fact(fn.dependency_type(condition_id, t)) self.gen.fact(fn.imposed_constraint(
condition_id, "dependency_holds", pkg.name, dep.spec.name, t
))
self.gen.newline() self.gen.newline()

26
lib/spack/spack/solver/concretize.lp
View File

@ -182,9 +182,8 @@ condition_holds(ID) :-
attr(Name, A1, A2, A3) : condition_requirement(ID, Name, A1, A2, A3); attr(Name, A1, A2, A3) : condition_requirement(ID, Name, A1, A2, A3);
attr(Name, A1, A2, A3, A4) : condition_requirement(ID, Name, A1, A2, A3, A4). attr(Name, A1, A2, A3, A4) : condition_requirement(ID, Name, A1, A2, A3, A4).
% condition_holds(ID) implies all imposed_constraints, unless do_not_impose(ID) % condition_holds(ID) implies all imposed_constraints.
% is derived. This allows imposed constraints to be canceled in special cases. impose(ID) :- condition_holds(ID).
impose(ID) :- condition_holds(ID), not do_not_impose(ID).
% conditions that hold impose constraints on other specs % conditions that hold impose constraints on other specs
attr(Name, A1) :- impose(ID), imposed_constraint(ID, Name, A1). attr(Name, A1) :- impose(ID), imposed_constraint(ID, Name, A1).
@ -229,25 +228,14 @@ depends_on(Package, Dependency) :- attr("depends_on", Package, Dependency, _).
% a dependency holds if its condition holds and if it is not external or % a dependency holds if its condition holds and if it is not external or
% concrete. We chop off dependencies for externals, and dependencies of % concrete. We chop off dependencies for externals, and dependencies of
% concrete specs don't need to be resolved -- they arise from the concrete % concrete specs don't need to be resolved -- they arise from the concrete
% specs themselves. % specs themselves. This attr is used in constraints from dependency conditions
dependency_holds(Package, Dependency, Type) :- attr("spack_installed", Package) :- build(Package), not external(Package).
dependency_condition(ID, Package, Dependency),
dependency_type(ID, Type),
build(Package),
not external(Package),
condition_holds(ID).
% We cut off dependencies of externals (as we don't really know them).
% Don't impose constraints on dependencies that don't exist.
do_not_impose(ID) :-
not dependency_holds(Package, Dependency, _),
dependency_condition(ID, Package, Dependency).
% declared dependencies are real if they're not virtual AND % declared dependencies are real if they're not virtual AND
% the package is not an external. % the package is not an external.
% They're only triggered if the associated dependnecy condition holds. % They're only triggered if the associated dependnecy condition holds.
attr("depends_on", Package, Dependency, Type) attr("depends_on", Package, Dependency, Type)
:- dependency_holds(Package, Dependency, Type), :- attr("dependency_holds", Package, Dependency, Type),
not virtual(Dependency). not virtual(Dependency).
% every root must be a node % every root must be a node
@ -296,13 +284,13 @@ error(1, Msg) :- attr("node", Package),
% if a package depends on a virtual, it's not external and we have a % if a package depends on a virtual, it's not external and we have a
% provider for that virtual then it depends on the provider % provider for that virtual then it depends on the provider
attr("depends_on", Package, Provider, Type) attr("depends_on", Package, Provider, Type)
:- dependency_holds(Package, Virtual, Type), :- attr("dependency_holds", Package, Virtual, Type),
provider(Provider, Virtual), provider(Provider, Virtual),
not external(Package). not external(Package).
% dependencies on virtuals also imply that the virtual is a virtual node % dependencies on virtuals also imply that the virtual is a virtual node
attr("virtual_node", Virtual) attr("virtual_node", Virtual)
:- dependency_holds(Package, Virtual, Type), :- attr("dependency_holds", Package, Virtual, Type),
virtual(Virtual), not external(Package). virtual(Virtual), not external(Package).
% If there's a virtual node, we must select one and only one provider. % If there's a virtual node, we must select one and only one provider.