diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/solver/concretize.lp | 11 | ||||
| -rw-r--r-- | lib/spack/spack/solver/heuristic.lp | 2 |
2 files changed, 0 insertions, 13 deletions
diff --git a/lib/spack/spack/solver/concretize.lp b/lib/spack/spack/solver/concretize.lp index cda7b5d9d8..1fd0966f04 100644 --- a/lib/spack/spack/solver/concretize.lp +++ b/lib/spack/spack/solver/concretize.lp @@ -273,17 +273,6 @@ condition_set(PackageNode, VirtualNode, direct_link_run) :- provider(PackageNode condition_set(PackageNode, DependencyNode, direct_build) :- condition_set(PackageNode, PackageNode, direct_link_run), attr("depends_on", PackageNode, DependencyNode, "build"). condition_set(PackageNode, DependencyNode, direct_link_run) :- condition_set(PackageNode, PackageNode, direct_link_run), attr("depends_on", PackageNode, DependencyNode, Type), Type != "build". -% TODO (multiple nodes): discuss if it is sensible to remove the following rule - it means that a request or imposition must be on a direct dependency -% Add transitive link_run dependencies, but only if they are not clashing with some direct dependency -% (otherwise we might create an unsolvable problem when the transitive dependency has requirements that -% are in conflict with the direct dependency) -%condition_set(ID, node(DependencyID, Dependency), link_run) -% :- condition_set(ID, PackageNode, link_run), -% PackageNode != ID, Type != "build", -% not condition_set(ID, node(_, Dependency), direct_build), -% not condition_set(ID, node(_, Dependency), direct_link_run), -% attr("depends_on", PackageNode, node(DependencyID, Dependency), Type). - condition_set(ID, VirtualNode, Type) :- condition_set(ID, PackageNode, Type), provider(PackageNode, VirtualNode). condition_set(ID, PackageNode) :- condition_set(ID, PackageNode, _). diff --git a/lib/spack/spack/solver/heuristic.lp b/lib/spack/spack/solver/heuristic.lp index 5afb785cbc..cb1f548e3b 100644 --- a/lib/spack/spack/solver/heuristic.lp +++ b/lib/spack/spack/solver/heuristic.lp @@ -21,8 +21,6 @@ % Providers #heuristic attr("node", node(0, Package)) : default_provider_preference(Virtual, Package, 0), possible_in_link_run(Package). [30, true] -%#heuristic provider(node(0, Package), node(0, Virtual)) : default_provider_preference(Virtual, Package, 0), possible_in_link_run(Package). [30, true] -%#heuristic provider_weight(node(0, Package), node(0, Virtual), 0) : default_provider_preference(Virtual, Package, 0), possible_in_link_run(Package). [30, true] % node(ID, _) #heuristic attr("version", node(ID, Package), Version) : pkg_fact(Package, version_declared(Version, ID)), attr("node", node(ID, Package)). [25-5*ID, true] |