zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename method: "root_node" -> "main_node"

Browse Source
This commit is contained in:
Massimiliano Culpo
2023-08-07 14:04:57 +02:00
committed by Todd Gamblin
parent b3087b32c6
commit 3b4d7bf119
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/spack/spack/solver/asp.py
View File

@@ -525,12 +525,12 @@ def _compute_specs_from_answer_set(self):
best = min(self.answers)
opt, _, answer = best
for input_spec in self.abstract_specs:
node = SpecBuilder.root_node(pkg=input_spec.name)
node = SpecBuilder.main_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.root_node(pkg=providers[0])
node = SpecBuilder.main_node(pkg=providers[0])
candidate = answer.get(node)
if candidate and candidate.satisfies(input_spec):
@@ -2535,7 +2535,7 @@ class SpecBuilder:
node_regex = re.compile(r"node\(\d,\"(.*)\"\)")
@staticmethod
def root_node(*, pkg: str) -> str:
def main_node(*, pkg: str) -> str:
"""Given a package name, returns the string representation of the root node in
the ASP encoding.
@@ -2650,7 +2650,7 @@ def external_spec_selected(self, node, idx):
extendee_spec = package.extendee_spec
if extendee_spec:
extendee_node = SpecBuilder.root_node(pkg=extendee_spec.name)
extendee_node = SpecBuilder.main_node(pkg=extendee_spec.name)
package.update_external_dependencies(self._specs.get(extendee_node, None))
def depends_on(self, parent_node, dependency_node, type):
@@ -2700,11 +2700,11 @@ def reorder_flags(self):
# order is determined by the DAG. A spec's flags come after any of its ancestors
# on the compile line
node = SpecBuilder.root_node(pkg=spec.name)
node = SpecBuilder.main_node(pkg=spec.name)
source_key = (node, flag_type)
if source_key in self._flag_sources:
order = [
SpecBuilder.root_node(pkg=s.name)
SpecBuilder.main_node(pkg=s.name)
for s in spec.traverse(order="post", direction="parents")
]
sorted_sources = sorted(

2
lib/spack/spack/spec.py
View File

@@ -2983,7 +2983,7 @@ def _new_concretize(self, tests=False):
providers = [spec.name for spec in answer.values() if spec.package.provides(name)]
name = providers[0]
node = spack.solver.asp.SpecBuilder.root_node(pkg=name)
node = spack.solver.asp.SpecBuilder.main_node(pkg=name)
assert node in answer, f"cannot find {name} in the list of specs {','.join(answer.keys())}"
concretized = answer[node]