concretizer: move remove_node transform into spec_clauses

`remove_node` is used in almost all calls to `condition()`, but it's removing something
we could just not add in the first place. The `node` and `virtual_node` attrs are only
needed in certain places, so annotate calls to `spec_clauses` there instead of stripping
them after it's called.

Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>

.github/workflows/requirements/style/requirements.txt

@@ -3,5 +3,5 @@ clingo==5.7.1
 flake8==7.1.1
 isort==5.13.2
 mypy==1.8.0
-types-six==1.16.21.20241105
+types-six==1.17.0.20241205
 vermin==1.6.0

lib/spack/spack/cmd/diff.py

@@ -90,12 +90,16 @@ def compare_specs(a, b, to_string=False, color=None, ignore_packages=None):
     # specs and to descend into dependency hashes so we include all facts.
     a_facts = set(
         shift(func)
-        for func in setup.spec_clauses(a, body=True, expand_hashes=True, concrete_build_deps=True)
+        for func in setup.spec_clauses(
+            a, body=True, expand_hashes=True, concrete_build_deps=True, node=True
+        )
         if func.name == "attr"
     )
     b_facts = set(
         shift(func)
-        for func in setup.spec_clauses(b, body=True, expand_hashes=True, concrete_build_deps=True)
+        for func in setup.spec_clauses(
+            b, body=True, expand_hashes=True, concrete_build_deps=True, node=True
+        )
         if func.name == "attr"
     )
 

lib/spack/spack/solver/asp.py

@@ -266,11 +266,6 @@ def specify(spec):
     return spack.spec.Spec(spec)
 
 
-def remove_node(spec: spack.spec.Spec, facts: List[AspFunction]) -> List[AspFunction]:
-    """Transformation that removes all "node" and "virtual_node" from the input list of facts."""
-    return list(filter(lambda x: x.args[0] not in ("node", "virtual_node"), facts))
-
-
 def _create_counter(specs: List[spack.spec.Spec], tests: bool):
     strategy = spack.config.CONFIG.get("concretizer:duplicates:strategy", "none")
     if strategy == "full":
