summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2023-08-14 11:16:04 +0200
committerTodd Gamblin <tgamblin@llnl.gov>2023-08-15 15:54:37 -0700
commit1db91e0ccda6a9d86b6e8338f7be5421c0236b94 (patch)
tree35f896ec310ee14efee0c92c61402b0dff66ee7a /lib
parent34ebe7f53c0ea10069caeaf7bb1f007eee87660e (diff)
downloadspack-1db91e0ccda6a9d86b6e8338f7be5421c0236b94.tar.gz
spack-1db91e0ccda6a9d86b6e8338f7be5421c0236b94.tar.bz2
spack-1db91e0ccda6a9d86b6e8338f7be5421c0236b94.tar.xz
spack-1db91e0ccda6a9d86b6e8338f7be5421c0236b94.zip
Rename "main_node" -> "make_node"
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/solver/asp.py14
-rw-r--r--lib/spack/spack/spec.py2
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py
index f429501aca..1004d1a16a 100644
--- a/lib/spack/spack/solver/asp.py
+++ b/lib/spack/spack/solver/asp.py
@@ -525,12 +525,12 @@ class Result:
best = min(self.answers)
opt, _, answer = best
for input_spec in self.abstract_specs:
- node = SpecBuilder.main_node(pkg=input_spec.name)
+ node = SpecBuilder.make_node(pkg=input_spec.name)
if input_spec.virtual:
providers = [
spec.name for spec in answer.values() if spec.package.provides(input_spec.name)
]
- node = SpecBuilder.main_node(pkg=providers[0])
+ node = SpecBuilder.make_node(pkg=providers[0])
candidate = answer.get(node)
if candidate and candidate.satisfies(input_spec):
@@ -2563,8 +2563,8 @@ class SpecBuilder:
)
@staticmethod
- def main_node(*, pkg: str) -> NodeArgument:
- """Given a package name, returns the string representation of the root node in
+ def make_node(*, pkg: str) -> NodeArgument:
+ """Given a package name, returns the string representation of the "min_dupe_id" node in
the ASP encoding.
Args:
@@ -2663,7 +2663,7 @@ class SpecBuilder:
extendee_spec = package.extendee_spec
if extendee_spec:
- extendee_node = SpecBuilder.main_node(pkg=extendee_spec.name)
+ extendee_node = SpecBuilder.make_node(pkg=extendee_spec.name)
package.update_external_dependencies(self._specs.get(extendee_node, None))
def depends_on(self, parent_node, dependency_node, type):
@@ -2712,11 +2712,11 @@ class SpecBuilder:
# order is determined by the DAG. A spec's flags come after any of its ancestors
# on the compile line
- node = SpecBuilder.main_node(pkg=spec.name)
+ node = SpecBuilder.make_node(pkg=spec.name)
source_key = (node, flag_type)
if source_key in self._flag_sources:
order = [
- SpecBuilder.main_node(pkg=s.name)
+ SpecBuilder.make_node(pkg=s.name)
for s in spec.traverse(order="post", direction="parents")
]
sorted_sources = sorted(
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index 41c1c8a115..a3b0920bf0 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -2983,7 +2983,7 @@ class Spec:
providers = [spec.name for spec in answer.values() if spec.package.provides(name)]
name = providers[0]
- node = spack.solver.asp.SpecBuilder.main_node(pkg=name)
+ node = spack.solver.asp.SpecBuilder.make_node(pkg=name)
assert (
node in answer
), f"cannot find {name} in the list of specs {','.join([n.pkg for n in answer.keys()])}"