summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2021-02-03 19:12:03 +0100
committerGitHub <noreply@github.com>2021-02-03 10:12:03 -0800
commitba42c36f00fe40c047121a32117018eb93e0c4b1 (patch)
treee3987648e09249968065ed83551a33fb97bc36c2 /lib
parent8be833b2420103ecd2322c13fec0a1f7a8b7d4c5 (diff)
downloadspack-ba42c36f00fe40c047121a32117018eb93e0c4b1.tar.gz
spack-ba42c36f00fe40c047121a32117018eb93e0c4b1.tar.bz2
spack-ba42c36f00fe40c047121a32117018eb93e0c4b1.tar.xz
spack-ba42c36f00fe40c047121a32117018eb93e0c4b1.zip
concretizer: simplify "fact" method (#21148)
The "fact" method before was dealing with multiple facts registered per call, which was used when we were emitting grounded rules from knowledge of the problem instance. Now that the encoding is changed we can simplify the method to deal only with a single fact per call.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/solver/asp.py28
1 files changed, 5 insertions, 23 deletions
diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py
index 25b2181708..4d7b019ea6 100644
--- a/lib/spack/spack/solver/asp.py
+++ b/lib/spack/spack/solver/asp.py
@@ -210,19 +210,6 @@ class Result(object):
*sorted(str(symbol) for symbol in core))
-def _normalize(body):
- """Accept an AspAnd object or a single Symbol and return a list of
- symbols.
- """
- if isinstance(body, clingo.Symbol):
- args = [body]
- elif hasattr(body, 'symbol'):
- args = [body.symbol()]
- else:
- raise TypeError("Invalid typee: ", type(body))
- return args
-
-
def _normalize_packages_yaml(packages_yaml):
normalized_yaml = copy.copy(packages_yaml)
for pkg_name in packages_yaml:
@@ -280,19 +267,14 @@ class PyclingoDriver(object):
def fact(self, head):
"""ASP fact (a rule without a body)."""
- symbols = _normalize(head)
- self.out.write("%s.\n" % ','.join(str(a) for a in symbols))
+ symbol = head.symbol() if hasattr(head, 'symbol') else head
- atoms = {}
- for s in symbols:
- atoms[s] = self.backend.add_atom(s)
+ self.out.write("%s.\n" % str(symbol))
- self.backend.add_rule(
- [atoms[s] for s in symbols], [], choice=self.cores
- )
+ atom = self.backend.add_atom(symbol)
+ self.backend.add_rule([atom], [], choice=self.cores)
if self.cores:
- for s in symbols:
- self.assumptions.append(atoms[s])
+ self.assumptions.append(atom)
def solve(
self, solver_setup, specs, dump=None, nmodels=0,