hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

neoverse-v1: restore py-cinemasci (#44976)

Browse source 
Use a different tactic for determining conflicts.

Give more priority to setting False very old versions.
This commit is contained in:
Massimiliano Culpo 2024-07-01 09:53:24 +02:00 committed by Harmen Stoppels
parent d883883be0
commit d299e17d43
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/spack/spack/solver/asp.py
View file

@ -95,7 +95,7 @@ def default_clingo_control():
control = clingo().Control() control = clingo().Control()
control.configuration.configuration = "tweety" control.configuration.configuration = "tweety"
control.configuration.solver.heuristic = "Domain" control.configuration.solver.heuristic = "Domain"
control.configuration.solver.opt_strategy = "usc,one" control.configuration.solver.opt_strategy = "usc,one,1"
return control return control

6
lib/spack/spack/solver/heuristic.lp
View file

@ -8,12 +8,12 @@
%============================================================================= %=============================================================================
% No duplicates by default (most of them will be true) % No duplicates by default (most of them will be true)
#heuristic attr("node", node(1..X-1, Package)) : max_dupes(Package, X), not virtual(Package), X > 1. [50, false] #heuristic attr("node", node(1..X-1, Package)) : max_dupes(Package, X), not virtual(Package), X > 1. [100, false]
#heuristic attr("virtual_node", node(1..X-1, Package)) : max_dupes(Package, X), virtual(Package) , X > 1. [50, false] #heuristic attr("virtual_node", node(1..X-1, Package)) : max_dupes(Package, X), virtual(Package) , X > 1. [100, false]
% Pick preferred version % Pick preferred version
#heuristic attr("version", node(PackageID, Package), Version) : pkg_fact(Package, version_declared(Version, 0 )), attr("node", node(PackageID, Package)). [40, true] #heuristic attr("version", node(PackageID, Package), Version) : pkg_fact(Package, version_declared(Version, 0 )), attr("node", node(PackageID, Package)). [40, true]
#heuristic attr("version", node(PackageID, Package), Version) : pkg_fact(Package, version_declared(Version, Weight)), attr("node", node(PackageID, Package)), Weight > 0. [40, false] #heuristic attr("version", node(PackageID, Package), Version) : pkg_fact(Package, version_declared(Version, Weight)), attr("node", node(PackageID, Package)), Weight > 0. [40+5*Weight, false]
#heuristic version_weight(node(PackageID, Package), 0) : pkg_fact(Package, version_declared(Version, 0 )), attr("node", node(PackageID, Package)). [40, true] #heuristic version_weight(node(PackageID, Package), 0) : pkg_fact(Package, version_declared(Version, 0 )), attr("node", node(PackageID, Package)). [40, true]
% Use default variants % Use default variants