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

Don't use compilers from buildcache if reuse is false

Browse Source
This commit is contained in:
Massimiliano Culpo 2025-02-14 17:21:33 +01:00
parent 7800c4c51b
commit 30ebf3595b
No known key found for this signature in database
GPG Key ID: 3E52BB992233066C
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3042,15 +3042,23 @@ def setup(
specs = tuple(specs) # ensure compatible types to add specs = tuple(specs) # ensure compatible types to add
_ = spack.compilers.config.all_compilers(init_config=True) _ = spack.compilers.config.all_compilers(init_config=True)
self.possible_compilers = possible_compilers(configuration=spack.config.CONFIG)
for x in self.possible_compilers: # Get compilers from buildcache only if injected through "reuse" specs
if x.external: supported_compilers = spack.compilers.config.supported_compilers()
compilers_from_reuse = {
x for x in reuse if x.name in supported_compilers and not x.external
}
candidate_compilers = possible_compilers(configuration=spack.config.CONFIG)
for x in candidate_compilers:
if x.external or x in reuse:
continue continue
reuse.append(x) reuse.append(x)
for dep in x.traverse(root=False, deptype="run"): for dep in x.traverse(root=False, deptype="run"):
reuse.extend(dep.traverse(deptype=("link", "run"))) reuse.extend(dep.traverse(deptype=("link", "run")))
# reuse.extend([x for x in self.possible_compilers if not x.external]) candidate_compilers.update(compilers_from_reuse)
self.possible_compilers = list(candidate_compilers)
self.possible_compilers.sort()
self.gen.h1("Reusable concrete specs") self.gen.h1("Reusable concrete specs")
self.define_concrete_input_specs(specs, self.pkgs) self.define_concrete_input_specs(specs, self.pkgs)
@ -3195,11 +3203,6 @@ def define_runtime_constraints(self):
except (KeyError, RuntimeError) as e: except (KeyError, RuntimeError) as e:
tty.debug(f"{compiler} cannot determine libc because: {e}") tty.debug(f"{compiler} cannot determine libc because: {e}")
# If this is a compiler yet to be built infer libc from the Python process
# FIXME (compiler as nodes): recover this use case
# if not current_libc and compiler.compiler_obj.cc is None:
# current_libc = spack.util.libc.libc_from_current_python_process()
if current_libc: if current_libc:
recorder("*").depends_on( recorder("*").depends_on(
"libc", "libc",
@ -3414,7 +3417,7 @@ def value(self) -> str:
return "".join(self.asp_problem) return "".join(self.asp_problem)
def possible_compilers(*, configuration) -> List["spack.spec.Spec"]: def possible_compilers(*, configuration) -> Set["spack.spec.Spec"]:
result = set() result = set()
# Compilers defined in configuration # Compilers defined in configuration
@ -3451,16 +3454,6 @@ def possible_compilers(*, configuration) -> List["spack.spec.Spec"]:
for pkg_name in supported_compilers: for pkg_name in supported_compilers:
result.update(spack.store.STORE.db.query(pkg_name)) result.update(spack.store.STORE.db.query(pkg_name))
# Compilers from build cache
from_buildcache = [
x
for x in spack.binary_distribution.update_cache_and_get_specs()
if x.name in supported_compilers and not x.external
]
result.update(from_buildcache)
result = list(result)
result.sort()
return result return result