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

Removed leftover TODOs

Browse Source
This commit is contained in:
Massimiliano Culpo 2023-07-05 14:11:33 +02:00 committed by Todd Gamblin
parent 3f3c75e56a
commit 927d831612
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -967,7 +967,6 @@ def key_fn(version):
) )
for weight, declared_version in enumerate(most_to_least_preferred): for weight, declared_version in enumerate(most_to_least_preferred):
# TODO: self.package_fact(pkg.name).version_declared(declared_version, weight=weight)
self.gen.fact( self.gen.fact(
fn.facts( fn.facts(
pkg.name, pkg.name,
@ -1360,9 +1359,6 @@ def condition(self, required_spec, imposed_spec=None, name=None, msg=None, node=
cache[imposed_spec] = (effect_id, requirements) cache[imposed_spec] = (effect_id, requirements)
effect_id, requirements = cache[imposed_spec] effect_id, requirements = cache[imposed_spec]
self.gen.fact(fn.facts(named_cond.name, fn.condition_effect(condition_id, effect_id))) self.gen.fact(fn.facts(named_cond.name, fn.condition_effect(condition_id, effect_id)))
# FIXME: self.gen.fact(fn.imposed_constraint(condition_id, *predicate.args))
return condition_id return condition_id
def impose(self, condition_id, imposed_spec, node=True, name=None, body=False): def impose(self, condition_id, imposed_spec, node=True, name=None, body=False):
@ -2658,19 +2654,16 @@ def external_spec_selected(self, node, idx):
package.update_external_dependencies(self._specs.get(extendee_node, None)) package.update_external_dependencies(self._specs.get(extendee_node, None))
def depends_on(self, parent_node, dependency_node, type): def depends_on(self, parent_node, dependency_node, type):
dependencies = self._specs[parent_node].edges_to_dependencies(name=dependency_node) dependency_spec = self._specs[dependency_node]
edges = self._specs[parent_node].edges_to_dependencies(name=dependency_spec.name)
edges = [x for x in edges if id(x.spec) == id(dependency_spec)]
# TODO: assertion to be removed when cross-compilation is handled correctly if not edges:
msg = "Current solver does not handle multiple dependency edges of the same name"
assert len(dependencies) < 2, msg
if not dependencies:
self._specs[parent_node].add_dependency_edge( self._specs[parent_node].add_dependency_edge(
self._specs[dependency_node], deptypes=(type,), virtuals=() self._specs[dependency_node], deptypes=(type,), virtuals=()
) )
else: else:
# TODO: This assumes that each solve unifies dependencies edges[0].update_deptypes(deptypes=(type,))
dependencies[0].update_deptypes(deptypes=(type,))
def virtual_on_edge(self, parent_node, provider_node, virtual): def virtual_on_edge(self, parent_node, provider_node, virtual):
provider = self.extract_pkg(provider_node) provider = self.extract_pkg(provider_node)

2
lib/spack/spack/solver/concretize.lp
View File

@ -644,7 +644,6 @@ requirement_group_satisfied(node(ID, Package), X) :-
% flags if their only source is from a requirement. This is overly-specific % flags if their only source is from a requirement. This is overly-specific
% and should use a more-generic approach like in https://github.com/spack/spack/pull/37180 % and should use a more-generic approach like in https://github.com/spack/spack/pull/37180
% FIXME (node transformation): check the following two rules for node(ID, A1)
{ attr("node_flag", node(ID, A1), A2, A3) } :- { attr("node_flag", node(ID, A1), A2, A3) } :-
requirement_group_member(Y, Package, X), requirement_group_member(Y, Package, X),
activate_requirement(node(ID, Package), X), activate_requirement(node(ID, Package), X),
@ -822,7 +821,6 @@ external_with_variant_set(node(NodeID, Package), Variant, Value)
external(node(NodeID, Package)), external(node(NodeID, Package)),
attr("node", node(NodeID, Package)). attr("node", node(NodeID, Package)).
% FIXME (node transformation): check how to define the default value
% The default value for a variant in a package is what is prescribed: % The default value for a variant in a package is what is prescribed:
% %
% 1. On the command line % 1. On the command line