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

parse_with_version_concrete: remove compiler= switch

Browse Source
This commit is contained in:
Massimiliano Culpo 2024-07-11 16:40:22 +02:00
parent 510623fe47
commit cf2b5a1e4f
No known key found for this signature in database
GPG Key ID: 3E52BB992233066C
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/compilers/__init__.py
View File

@ -232,7 +232,7 @@ def all_compilers_config(
def all_compiler_specs(scope=None, init_config=True):
# Return compiler specs from the merged config.
return [
spack.spec.parse_with_version_concrete(s["compiler"]["spec"], compiler=True)
spack.spec.parse_with_version_concrete(s["compiler"]["spec"])
for s in all_compilers_config(spack.config.CONFIG, scope=scope, init_config=init_config)
]
@ -458,7 +458,7 @@ def __eq__(self, other):
def compiler_from_dict(items):
cspec = spack.spec.parse_with_version_concrete(items["spec"], compiler=True)
cspec = spack.spec.parse_with_version_concrete(items["spec"])
os = items.get("operating_system", None)
target = items.get("target", None)

4
lib/spack/spack/spec.py
View File

@ -4824,9 +4824,9 @@ def substitute_abstract_variants(spec: Spec):
)
def parse_with_version_concrete(spec_like: Union[str, Spec], compiler: bool = False):
def parse_with_version_concrete(spec_like: Union[str, Spec]):
"""Same as Spec(string), but interprets @x as @=x"""
s: Union[CompilerSpec, Spec] = CompilerSpec(spec_like) if compiler else Spec(spec_like)
s = Spec(spec_like)
interpreted_version = s.versions.concrete_range_as_version
if interpreted_version:
s.versions = vn.VersionList([interpreted_version])