Ignore provider weights for runtimes

Runtimes are inherently tied to the associated compilers,
and choices among runtimes should be delegated to the compiler
prioritization criteria not the provider weights. This fixes
a bug causing concretization to mix compilers more than necessary
to avoid using the runtime associated with the compiler specified
for the root. E.g. `foo%oneapi` building dependencies with `%gcc`
to minimize edges on which `intel-oneapi-runtime` provides
`fortran-rt`.

Signed-off-by: Gregory Becker <becker33@llnl.gov>

lib/spack/spack/repo.py

@@ -1406,8 +1406,6 @@ def create_repo(root, namespace=None, subdir=packages_dir_name):
             config.write(f"  namespace: '{namespace}'\n")
             if subdir != packages_dir_name:
                 config.write(f"  subdirectory: '{subdir}'\n")
-            x, y = spack.package_api_version
-            config.write(f"  api: v{x}.{y}\n")
 
     except OSError as e:
         # try to clean up.

lib/spack/spack/solver/concretize.lp

@@ -1682,10 +1682,11 @@ opt_criterion(45, "preferred providers (non-roots)").
 #minimize{ 0@245: #true }.
 #minimize{ 0@45: #true }.
 #minimize{
-    Weight@45+Priority,ProviderNode,Virtual
-    : provider_weight(ProviderNode, Virtual, Weight),
-      not attr("root", ProviderNode),
-      build_priority(ProviderNode, Priority)
+    Weight@45+Priority,X,Provider,Virtual
+    : provider_weight(node(X, Provider), Virtual, Weight),
+      not attr("root", node(X, Provider)),
+      build_priority(node(X, Provider), Priority),
+      not runtime(Provider)
 }.
 
 % Try to minimize the number of compiler mismatches in the DAG.

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

@@ -17,7 +17,7 @@ spack:
         tbb: [intel-tbb]
       variants: +mpi
     acts:
-      require: +alignment +analysis +dd4hep +edm4hep +examples +fatras +fatras_geant4 +geant4 +geomodel +hepmc3 +json +odd +onnx +podio +pythia8 +python +svg +tgeo cxxstd=20
+      require: +analysis +dd4hep +edm4hep +examples +fatras +geant4 +hepmc3 +podio +pythia8 +python ~svg +tgeo cxxstd=20
     celeritas:
       require: +geant4 +hepmc3 +root +shared cxxstd=20
     hip:
@@ -109,7 +109,7 @@ spack:
   - yoda +root
 
   # CUDA
-  - acts +cuda +traccc cuda_arch=80
+  #- acts +cuda +traccc cuda_arch=80
   #- celeritas +cuda ~openmp +vecgeom cuda_arch=80
   - root +cuda +cudnn +tmva-gpu
   - vecgeom +cuda cuda_arch=80

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

@@ -360,9 +360,7 @@ class Acts(CMakePackage, CudaPackage):
         depends_on("actsvg@0.4.35:", when="@28:")
         depends_on("actsvg@0.4.39:", when="@32:")
         depends_on("actsvg@0.4.40:", when="@32.1:")
-        depends_on(
-            "actsvg@0.4.51:", when="@37:"
-        )  # https://github.com/acts-project/actsvg/issues/94
+        depends_on("actsvg@0.4.50:", when="@37:")
     depends_on("acts-algebra-plugins @0.24:", when="+traccc")
     depends_on("autodiff @0.6:", when="@17: +autodiff")
     depends_on("autodiff @0.5.11:0.5.99", when="@1.2:16 +autodiff")

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

@@ -19,7 +19,6 @@ class Actsvg(CMakePackage):
 
     license("MPL-2.0")
 
-    version("0.4.51", sha256="937385f7703c0d2d9c0af03bd5083d3f1fdac17ff573476a5fc5b1f8e3cd98b7")
     version("0.4.50", sha256="c97fb1cc75cbf23caebd3c6fb8716354bdbd0a77ad39dc43dae963692f3256e1")
     version("0.4.48", sha256="0f230c31c64b939e4d311afd997dbaa87a375454cf1595661a449b97943412c9")
     version("0.4.47", sha256="11924fddbdd01f6337875797dc3a97b62be565688e678485e992bcfc9bfb142f")

var/spack/repos/builtin/packages/py-rpy2/package.py

@@ -61,8 +61,6 @@ class PyRpy2(PythonPackage):
 
     depends_on("py-backports-zoneinfo", type=("build", "run"), when="@3.5.17: ^python@:3.8")
 
-    depends_on("iconv", type=("link"))
-
     # These are from 2019 and predate the pyproject.toml config that currently exists
     with when("@3.0.0:3.0.4"):
         # Doesn't support post-distutil removal until 3.5.13

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

@@ -175,13 +175,6 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage):
         when="^hip@6.0",
     )
 
-    # Fix compilation issue reported by Intel from their new compiler version
-    patch(
-        "https://github.com/LLNL/RAJA/pull/1668.patch?full_index=1",
-        sha256="c0548fc5220f24082fb2592d5b4e8b7c8c783b87906d5f0950d53953d25161f6",
-        when="@2024.02.1:2024.02.99 %oneapi@2025:",
-    )
-
     variant("openmp", default=False, description="Build OpenMP backend")
     variant("shared", default=False, description="Build shared libs")
     variant("desul", default=False, description="Build desul atomics backend")