Skip to content

Optimize reuse from buildcaches #30806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
becker33 merged 3 commits into from
Aug 2, 2022
+13 −11
Merged

Optimize reuse from buildcaches #30806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d2fcd5
database: don't sort on return from query_local
alalazo May 24, 2022
cf67b51
ASP-based solver: don't build the hash-lookup dictionary twice
alalazo May 25, 2022
4dd477e
Fix typo in docstring
alalazo Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/spack/spack/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,9 +1525,14 @@ def _query(
_query.__doc__ += _query_docstring

def query_local(self, *args, **kwargs):
"""Query only the local Spack database."""
"""Query only the local Spack database.

This function doesn't guarantee any sorting of the returned
data for performance reason, since comparing specs for __lt__
may be an expensive operation.
"""
with self.read_transaction():
return sorted(self._query(*args, **kwargs))
return self._query(*args, **kwargs)

if query_local.__doc__ is None:
query_local.__doc__ = ""
Expand Down
15 changes: 6 additions & 9 deletions lib/spack/spack/solver/asp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ def stringify(x):

if result.satisfiable:
# build spec from the best model
builder = SpecBuilder(specs, reuse=reuse)
builder = SpecBuilder(specs, hash_lookup=setup.reusable_and_possible)
min_cost, best_model = min(models)
tuples = [(sym.name, [stringify(a) for a in sym.arguments]) for sym in best_model]
answers = builder.build_specs(tuples)
Expand Down Expand Up @@ -718,6 +718,7 @@ def __init__(self, tests=False):

# hashes we've already added facts for
self.seen_hashes = set()
self.reusable_and_possible = {}

# id for dummy variables
self._condition_id_counter = itertools.count()
Expand Down Expand Up @@ -1730,6 +1731,7 @@ def _facts_from_concrete_spec(self, spec, possible):
# be dependencies (don't tell it about the others)
h = spec.dag_hash()
if spec.name in possible and h not in self.seen_hashes:
self.reusable_and_possible[h] = spec
try:
# Only consider installed packages for repo we know
spack.repo.path.get(spec)
Expand Down Expand Up @@ -1887,7 +1889,7 @@ class SpecBuilder(object):
#: Attributes that don't need actions
ignored_attributes = ["opt_criterion"]

def __init__(self, specs, reuse=None):
def __init__(self, specs, hash_lookup=None):
self._specs = {}
self._result = None
self._command_line_specs = specs
Expand All @@ -1896,11 +1898,7 @@ def __init__(self, specs, reuse=None):

# Pass in as arguments reusable specs and plug them in
# from this dictionary during reconstruction
self._hash_lookup = {}
if reuse is not None:
for spec in reuse:
for node in spec.traverse():
self._hash_lookup.setdefault(node.dag_hash(), node)
self._hash_lookup = hash_lookup or {}

def hash(self, pkg, h):
if pkg not in self._specs:
Expand Down Expand Up @@ -2205,8 +2203,7 @@ def _reusable_specs(self):
# Specs from buildcaches
try:
index = spack.binary_distribution.update_cache_and_get_specs()
reusable_specs.extend([s for s in index if not s.satisfies("dev_path=*")])

reusable_specs.extend(index)
except (spack.binary_distribution.FetchCacheError, IndexError):
# this is raised when no mirrors had indices.
# TODO: update mirror configuration so it can indicate that the
Expand Down