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

Fix compiler version issues (concrete vs range) (#37572)

Browse Source
This commit is contained in:
Harmen Stoppels 2023-05-10 17:26:22 +02:00 committed by GitHub
parent 8eb1829554
commit 1d96fdc74a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,7 +187,9 @@ def remove_compiler_from_config(compiler_spec, scope=None):
filtered_compiler_config = [ filtered_compiler_config = [
comp comp
for comp in compiler_config for comp in compiler_config
if spack.spec.CompilerSpec(comp["compiler"]["spec"]) != compiler_spec if not spack.spec.parse_with_version_concrete(
comp["compiler"]["spec"], compiler=True
).satisfies(compiler_spec)
] ]
# Update the cache for changes # Update the cache for changes
@ -724,7 +726,7 @@ def make_compiler_list(detected_versions):
def _default_make_compilers(cmp_id, paths): def _default_make_compilers(cmp_id, paths):
operating_system, compiler_name, version = cmp_id operating_system, compiler_name, version = cmp_id
compiler_cls = spack.compilers.class_for_compiler_name(compiler_name) compiler_cls = spack.compilers.class_for_compiler_name(compiler_name)
spec = spack.spec.CompilerSpec(compiler_cls.name, version) spec = spack.spec.CompilerSpec(compiler_cls.name, f"={version}")
paths = [paths.get(x, None) for x in ("cc", "cxx", "f77", "fc")] paths = [paths.get(x, None) for x in ("cc", "cxx", "f77", "fc")]
# TODO: johnwparent - revist the following line as per discussion at: # TODO: johnwparent - revist the following line as per discussion at:
# https://github.com/spack/spack/pull/33385/files#r1040036318 # https://github.com/spack/spack/pull/33385/files#r1040036318

2
lib/spack/spack/operating_systems/cray_backend.py
View File

@ -161,7 +161,7 @@ def make_compilers(self, compiler_id, paths):
compilers = [] compilers = []
for v in compiler_id.version: for v in compiler_id.version:
comp = cmp_cls( comp = cmp_cls(
spack.spec.CompilerSpec(name + "@" + v), spack.spec.CompilerSpec(name + "@=" + v),
self, self,
"any", "any",
["cc", "CC", "ftn"], ["cc", "CC", "ftn"],

20
lib/spack/spack/test/cmd/compiler.py
View File

@ -107,10 +107,10 @@ def test_compiler_find_no_apple_gcc(no_compilers_yaml, working_env, tmpdir):
def test_compiler_remove(mutable_config, mock_packages): def test_compiler_remove(mutable_config, mock_packages):
assert spack.spec.CompilerSpec("gcc@=4.5.0") in spack.compilers.all_compiler_specs()
args = spack.util.pattern.Bunch(all=True, compiler_spec="gcc@4.5.0", add_paths=[], scope=None) args = spack.util.pattern.Bunch(all=True, compiler_spec="gcc@4.5.0", add_paths=[], scope=None)
spack.cmd.compiler.compiler_remove(args) spack.cmd.compiler.compiler_remove(args)
compilers = spack.compilers.all_compiler_specs() assert spack.spec.CompilerSpec("gcc@=4.5.0") not in spack.compilers.all_compiler_specs()
assert spack.spec.CompilerSpec("gcc@4.5.0") not in compilers
@pytest.mark.skipif( @pytest.mark.skipif(
@ -204,12 +204,12 @@ def test_compiler_find_mixed_suffixes(no_compilers_yaml, working_env, clangdir):
os.environ["PATH"] = str(clangdir) os.environ["PATH"] = str(clangdir)
output = compiler("find", "--scope=site") output = compiler("find", "--scope=site")
assert "clang@11.0.0" in output assert "clang@=11.0.0" in output
assert "gcc@8.4.0" in output assert "gcc@=8.4.0" in output
config = spack.compilers.get_compiler_config("site", False) config = spack.compilers.get_compiler_config("site", False)
clang = next(c["compiler"] for c in config if c["compiler"]["spec"] == "clang@11.0.0") clang = next(c["compiler"] for c in config if c["compiler"]["spec"] == "clang@=11.0.0")
gcc = next(c["compiler"] for c in config if c["compiler"]["spec"] == "gcc@8.4.0") gcc = next(c["compiler"] for c in config if c["compiler"]["spec"] == "gcc@=8.4.0")
gfortran_path = str(clangdir.join("gfortran-8")) gfortran_path = str(clangdir.join("gfortran-8"))
@ -246,11 +246,11 @@ def test_compiler_find_prefer_no_suffix(no_compilers_yaml, working_env, clangdir
os.environ["PATH"] = str(clangdir) os.environ["PATH"] = str(clangdir)
output = compiler("find", "--scope=site") output = compiler("find", "--scope=site")
assert "clang@11.0.0" in output assert "clang@=11.0.0" in output
assert "gcc@8.4.0" in output assert "gcc@=8.4.0" in output
config = spack.compilers.get_compiler_config("site", False) config = spack.compilers.get_compiler_config("site", False)
clang = next(c["compiler"] for c in config if c["compiler"]["spec"] == "clang@11.0.0") clang = next(c["compiler"] for c in config if c["compiler"]["spec"] == "clang@=11.0.0")
assert clang["paths"]["cc"] == str(clangdir.join("clang")) assert clang["paths"]["cc"] == str(clangdir.join("clang"))
assert clang["paths"]["cxx"] == str(clangdir.join("clang++")) assert clang["paths"]["cxx"] == str(clangdir.join("clang++"))
@ -277,7 +277,7 @@ def test_compiler_find_path_order(no_compilers_yaml, working_env, clangdir):
config = spack.compilers.get_compiler_config("site", False) config = spack.compilers.get_compiler_config("site", False)
gcc = next(c["compiler"] for c in config if c["compiler"]["spec"] == "gcc@8.4.0") gcc = next(c["compiler"] for c in config if c["compiler"]["spec"] == "gcc@=8.4.0")
assert gcc["paths"] == { assert gcc["paths"] == {
"cc": str(clangdir.join("first_in_path", "gcc-8")), "cc": str(clangdir.join("first_in_path", "gcc-8")),