From 0acd9acc6be2184de036a203ea2026784a8980ca Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Mon, 2 Dec 2024 15:16:29 -0800
Subject: [PATCH] Various fixes to the manifest (#422)

This PR fixes a number of issues in the manifest:
- cudf's dependency on rmm was accidentally removed in #221. Since rmm
is header-only I guess nobody noticed the issue since it doesn't
increase build times and only shows up if you attempt to make local
changes to rmm and test them in cudf.
- UCXX_ENABLE_PYTHON was removed in
https://github.com/rapidsai/ucxx/pull/257
- cuml depends on cuvs as of https://github.com/rapidsai/cuml/pull/6085
- cugraph does not depend on cugraph-ops as of
https://github.com/rapidsai/cugraph/pull/4744
- Many packages were relying on transitively getting rmm or raft as
dependencies, which causes problems when the intermediate dependency is
removed. Extra `-D<package_name>_ROOT` variables in the CMake configure
don't cause any problems so I made everything explicit.

---------

Co-authored-by: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Co-authored-by: Bradley Dice <bdice@bradleydice.com>
---
 .../rapids-build-utils/devcontainer-feature.json  |  2 +-
 .../opt/rapids-build-utils/manifest.yaml          | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index a834d3b2..3de0e265 100644
--- a/features/src/rapids-build-utils/devcontainer-feature.json
+++ b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "25.2.2",
+  "version": "25.2.3",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index 8daf14fc..8cf85b58 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -33,10 +33,7 @@ repos:
     - name: ucxx
       sub_dir: cpp
       depends: [rmm]
-      args:
-        cmake: |
-          -DUCXX_ENABLE_PYTHON=ON
-          -DUCXX_ENABLE_RMM=ON
+      args: {cmake: -DUCXX_ENABLE_RMM=ON}
   python:
     - name: ucxx
       sub_dir: python/ucxx
@@ -69,7 +66,7 @@ repos:
   cpp:
     - name: cudf
       sub_dir: cpp
-      depends: [kvikio]
+      depends: [rmm, kvikio]
     - name: cudf_kafka
       sub_dir: cpp/libcudf_kafka
       depends: [cudf]
@@ -126,7 +123,7 @@ repos:
   cpp:
     - name: cuvs
       sub_dir: cpp
-      depends: [raft]
+      depends: [rmm, raft]
       parallelism:
         max_device_obj_memory_usage: 3Gi
       args: {cmake: -DBUILD_C_LIBRARY=ON}
@@ -142,7 +139,7 @@ repos:
   cpp:
     - name: cumlprims_mg
       sub_dir: cpp
-      depends: [raft]
+      depends: [rmm, raft]
 
 - name: cuml
   path: cuml
@@ -150,7 +147,7 @@ repos:
   cpp:
     - name: cuml
       sub_dir: cpp
-      depends: [cumlprims_mg]
+      depends: [rmm, raft, cumlprims_mg, cuvs]
       parallelism:
         max_device_obj_memory_usage: 3Gi
   python:
@@ -193,7 +190,7 @@ repos:
   cpp:
     - name: cugraph
       sub_dir: cpp
-      depends: [cugraph-ops]
+      depends: [rmm, raft]
       parallelism:
         max_device_obj_memory_usage: 6Gi
     - name: cugraph_etl