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

Do not add ^gcc-runtime to externals (#41994)

Browse Source 
This commit ensures that gcc-runtime is only injected as a dependency to non-external packages
This commit is contained in:
Massimiliano Culpo 2024-01-08 22:09:53 +01:00 committed by GitHub
parent cdb8fd68e2
commit aa768938ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2927,6 +2927,7 @@ def depends_on(self, dependency_str: str, *, when: str, type: str, description:
body_clauses = self._setup.spec_clauses(when_spec, body=True) body_clauses = self._setup.spec_clauses(when_spec, body=True)
body_str = ( body_str = (
f" {f',{os.linesep} '.join(str(x) for x in body_clauses)},\n" f" {f',{os.linesep} '.join(str(x) for x in body_clauses)},\n"
f" not external({node_variable}),\n"
f" not runtime(Package)" f" not runtime(Package)"
).replace(f'"{placeholder}"', f"{node_variable}") ).replace(f'"{placeholder}"', f"{node_variable}")
head_clauses = self._setup.spec_clauses(dependency_spec, body=False) head_clauses = self._setup.spec_clauses(dependency_spec, body=False)

24
lib/spack/spack/test/concretize_compiler_runtimes.py
View File

@ -13,7 +13,10 @@
import spack.spec import spack.spec
from spack.version import Version from spack.version import Version
pytestmark = [pytest.mark.only_clingo("Original concretizer does not support compiler runtimes")] pytestmark = [
pytest.mark.only_clingo("Original concretizer does not support compiler runtimes"),
pytest.mark.usefixtures("enable_runtimes"),
]
@pytest.fixture @pytest.fixture
@ -31,7 +34,7 @@ def enable_runtimes():
spack.solver.asp.WITH_RUNTIME = original spack.solver.asp.WITH_RUNTIME = original
def test_correct_gcc_runtime_is_injected_as_dependency(runtime_repo, enable_runtimes): def test_correct_gcc_runtime_is_injected_as_dependency(runtime_repo):
s = spack.spec.Spec("a%gcc@10.2.1 ^b%gcc@4.5.0").concretized() s = spack.spec.Spec("a%gcc@10.2.1 ^b%gcc@4.5.0").concretized()
a, b = s["a"], s["b"] a, b = s["a"], s["b"]
@ -40,3 +43,20 @@ def test_correct_gcc_runtime_is_injected_as_dependency(runtime_repo, enable_runt
# And the gcc-runtime version should be that of the newest gcc used in the dag. # And the gcc-runtime version should be that of the newest gcc used in the dag.
assert a["gcc-runtime"].version == Version("10.2.1") assert a["gcc-runtime"].version == Version("10.2.1")
@pytest.mark.regression("41972")
def test_external_nodes_do_not_have_runtimes(runtime_repo, mutable_config, tmp_path):
"""Tests that external nodes don't have runtime dependencies."""
packages_yaml = {"b": {"externals": [{"spec": "b@1.0", "prefix": f"{str(tmp_path)}"}]}}
spack.config.set("packages", packages_yaml)
s = spack.spec.Spec("a%gcc@10.2.1").concretized()
a, b = s["a"], s["b"]
# Since b is an external, it doesn't depend on gcc-runtime
assert a.dependencies("gcc-runtime")
assert a.dependencies("b")
assert not b.dependencies("gcc-runtime")