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

Remove artifacts of frequent rebase

Browse Source 
fixup
This commit is contained in:
Massimiliano Culpo 2025-01-22 11:36:32 +01:00
parent b3cc4b4cb3
commit dc12cfde75
No known key found for this signature in database
GPG Key ID: 3E52BB992233066C
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,6 @@
parse_term, parse_term,
) )
from .input_analysis import create_counter, create_graph_analyzer from .input_analysis import create_counter, create_graph_analyzer
from .libc import CompilerPropertyDetector
from .requirements import RequirementKind, RequirementParser, RequirementRule from .requirements import RequirementKind, RequirementParser, RequirementRule
from .version_order import concretization_version_order from .version_order import concretization_version_order
@ -2234,14 +2233,6 @@ def external_packages(self):
if pkg_name == "all": if pkg_name == "all":
continue continue
# package isn't a possible dependency and can't be in the solution
if pkg_name not in self.pkgs:
continue
# This package is not in the possible dependencies
if pkg_name not in self.pkgs:
continue
# This package is not among possible dependencies # This package is not among possible dependencies
if pkg_name not in self.pkgs: if pkg_name not in self.pkgs:
continue continue
@ -4469,9 +4460,8 @@ def _check_input_and_extract_concrete_specs(specs):
for s in root.traverse(): for s in root.traverse():
candidates = s.edges_to_dependencies(depflag=dt.BUILD) candidates = s.edges_to_dependencies(depflag=dt.BUILD)
if candidates: if candidates:
virtuals = set() non_virtuals, virtuals, _ = create_graph_analyzer().possible_dependencies(
non_virtuals = spack.package_base.possible_dependencies( s, transitive=False, allowed_deps=dt.LINK | dt.RUN | dt.BUILD
s, transitive=False, virtuals=virtuals
) )
possible_direct_deps = set(non_virtuals) | virtuals possible_direct_deps = set(non_virtuals) | virtuals
not_possible = set( not_possible = set(
@ -4496,7 +4486,7 @@ def _check_input_and_extract_concrete_specs(specs):
continue continue
try: try:
s.package_class spack.repo.PATH.get_pkg_class(s.fullname)
except spack.repo.UnknownPackageError: except spack.repo.UnknownPackageError:
raise UnsatisfiableSpecError( raise UnsatisfiableSpecError(
f"cannot concretize '{root}', since '{s.name}' does not exist" f"cannot concretize '{root}', since '{s.name}' does not exist"