From 2bda8e9f763fcc368b0f6c9ccccec716f9d56da8 Mon Sep 17 00:00:00 2001
From: Satish Balay <balay@mcs.anl.gov>
Date: Tue, 10 Dec 2024 09:12:33 -0600
Subject: [PATCH] add cub-api

---
 etc/spack/defaults/packages.yaml                 | 2 +-
 var/spack/repos/builtin/packages/camp/package.py | 2 +-
 var/spack/repos/builtin/packages/cub/package.py  | 2 ++
 var/spack/repos/builtin/packages/cuda/package.py | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml
index d52a035b0c3..b746a8f38dc 100644
--- a/etc/spack/defaults/packages.yaml
+++ b/etc/spack/defaults/packages.yaml
@@ -21,7 +21,7 @@ packages:
       armci: [armcimpi]
       blas: [openblas, amdblis]
       c: [gcc]
-      cub: [cub]
+      cub-api: [cub]
       cxx: [gcc]
       D: [ldc]
       daal: [intel-oneapi-daal]
diff --git a/var/spack/repos/builtin/packages/camp/package.py b/var/spack/repos/builtin/packages/camp/package.py
index 71327292e6a..a2e0e2ae3c8 100644
--- a/var/spack/repos/builtin/packages/camp/package.py
+++ b/var/spack/repos/builtin/packages/camp/package.py
@@ -63,7 +63,7 @@ class Camp(CMakePackage, CudaPackage, ROCmPackage):
     variant("omptarget", default=False, description="Build with OpenMP Target support")
     variant("sycl", default=False, description="Build with Sycl support")
 
-    depends_on("cub", when="+cuda")
+    depends_on("cub-api", when="+cuda")
 
     depends_on("blt", type="build")
     depends_on("blt@0.6.2:", type="build", when="@2024.02.1:")
diff --git a/var/spack/repos/builtin/packages/cub/package.py b/var/spack/repos/builtin/packages/cub/package.py
index c4f9d304e96..9a65d8e4071 100644
--- a/var/spack/repos/builtin/packages/cub/package.py
+++ b/var/spack/repos/builtin/packages/cub/package.py
@@ -42,6 +42,8 @@ class Cub(Package):
     version("1.7.1", sha256="50b8777b83093fdfdab429a61fccdbfbbb991b3bbc08385118e5ad58e8f62e1d")
     version("1.4.1", sha256="7c3784cf59f02d4a88099d6a11e357032bac9eac2b9c78aaec947d1270e21871")
 
+    provides("cub-api")
+
     def setup_dependent_build_environment(self, env, dependent_spec):
         env.set("CUB_DIR", self.prefix.include.cub.cmake)
 
diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py
index a08f68db9bf..2ca24d59223 100644
--- a/var/spack/repos/builtin/packages/cuda/package.py
+++ b/var/spack/repos/builtin/packages/cuda/package.py
@@ -741,7 +741,7 @@ class Cuda(Package):
         ["11.2.1", "1.10.0"],
         ["11.2.0", "1.10.0"],
     ]:
-        provides(f"cub@{cub_ver}", when=f"@{cuda_ver}")
+        provides(f"cub-api@{cub_ver}", when=f"@{cuda_ver}")
 
     @classmethod
     def determine_version(cls, exe):