Skip to content

Commit

Permalink
perf: avoid iterating through multiple caches for contradicted_incomp…
Browse files Browse the repository at this point in the history
…atibilities (python-poetry#7950)

(cherry picked from commit 0adc1c5)
  • Loading branch information
chriskuehl committed May 24, 2023
1 parent 00ec1ce commit 00c8653
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions src/poetry/mixology/version_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,10 @@ def __init__(self, root: ProjectPackage, provider: Provider) -> None:
self._provider = provider
self._dependency_cache = DependencyCache(provider)
self._incompatibilities: dict[str, list[Incompatibility]] = {}
self._contradicted_incompatibilities: dict[int, set[Incompatibility]] = (
collections.defaultdict(set)
)
self._contradicted_incompatibilities: set[Incompatibility] = set()
self._contradicted_incompatibilities_by_level: dict[
int, set[Incompatibility]
] = collections.defaultdict(set)
self._solution = PartialSolution()

@property
Expand Down Expand Up @@ -156,10 +157,7 @@ def _propagate(self, package: str) -> None:
# we can derive stronger assignments sooner and more eagerly find
# conflicts.
for incompatibility in reversed(self._incompatibilities[package]):
if any(
incompatibility in c
for c in self._contradicted_incompatibilities.values()
):
if incompatibility in self._contradicted_incompatibilities:
continue

result = self._propagate_incompatibility(incompatibility)
Expand Down Expand Up @@ -208,9 +206,10 @@ def _propagate_incompatibility(
# If term is already contradicted by _solution, then
# incompatibility is contradicted as well and there's nothing new we
# can deduce from it.
self._contradicted_incompatibilities[self._solution.decision_level].add(
incompatibility
)
self._contradicted_incompatibilities.add(incompatibility)
self._contradicted_incompatibilities_by_level[
self._solution.decision_level
].add(incompatibility)
return None
elif relation == SetRelation.OVERLAPPING:
# If more than one term is inconclusive, we can't deduce anything about
Expand All @@ -228,9 +227,10 @@ def _propagate_incompatibility(
if unsatisfied is None:
return _conflict

self._contradicted_incompatibilities[self._solution.decision_level].add(
incompatibility
)
self._contradicted_incompatibilities.add(incompatibility)
self._contradicted_incompatibilities_by_level[
self._solution.decision_level
].add(incompatibility)

adverb = "not " if unsatisfied.is_positive() else ""
self._log(f"derived: {adverb}{unsatisfied.dependency}")
Expand Down Expand Up @@ -327,7 +327,9 @@ def _resolve_conflict(self, incompatibility: Incompatibility) -> Incompatibility
for level in range(
self._solution.decision_level, previous_satisfier_level, -1
):
self._contradicted_incompatibilities.pop(level, None)
self._contradicted_incompatibilities.difference_update(
self._contradicted_incompatibilities_by_level.pop(level, set()),
)
self._dependency_cache.clear_level(level)

self._solution.backtrack(previous_satisfier_level)
Expand Down

0 comments on commit 00c8653

Please sign in to comment.