@@ -1522,7 +1517,8 @@ def _get_condition_id(
             return result[0]
 
         cond_id = next(self._id_counter)
-        requirements = self.spec_clauses(named_cond, body=body, context=context)
+
+        requirements = self.spec_clauses(named_cond, body=body, context=context, node=True)
         if context.transform:
             requirements = context.transform(named_cond, requirements)
         pkg_cache[named_cond_key] = (cond_id, requirements)
@@ -1560,7 +1556,6 @@ def condition(
 
         if not context:
             context = ConditionContext()
-            context.transform_imposed = remove_node
 
         if imposed_spec:
             imposed_name = imposed_spec.name or imposed_name
@@ -1595,14 +1590,6 @@ def condition(
 
             return condition_id
 
-    def impose(self, condition_id, imposed_spec, node=True, body=False):
-        imposed_constraints = self.spec_clauses(imposed_spec, body=body)
-        for pred in imposed_constraints:
-            # imposed "node"-like conditions are no-ops
-            if not node and pred.args[0] in ("node", "virtual_node"):
-                continue
-            self.gen.fact(fn.imposed_constraint(condition_id, *pred.args))
-
     def package_provider_rules(self, pkg):
         for vpkg_name in pkg.provided_virtual_names():
             if vpkg_name not in self.possible_virtuals:
@@ -1660,7 +1647,7 @@ def track_dependencies(input_spec, requirements):
                     return requirements + [fn.attr("track_dependencies", input_spec.name)]
 
                 def dependency_holds(input_spec, requirements):
-                    return remove_node(input_spec, requirements) + [
+                    return requirements + [
                         fn.attr(
                             "dependency_holds", pkg.name, input_spec.name, dt.flag_to_string(t)
                         )
@@ -1719,12 +1706,10 @@ def package_splice_rules(self, pkg):
                 when_spec_attrs = [
                     fn.attr(c.args[0], splice_node, *(c.args[2:]))
                     for c in self.spec_clauses(cond, body=True, required_from=None)
-                    if c.args[0] != "node"
                 ]
                 splice_spec_hash_attrs = [
                     fn.hash_attr(hash_var, *(c.args))
                     for c in self.spec_clauses(spec_to_splice, body=True, required_from=None)
-                    if c.args[0] != "node"
                 ]
                 if match_variants is None:
                     variant_constraints = []
@@ -1846,10 +1831,6 @@ def emit_facts_from_requirement_rules(self, rules: List[RequirementRule]):
                     context.source = ConstraintOrigin.append_type_suffix(
                         pkg_name, ConstraintOrigin.REQUIRE
                     )
-                    if not virtual:
-                        context.transform_imposed = remove_node
-                    # else: for virtuals we want to emit "node" and
-                    # "virtual_node" in imposed specs
 
                     member_id = self.condition(
                         required_spec=when_spec,
@@ -2023,6 +2004,7 @@ def spec_clauses(
         self,
         spec: spack.spec.Spec,
         *,
+        node: bool = False,
         body: bool = False,
         transitive: bool = True,
         expand_hashes: bool = False,
@@ -2040,6 +2022,7 @@ def spec_clauses(
         try:
             clauses = self._spec_clauses(
                 spec,
+                node=node,
                 body=body,
                 transitive=transitive,
                 expand_hashes=expand_hashes,
@@ -2057,6 +2040,7 @@ def _spec_clauses(
         self,
         spec: spack.spec.Spec,
         *,
+        node: bool = False,
         body: bool = False,
         transitive: bool = True,
         expand_hashes: bool = False,
@@ -2067,6 +2051,7 @@ def _spec_clauses(
 
         Arguments:
             spec: the spec to analyze
+            node: if True, emit node(PackageName, ...) and virtual_node(PackageaName, ...) facts
             body: if True, generate clauses to be used in rule bodies (final values) instead
                 of rule heads (setters).
             transitive: if False, don't generate clauses from dependencies (default True)
@@ -2086,8 +2071,10 @@ def _spec_clauses(
 
         f: Union[Type[_Head], Type[_Body]] = _Body if body else _Head
 
-        if spec.name:
+        # only generate this if caller asked for node facts -- not needed for most conditions
+        if node and spec.name:
             clauses.append(f.node(spec.name) if not spec.virtual else f.virtual_node(spec.name))
+
         if spec.namespace:
             clauses.append(f.namespace(spec.name, spec.namespace))
 
@@ -2245,6 +2232,7 @@ def _spec_clauses(
                     clauses.extend(
                         self._spec_clauses(
                             dep,
+                            node=node,
                             body=body,
                             expand_hashes=expand_hashes,
                             concrete_build_deps=concrete_build_deps,
@@ -2888,7 +2876,7 @@ def literal_specs(self, specs):
                 effect_id = next(self._id_counter)
                 context = SourceContext()
                 context.source = "literal"
-                requirements = self.spec_clauses(spec, context=context)
+                requirements = self.spec_clauses(spec, context=context, node=True)
             root_name = spec.name
             for clause in requirements:
                 clause_name = clause.args[0]
@@ -3250,7 +3238,7 @@ def depends_on(
             for language in languages:
                 body_str += f'  attr("language", {node_variable}, "{language}")'
 
-        head_clauses = self._setup.spec_clauses(dependency_spec, body=False)
+        head_clauses = self._setup.spec_clauses(dependency_spec, body=False, node=True)
 
         runtime_pkg = dependency_spec.name
 

share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml

@@ -810,14 +810,6 @@ ml-darwin-aarch64-mps-build:
 
 .aws-pcluster-generate:
   image: { "name": "ghcr.io/spack/pcluster-amazonlinux-2:v2024-10-07", "entrypoint": [""] }
-  before_script:
-    # Use gcc from pre-installed spack store
-    - - . "./share/spack/setup-env.sh"
-      - . "/etc/profile.d/modules.sh"
-      - diff -q "/bootstrap/cloud_pipelines-config.yaml" "share/spack/gitlab/cloud_pipelines/configs/config.yaml" || echo "WARNING Install tree might have changed. You need to rebuild the pcluster-amazonlinux-2 container in spack/gitlab-runners."
-      - cp "share/spack/gitlab/cloud_pipelines/configs/config.yaml" "etc/spack/"
-      - /bin/bash "${SPACK_ROOT}/share/spack/gitlab/cloud_pipelines/scripts/pcluster/setup-pcluster.sh"
-      - rm "etc/spack/config.yaml"
 
 # X86_64_V4 (one pipeline per target)
 .aws-pcluster-x86_64_v4:
@@ -826,6 +818,10 @@ ml-darwin-aarch64-mps-build:
 
 aws-pcluster-generate-x86_64_v4:
   extends: [ ".linux_x86_64_v4", ".aws-pcluster-x86_64_v4", ".generate-base", ".tags-x86_64_v4", ".aws-pcluster-generate"]
+  before_script:
+    - - . "./share/spack/setup-env.sh"
+      # TODO: Move this to the container next time it is rebuilt
+      - export PATH=/home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/binutils-2.37-qvccg7zpskturysmr4bzbsfrx34kvazo/bin:$PATH
 
 aws-pcluster-build-x86_64_v4:
   extends: [ ".linux_x86_64_v4", ".aws-pcluster-x86_64_v4", ".build" ]
@@ -846,6 +842,10 @@ aws-pcluster-build-x86_64_v4:
 aws-pcluster-generate-neoverse_v1:
   # TODO: Use updated runner tags: https://github.com/spack/spack-infrastructure/pull/694/files
   extends: [ ".linux_neoverse_v1", ".aws-pcluster-neoverse_v1", ".generate-neoverse_v1", ".aws-pcluster-generate"]
+  before_script:
+    - - . "./share/spack/setup-env.sh"
+      # TODO: Move this to the container next time it is rebuilt
+      - export PATH=/home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/binutils-2.37-2yxz3xsjfmesxujxtlrgcctxlyilynmp/bin:$PATH
 
 aws-pcluster-build-neoverse_v1:
   extends: [  ".linux_neoverse_v1", ".aws-pcluster-neoverse_v1", ".build" ]

share/spack/gitlab/cloud_pipelines/scripts/pcluster/setup-pcluster.sh

@@ -1,112 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-set -e
-
-set_pcluster_defaults() {
-    # Set versions of pre-installed software in packages.yaml
-    [ -z "${SLURM_ROOT}" ] && ls /etc/systemd/system/slurm* &>/dev/null && \
-        SLURM_ROOT=$(dirname $(dirname "$(awk '/ExecStart=/ {print $1}' /etc/systemd/system/slurm* | sed -e 's?^.*=??1' | head -n1)"))
-    # Fallback to default location if SLURM not in systemd
-    [ -z "${SLURM_ROOT}" ] && [ -d "/opt/slurm" ] && SLURM_ROOT=/opt/slurm
-    [ -z "${SLURM_VERSION}" ] && SLURM_VERSION=$(strings "${SLURM_ROOT}"/lib/libslurm.so | grep -e '^VERSION' | awk '{print $2}' | sed -e 's?"??g')
-    [ -z "${LIBFABRIC_VERSION}" ] && LIBFABRIC_VERSION=$(awk '/Version:/{print $2}' "$(find /opt/amazon/efa/ -name libfabric.pc | head -n1)" | sed -e 's?~??g' -e 's?amzn.*??g')
-    export SLURM_ROOT SLURM_VERSION LIBFABRIC_VERSION
-
-    envsubst < "${SPACK_ROOT}/share/spack/gitlab/cloud_pipelines/stacks/${SPACK_CI_STACK_NAME}/packages.yaml" > "${SPACK_ROOT}"/etc/spack/packages.yaml
-}
-
-patch_compilers_yaml() {
-    # Graceful exit if package not found by spack
-    set -o pipefail
-    compilers_yaml="${SPACK_ROOT}/etc/spack/compilers.yaml"
-    [ -f "${compilers_yaml}" ] || {
-        echo "Cannot find ${compilers_yaml}, compiler setup might now be optimal."
-        return
-    }
-
-    # System ld is too old for amzn linux2
-    spack_gcc_version=$(spack find --format '{version}' gcc)
-    binutils_path=$(spack find -p binutils | awk '/binutils/ {print $2}' | head -n1)
-    if [ -d "${binutils_path}" ] && [ -n "${spack_gcc_version}" ]; then python3 <<EOF
-import yaml
-
-with open("${compilers_yaml}",'r') as f:
-    compilers=yaml.safe_load(f)
-
-for c in compilers["compilers"]:
-    if "arm" in c["compiler"]["spec"] or "intel" in c["compiler"]["spec"] or "oneapi" in c["compiler"]["spec"] \
-       or "${spack_gcc_version}" in c["compiler"]["spec"]:
-        compilers["compilers"][compilers["compilers"].index(c)]["compiler"]["environment"] = {"prepend_path":{"PATH":"${binutils_path}/bin"}}
-
-with open("${compilers_yaml}",'w') as f:
-    yaml.dump(compilers, f)
-EOF
-    fi
-    # Oneapi needs extra_rpath to gcc libstdc++.so.6
-    if [ "x86_64" == "$(arch)" ] && oneapi_gcc_version=$(spack find --format '{compiler}' intel-oneapi-compilers | sed -e 's/=//g') && \
-            [ -n "${oneapi_gcc_version}" ] && oneapi_gcc_path=$(spack find -p "${oneapi_gcc_version}" | grep "${oneapi_gcc_version}" | awk '{print $2}' | head -n1) && \
-            [ -d "${oneapi_gcc_path}" ]; then python3 <<EOF
-import yaml
-
-with open("${compilers_yaml}",'r') as f:
-    compilers=yaml.safe_load(f)
-
-for c in compilers["compilers"]:
-    if "oneapi" in c["compiler"]["spec"]:
-        compilers["compilers"][compilers["compilers"].index(c)]["compiler"]["extra_rpaths"] = ["${oneapi_gcc_path}/lib64"]
-
-with open("${compilers_yaml}",'w') as f:
-    yaml.dump(compilers, f)
-EOF
-    fi
-}
-
-install_compilers() {
-    # Install Intel compilers through a static spack version such that the compiler's hash does not change.
-    # The compilers needs to be in the same install tree as the rest of the software such that the path
-    # relocation works correctly. This holds the danger that this part will fail when the current spack gets
-    # incompatible with the one in $spack_intel_compiler_commit. Therefore, we make intel installations optional
-    # in packages.yaml files and add a fallback `%gcc` version for each application.
-    if [ -f "/bootstrap-compilers/spack/etc/spack/compilers.yaml" ]; then
-        # Running inside a gitlab CI container
-        # Intel and gcc@12 compiler are pre-installed and their location is known in 
-        cp /bootstrap-compilers/spack/etc/spack/compilers.yaml "${SPACK_ROOT}"/etc/spack/
-    else
-        spack compiler add --scope site
-        # We need to treat compilers as essentially external, i.e. their installation location
-        # (including hash) must not change when any changes are pushed to spack. The reason is that
-        # changes in the compilers are not reflected in the package hashes built in the CI. Hence, those
-        # packages will reference a wrong compiler path once the path changes.
-
-        # `gcc@12.4.0%gcc@7.3.1` is created as part of building the pipeline containers.
-        # `ghcr.io/spack/pcluster-amazonlinux-2:v2024-10-07` produced the following hashes.
-        if [ "x86_64" == "$(arch)" ]; then
-            gcc_hash="pttzchh7o54nhmycj4wgzw5mic6rk2nb"
-        else
-            gcc_hash="v6wxye6ijzrxnzxftcwnpu3psohsjl2b"
-        fi
-
-        spack install /${gcc_hash}
-        (
-            spack load gcc
-            spack compiler add --scope site
-        )
-
-        if [ "x86_64" == "$(arch)" ]; then
-            # 2024.1.0 is the last oneapi compiler that works on AL2 and is the one used to compile packages in the build cache.
-            spack install intel-oneapi-compilers@2024.1.0
-            (
-                . "$(spack location -i intel-oneapi-compilers)"/setvars.sh; spack compiler add --scope site \
-                    || true
-            )
-        fi
-    fi
-}
-
-set_pcluster_defaults
-install_compilers
-patch_compilers_yaml

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/packages.yaml

@@ -1,67 +0,0 @@
----  # Neoverse N1 / V1 packages
-packages:
-  acfl:
-    require:
-      - one_of: ["%gcc target=aarch64"]
-        message: "Clang based compilers need GCC libraries and they should be made available for the wide range of CPUs they actually support.
-                Edit $SPACK_ROOT/etc/spack/packages.yaml to change this default."
-  gromacs:
-    require:
-      - one_of:
-          - "gromacs@2024.3 %arm ^fftw ^openmpi"
-          - "gromacs@2024.3 %gcc ^armpl-gcc ^openmpi"
-  libfabric:
-    buildable: true
-    externals:
-      - prefix: /opt/amazon/efa/
-        spec: libfabric@${LIBFABRIC_VERSION}
-    require: ['fabrics=shm,efa']
-  llvm:
-    variants: ~lldb
-  mpas-model:
-    require:
-      - one_of:
-          - "precision=single make_target=llvm %arm ^parallelio+pnetcdf"
-          - "precision=single %gcc ^parallelio+pnetcdf"
-  mpich:
-    require: "mpich pmi=pmi2 device=ch4 netmod=ofi +slurm"
-  nvhpc:
-    require:
-      - one_of:
-          - "nvhpc %gcc target=aarch64"
-        message: "NVHPC should be built with GCC and should be made available for the wide range of CPUs they actually support.
-                Edit $SPACK_ROOT/etc/spack/packages.yaml to change this default."
-  openfoam:
-    require: "openfoam %gcc ^scotch@6.0.9"
-  openmpi:
-    variants: ~atomics ~cuda ~cxx ~cxx_exceptions ~internal-hwloc ~java +legacylaunchers ~lustre ~memchecker +pmi +romio ~singularity +vt +wrapper-rpath fabrics=ofi schedulers=slurm
-    require: '@4:'
-  # Palace does not build correctly with armpl until https://github.com/awslabs/palace/pull/207 is merged into a version.
-  # palace:
-  #   require:
-  #     - one_of: ["palace cxxflags=\"-include cstdint\" ^fmt@9.1.0"]
-  pmix:
-    require: "pmix@3:"
-  quantum-espresso:
-    require: "quantum-espresso@6.6 %gcc ^armpl-gcc"
-  slurm:
-    buildable: false
-    externals:
-      - prefix: ${SLURM_ROOT}
-        spec: slurm@${SLURM_VERSION} +pmix
-  wrf:
-    require:
-      - one_of:
-          - "wrf%arm"
-          - "wrf%gcc"
-  all:
-    compiler: [gcc, arm, nvhpc, clang]
-    providers:
-      blas: [armpl-gcc, openblas]
-      fftw-api: [armpl-gcc, fftw]
-      lapack: [armpl-gcc, openblas]
-      mpi: [openmpi, mpich]
-      scalapack: [netlib-scalapack]
-    permissions:
-      read: world
-      write: user

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml

@@ -28,10 +28,7 @@ spack:
           - . /etc/profile.d/modules.sh
           - spack --version
           - spack arch
-        # Use gcc from pre-installed spack store
-        - - cp share/spack/gitlab/cloud_pipelines/configs/config.yaml etc/spack/
-          - /bin/bash "${SPACK_ROOT}/share/spack/gitlab/cloud_pipelines/scripts/pcluster/setup-pcluster.sh"
-          - rm etc/spack/config.yaml
+          - export PATH=/home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/binutils-2.37-2yxz3xsjfmesxujxtlrgcctxlyilynmp/bin:$PATH
     - signing-job:
         before_script:
           # Do not distribute Intel & ARM binaries
@@ -40,3 +37,98 @@ spack:
 
   cdash:
     build-group: AWS Packages
+
+  compilers:
+  - compiler:
+      environment: {}
+      extra_rpaths: []
+      flags: {}
+      modules: []
+      operating_system: amzn2
+      paths:
+        cc: /usr/bin/gcc
+        cxx: /usr/bin/g++
+        f77: /usr/bin/gfortran
+        fc: /usr/bin/gfortran
+      spec: gcc@=7.3.1
+      target: aarch64
+  - compiler:
+      environment: {}
+      extra_rpaths: []
+      flags: {}
+      modules: []
+      operating_system: amzn2
+      paths:
+        cc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gcc
+        cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/g++
+        f77: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gfortran
+        fc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gfortran
+      spec: gcc@=12.4.0
+      target: aarch64
+
+  packages:
+    acfl:
+      require:
+        - one_of: ["%gcc target=aarch64"]
+          message: "Clang based compilers need GCC libraries and they should be made available for the wide range of CPUs they actually support.
+                  Edit $SPACK_ROOT/etc/spack/packages.yaml to change this default."
+    gromacs:
+      require:
+        - one_of:
+            - "gromacs@2024.3 %arm ^fftw ^openmpi"
+            - "gromacs@2024.3 %gcc ^armpl-gcc ^openmpi"
+    libfabric:
+      buildable: true
+      externals:
+        - prefix: /opt/amazon/efa/
+          spec: libfabric@1.17.0
+      require: ['fabrics=shm,efa']
+    llvm:
+      variants: ~lldb
+    mpas-model:
+      require:
+        - one_of:
+            - "precision=single make_target=llvm %arm ^parallelio+pnetcdf"
+            - "precision=single %gcc ^parallelio+pnetcdf"
+    mpich:
+      require: "mpich pmi=pmi2 device=ch4 netmod=ofi +slurm"
+    nvhpc:
+      require:
+        - one_of:
+            - "nvhpc %gcc target=aarch64"
+          message: "NVHPC should be built with GCC and should be made available for the wide range of CPUs they actually support.
+                  Edit $SPACK_ROOT/etc/spack/packages.yaml to change this default."
+    openfoam:
+      require: "openfoam %gcc ^scotch@6.0.9"
+    openmpi:
+      variants: ~atomics ~cuda ~cxx ~cxx_exceptions ~internal-hwloc ~java +legacylaunchers ~lustre ~memchecker +pmi +romio ~singularity +vt +wrapper-rpath fabrics=ofi schedulers=slurm
+      require: '@4:'
+    # Palace does not build correctly with armpl until https://github.com/awslabs/palace/pull/207 is merged into a version.
+    # palace:
+    #   require:
+    #     - one_of: ["palace cxxflags=\"-include cstdint\" ^fmt@9.1.0"]
+    pmix:
+      require: "pmix@3:"
+    quantum-espresso:
+      require: "quantum-espresso@6.6 %gcc ^armpl-gcc"
+    slurm:
+      buildable: false
+      externals:
+        - prefix: /opt/slurm
+          spec: slurm@22.05.8 +pmix
+    wrf:
+      require:
+        - one_of:
+            - "wrf%arm"
+            - "wrf%gcc"
+    all:
+      compiler: [gcc, arm, nvhpc, clang]
+      providers:
+        blas: [armpl-gcc, openblas]
+        fftw-api: [armpl-gcc, fftw]
+        lapack: [armpl-gcc, openblas]
+        mpi: [openmpi, mpich]
+        scalapack: [netlib-scalapack]
+      permissions:
+        read: world
+        write: user

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/packages.yaml

@@ -1,143 +0,0 @@
----  # x86_64_v4 packages (ice/skylake) & x86_64_v3 packages (zen2/3)
-packages:
-  cpio:
-    require:
-      - one_of:
-          - "cflags=-std=c18 target=x86_64_v4"
-          - "cflags=-std=c18 target=x86_64_v3"
-        when: "%intel"
-  gettext:
-    # Newer gettext cannot build with gcc@12 and old AL2 glibc headers
-    # Older gettext versions do not build correctly with oneapi.
-    require:
-      - one_of:
-          - '@:0.20'
-          - '%oneapi'
-  gromacs:
-    require:
-      - one_of:
-          - "+intel_provided_gcc ^intel-oneapi-mkl target=x86_64_v4"
-          - "+intel_provided_gcc ^intel-oneapi-mkl target=x86_64_v3"
-        when: "%intel"
-      - one_of:
-          - "+intel_provided_gcc target=x86_64_v4 ^intel-oneapi-mkl"
-          - "+intel_provided_gcc target=x86_64_v3 ^intel-oneapi-mkl"
-        when: "%oneapi"
-  intel-oneapi-compilers:
-    require: "intel-oneapi-compilers %gcc target=x86_64_v3"
-  intel-oneapi-mpi:
-    variants: +external-libfabric generic-names=True
-  lammps:
-    require:
-      - one_of:
-          - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package +intel fft=mkl ^intel-oneapi-mkl target=x86_64_v4"
-          - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package fft=mkl ^intel-oneapi-mkl target=x86_64_v3"
-        when: "%intel"
-      - one_of:
-          - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package +intel fft=mkl ^intel-oneapi-mkl target=x86_64_v4"
-          - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package fft=mkl ^intel-oneapi-mkl target=x86_64_v3"
-        when: "%oneapi"
-  libidn2:
-    require:
-      - one_of:
-          - "cflags=-std=c18 target=x86_64_v4"
-          - "cflags=-std=c18 target=x86_64_v3"
-        when: "%intel"
-  libfabric:
-    buildable: true
-    externals:
-      - prefix: /opt/amazon/efa/
-        spec: libfabric@${LIBFABRIC_VERSION}
-    require: ['fabrics=shm,efa']
-  libunistring:
-    require:
-      - one_of:
-          - "cflags=-std=c18 target=x86_64_v4"
-          - "cflags=-std=c18 target=x86_64_v3"
-        when: "%intel"
-  mpas-model:
-    require:
-      - one_of:
-          - "precision=single ^parallelio+pnetcdf target=x86_64_v4"
-          - "precision=single ^parallelio+pnetcdf target=x86_64_v3"
-        when: "%intel"
-      - one_of:
-          - "precision=single ^parallelio+pnetcdf target=x86_64_v4"
-          - "precision=single ^parallelio+pnetcdf target=x86_64_v3"
-        when: "%oneapi"
-  mpich:
-    require:
-      - one_of:
-          - "mpich pmi=pmi2 device=ch4 netmod=ofi +slurm target=x86_64_v4"
-          - "mpich pmi=pmi2 device=ch4 netmod=ofi +slurm target=x86_64_v3"
-  openfoam:
-    require:
-      - one_of:
-          - "openfoam %gcc ^scotch@6.0.9 target=x86_64_v4"
-          - "openfoam %gcc ^scotch@6.0.9 target=x86_64_v3"
-  openmpi:
-    variants: ~atomics ~cuda ~cxx ~cxx_exceptions ~internal-hwloc ~java +legacylaunchers ~lustre ~memchecker +pmi +romio ~singularity +vt +wrapper-rpath fabrics=ofi schedulers=slurm
-    require:
-      - one_of:
-          - "openmpi @4: target=x86_64_v4"
-          - "openmpi @4: target=x86_64_v3"
-  palace:
-    require:
-      - one_of:
-          - "palace ^fmt@9.1.0 target=x86_64_v4"
-          - "palace ^fmt@9.1.0 target=x86_64_v3"
-        when: "%oneapi"
-      - one_of:
-          - "palace ^fmt@9.1.0"
-        when: "%gcc"
-  pmix:
-    require:
-      - one_of:
-          - "pmix@3: target=x86_64_v4"
-          - "pmix@3: target=x86_64_v3"
-  quantum-espresso:
-    require:
-      - one_of:
-          - "quantum-espresso@6.6 ^intel-oneapi-mkl+cluster target=x86_64_v4"
-          - "quantum-espresso@6.6 ^intel-oneapi-mkl+cluster target=x86_64_v3"
-        when: "%intel"
-      - one_of:
-          - "quantum-espresso@6.6 ^intel-oneapi-mkl+cluster target=x86_64_v4"
-          - "quantum-espresso@6.6 ^intel-oneapi-mkl+cluster target=x86_64_v3"
-        when: "%oneapi"
-  slurm:
-    buildable: false
-    externals:
-      - prefix: ${SLURM_ROOT}
-        spec: slurm@${SLURM_VERSION} +pmix
-  wrf:
-    require:
-      - one_of:
-          - "wrf@4 build_type=dm+sm target=x86_64_v4"
-          - "wrf@4 build_type=dm+sm target=x86_64_v3"
-          - "wrf@4.2.2 +netcdf_classic fflags=\"-fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common\" build_type=dm+sm target=x86_64_v3"
-        when: "%intel"
-      - one_of:
-          - "wrf@4 build_type=dm+sm target=x86_64_v4"
-          - "wrf@4 build_type=dm+sm target=x86_64_v3"
-          - "wrf@4.2.2 +netcdf_classic fflags=\"-fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common\" build_type=dm+sm target=x86_64_v3"
-        when: "%oneapi"
-
-  all:
-    compiler: [oneapi, gcc]
-    permissions:
-      read: world
-      write: user
-    providers:
-      blas: [intel-oneapi-mkl]
-      daal: [intel-oneapi-dal]
-      fftw-api: [intel-oneapi-mkl]
-      ipp: [intel-oneapi-ipp]
-      lapack: [intel-oneapi-mkl]
-      mkl: [intel-oneapi-mkl]
-      mpi: [intel-oneapi-mpi, openmpi, mpich]
-      tbb: [intel-oneapi-tbb, intel-tbb]
-      scalapack: [intel-oneapi-mkl]
-
-
-

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml

@@ -31,10 +31,7 @@ spack:
           - . /etc/profile.d/modules.sh
           - spack --version
           - spack arch
-        # Use gcc from pre-installed spack store
-        - - cp share/spack/gitlab/cloud_pipelines/configs/config.yaml etc/spack/
-          - /bin/bash "${SPACK_ROOT}/share/spack/gitlab/cloud_pipelines/scripts/pcluster/setup-pcluster.sh"
-          - rm etc/spack/config.yaml
+          - export PATH=/home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/binutils-2.37-qvccg7zpskturysmr4bzbsfrx34kvazo/bin:$PATH
     - signing-job:
         before_script:
           # Do not distribute Intel & ARM binaries
@@ -43,3 +40,172 @@ spack:
 
   cdash:
     build-group: AWS Packages
+
+  compilers:
+  - compiler:
+      environment: {}
+      extra_rpaths: []
+      flags: {}
+      modules: []
+      operating_system: amzn2
+      paths:
+        cc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gcc
+        cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/g++
+        f77: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gfortran
+        fc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gfortran
+      spec: gcc@=12.4.0
+      target: x86_64
+  - compiler:
+      environment: {}
+      extra_rpaths:
+      - /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/lib64
+      flags: {}
+      modules: []
+      operating_system: amzn2
+      paths:
+        cc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/icx
+        cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/icpx
+        f77: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/ifx
+        fc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/ifx
+      spec: oneapi@=2024.1.0
+      target: x86_64
+
+  packages:
+    cpio:
+      require:
+        - one_of:
+            - "cflags=-std=c18 target=x86_64_v4"
+            - "cflags=-std=c18 target=x86_64_v3"
+          when: "%intel"
+    gettext:
+      # Newer gettext cannot build with gcc@12 and old AL2 glibc headers
+      # Older gettext versions do not build correctly with oneapi.
+      require:
+        - one_of:
+            - '@:0.20'
+            - '%oneapi'
+    gromacs:
+      require:
+        - one_of:
+            - "+intel_provided_gcc ^intel-oneapi-mkl target=x86_64_v4"
+            - "+intel_provided_gcc ^intel-oneapi-mkl target=x86_64_v3"
+          when: "%intel"
+        - one_of:
+            - "+intel_provided_gcc target=x86_64_v4 ^intel-oneapi-mkl"
+            - "+intel_provided_gcc target=x86_64_v3 ^intel-oneapi-mkl"
+          when: "%oneapi"
+    intel-oneapi-compilers:
+      require: "intel-oneapi-compilers %gcc target=x86_64_v3"
+    intel-oneapi-mpi:
+      variants: +external-libfabric generic-names=True
+    lammps:
+      require:
+        - one_of:
+            - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package +intel fft=mkl ^intel-oneapi-mkl target=x86_64_v4"
+            - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package fft=mkl ^intel-oneapi-mkl target=x86_64_v3"
+          when: "%intel"
+        - one_of:
+            - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package +intel fft=mkl ^intel-oneapi-mkl target=x86_64_v4"
+            - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package fft=mkl ^intel-oneapi-mkl target=x86_64_v3"
+          when: "%oneapi"
+    libidn2:
+      require:
+        - one_of:
+            - "cflags=-std=c18 target=x86_64_v4"
+            - "cflags=-std=c18 target=x86_64_v3"
+          when: "%intel"
+    libfabric:
+      buildable: true
+      externals:
+        - prefix: /opt/amazon/efa/
+          spec: libfabric@1.17.0
+      require: ['fabrics=shm,efa']
+    libunistring:
+      require:
+        - one_of:
+            - "cflags=-std=c18 target=x86_64_v4"
+            - "cflags=-std=c18 target=x86_64_v3"
+          when: "%intel"
+    mpas-model:
+      require:
+        - one_of:
+            - "precision=single ^parallelio+pnetcdf target=x86_64_v4"
+            - "precision=single ^parallelio+pnetcdf target=x86_64_v3"
+          when: "%intel"
+        - one_of:
+            - "precision=single ^parallelio+pnetcdf target=x86_64_v4"
+            - "precision=single ^parallelio+pnetcdf target=x86_64_v3"
+          when: "%oneapi"
+    mpich:
+      require:
+        - one_of:
+            - "mpich pmi=pmi2 device=ch4 netmod=ofi +slurm target=x86_64_v4"
+            - "mpich pmi=pmi2 device=ch4 netmod=ofi +slurm target=x86_64_v3"
+    openfoam:
+      require:
+        - one_of:
+            - "openfoam %gcc ^scotch@6.0.9 target=x86_64_v4"
+            - "openfoam %gcc ^scotch@6.0.9 target=x86_64_v3"
+    openmpi:
+      variants: ~atomics ~cuda ~cxx ~cxx_exceptions ~internal-hwloc ~java +legacylaunchers ~lustre ~memchecker +pmi +romio ~singularity +vt +wrapper-rpath fabrics=ofi schedulers=slurm
+      require:
+        - one_of:
+            - "openmpi @4: target=x86_64_v4"
+            - "openmpi @4: target=x86_64_v3"
+    palace:
+      require:
+        - one_of:
+            - "palace ^fmt@9.1.0 target=x86_64_v4"
+            - "palace ^fmt@9.1.0 target=x86_64_v3"
+          when: "%oneapi"
+        - one_of:
+            - "palace ^fmt@9.1.0"
+          when: "%gcc"
+    pmix:
+      require:
+        - one_of:
+            - "pmix@3: target=x86_64_v4"
+            - "pmix@3: target=x86_64_v3"
+    quantum-espresso:
+      require:
+        - one_of:
+            - "quantum-espresso@6.6 ^intel-oneapi-mkl+cluster target=x86_64_v4"
+            - "quantum-espresso@6.6 ^intel-oneapi-mkl+cluster target=x86_64_v3"
+          when: "%intel"
+        - one_of:
+            - "quantum-espresso@6.6 ^intel-oneapi-mkl+cluster target=x86_64_v4"
+            - "quantum-espresso@6.6 ^intel-oneapi-mkl+cluster target=x86_64_v3"
+          when: "%oneapi"
+    slurm:
+      buildable: false
+      externals:
+        - prefix: /opt/slurm
+          spec: slurm@22.05.8 +pmix
+    wrf:
+      require:
+        - one_of:
+            - "wrf@4 build_type=dm+sm target=x86_64_v4"
+            - "wrf@4 build_type=dm+sm target=x86_64_v3"
+            - "wrf@4.2.2 +netcdf_classic fflags=\"-fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common\" build_type=dm+sm target=x86_64_v3"
+          when: "%intel"
+        - one_of:
+            - "wrf@4 build_type=dm+sm target=x86_64_v4"
+            - "wrf@4 build_type=dm+sm target=x86_64_v3"
+            - "wrf@4.2.2 +netcdf_classic fflags=\"-fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common\" build_type=dm+sm target=x86_64_v3"
+          when: "%oneapi"
+
+    all:
+      compiler: [oneapi, gcc]
+      permissions:
+        read: world
+        write: user
+      providers:
+        blas: [intel-oneapi-mkl]
+        daal: [intel-oneapi-dal]
+        fftw-api: [intel-oneapi-mkl]
+        ipp: [intel-oneapi-ipp]
+        lapack: [intel-oneapi-mkl]
+        mkl: [intel-oneapi-mkl]
+        mpi: [intel-oneapi-mpi, openmpi, mpich]
+        tbb: [intel-oneapi-tbb, intel-tbb]
+        scalapack: [intel-oneapi-mkl]

share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml

@@ -207,6 +207,11 @@ spack:
       externals:
       - spec: rocm-core@6.2.1
         prefix: /opt/rocm-6.2.1
+    rocm-openmp-extras:
+      buildable: false
+      externals:
+      - spec: rocm-openmp-extras@6.2.1
+        prefix: /opt/rocm-6.2.1
 
   specs:
   # ROCM NOARCH
@@ -250,6 +255,7 @@ spack:
   # - chapel +rocm amdgpu_target=gfx908         # chapel: need chapel >= 2.2 to support ROCm >5.4
   # - cp2k +mpi +rocm amdgpu_target=gfx908      # cp2k: Error: KeyError: 'No spec with name rocm in... "-L{}".format(spec["rocm"].libs.directories[0]),
   # - exago +mpi +python +raja +hiop +rocm amdgpu_target=gfx908 ~ipopt cxxflags="-Wno-error=non-pod-varargs" ^hiop@1.0.0 ~sparse +mpi +raja +rocm amdgpu_target=gfx908 # raja: https://github.com/spack/spack/issues/44593
+  # - lammps +rocm amdgpu_target=gfx908         # lammps: KeyError: 'No spec with name llvm-amdgpu in rocm-openmp-extras@6.2.1/xafvl6rnd3tjagjvezszdz6itqzcl3zj'
   # - lbann ~cuda +rocm amdgpu_target=gfx908    # aluminum: https://github.com/spack/spack/issues/38807
   # - papi +rocm amdgpu_target=gfx908           # papi: https://github.com/spack/spack/issues/27898
   # - petsc +rocm amdgpu_target=gfx908          # petsc: https://github.com/spack/spack/issues/44600
@@ -294,6 +300,7 @@ spack:
   # - chapel +rocm amdgpu_target=gfx9a          # chapel: need chapel >= 2.2 to support ROCm >5.4
   # - cp2k +mpi +rocm amdgpu_target=gfx90a      # cp2k: Error: KeyError: 'No spec with name rocm in... "-L{}".format(spec["rocm"].libs.directories[0]),
   # - exago +mpi +python +raja +hiop +rocm amdgpu_target=gfx90a ~ipopt cxxflags="-Wno-error=non-pod-varargs" ^hiop@1.0.0 ~sparse +mpi +raja +rocm amdgpu_target=gfx90a # raja: https://github.com/spack/spack/issues/44593
+  # - lammps +rocm amdgpu_target=gfx90a         # lammps: KeyError: 'No spec with name llvm-amdgpu in rocm-openmp-extras@6.2.1/xafvl6rnd3tjagjvezszdz6itqzcl3zj'
   # - lbann ~cuda +rocm amdgpu_target=gfx90a    # aluminum: https://github.com/spack/spack/issues/38807
   # - papi +rocm amdgpu_target=gfx90a           # papi: https://github.com/spack/spack/issues/27898
   # - petsc +rocm amdgpu_target=gfx90a          # petsc: https://github.com/spack/spack/issues/44600

share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml

@@ -327,6 +327,7 @@ spack:
   - heffte +rocm amdgpu_target=gfx90a
   - hpx +rocm amdgpu_target=gfx90a
   - hypre +rocm amdgpu_target=gfx90a
+  - lammps +rocm amdgpu_target=gfx90a
   - magma ~cuda +rocm amdgpu_target=gfx90a
   - mfem +rocm amdgpu_target=gfx90a
   - raja ~openmp +rocm amdgpu_target=gfx90a

var/spack/repos/builtin/packages/celeritas/package.py

@@ -96,6 +96,16 @@ class Celeritas(CMakePackage, CudaPackage, ROCmPackage):
     conflicts("+rocm", when="+cuda", msg="AMD and NVIDIA accelerators are incompatible")
     conflicts("+rocm", when="+vecgeom", msg="HIP support is only available with ORANGE")
 
+    # geant4@11.3.0 now returns const G4Element::GetElementTable()
+    patch(
+        "https://github.com/celeritas-project/celeritas/commit/3c8ed9614fc695fba35e8a058bedb7bc1556f71c.patch?full_index=1",
+        sha256="1161c4f1166860d35d2a3f103236a63acd6a35aee2d2c27561cb929941d1c170",
+        when="@0.5.0 +geant4 ^geant4@11.3.0:",
+    )
+    conflicts(
+        "^geant4@11.3.0:", when="@:0.4 +geant4", msg="geant4@11.3.0: requires at least 0.5.0"
+    )
+
     def cmake_args(self):
         define = self.define
         from_variant = self.define_from_variant