concretizer: add a configuration option to use new or old concretizer
- [x] spec.py can call out to the new concretizer - [x] config.yaml now has an option to choose a concretizer (original, clingo)
This commit is contained in:
@@ -109,6 +109,7 @@
|
||||
'dirty': False,
|
||||
'build_jobs': min(16, multiprocessing.cpu_count()),
|
||||
'build_stage': '$tempdir/spack-stage',
|
||||
'concretizer': 'original',
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -82,6 +82,10 @@
|
||||
'build_language': {'type': 'string'},
|
||||
'build_jobs': {'type': 'integer', 'minimum': 1},
|
||||
'ccache': {'type': 'boolean'},
|
||||
'concretizer': {
|
||||
'type': 'string',
|
||||
'enum': ['original', 'clingo']
|
||||
},
|
||||
'db_lock_timeout': {'type': 'integer', 'minimum': 1},
|
||||
'package_lock_timeout': {
|
||||
'anyOf': [
|
||||
|
@@ -97,12 +97,14 @@
|
||||
import spack.architecture
|
||||
import spack.compiler
|
||||
import spack.compilers as compilers
|
||||
import spack.config
|
||||
import spack.dependency as dp
|
||||
import spack.error
|
||||
import spack.hash_types as ht
|
||||
import spack.parse
|
||||
import spack.provider_index
|
||||
import spack.repo
|
||||
import spack.solver
|
||||
import spack.store
|
||||
import spack.util.crypto
|
||||
import spack.util.executable
|
||||
@@ -2244,7 +2246,7 @@ def feq(cfield, sfield):
|
||||
|
||||
return changed
|
||||
|
||||
def concretize(self, tests=False):
|
||||
def _old_concretize(self, tests=False):
|
||||
"""A spec is concrete if it describes one build of a package uniquely.
|
||||
This will ensure that this spec is concrete.
|
||||
|
||||
@@ -2417,6 +2419,33 @@ def concretize(self, tests=False):
|
||||
# there are declared inconsistencies)
|
||||
self.architecture.target.optimization_flags(self.compiler)
|
||||
|
||||
def _new_concretize(self, tests=False):
|
||||
import spack.solver.asp
|
||||
|
||||
if not self.name:
|
||||
raise spack.error.SpecError(
|
||||
"Spec has no name; cannot concretize an anonymous spec")
|
||||
|
||||
result = spack.solver.asp.solve([self])
|
||||
if not result.satisfiable:
|
||||
raise spack.error.UnsatisfiableSpecError(
|
||||
self, "unknown", "Unsatisfiable!")
|
||||
|
||||
# take the best answer
|
||||
opt, i, answer = min(result.answers)
|
||||
assert self.name in answer
|
||||
|
||||
concretized = answer[self.name]
|
||||
self._dup(concretized)
|
||||
self._mark_concrete()
|
||||
|
||||
#: choose your concretizer here.
|
||||
def concretize(self, tests=False):
|
||||
if spack.config.get('config:concretizer') == "original":
|
||||
self._old_concretize(tests)
|
||||
else:
|
||||
self._new_concretize(tests)
|
||||
|
||||
def _mark_concrete(self, value=True):
|
||||
"""Mark this spec and its dependencies as concrete.
|
||||
|
||||
|
Reference in New Issue
Block a user