Skip to content

Commit

Permalink
Various fixes to the manifest (#422)
Browse files Browse the repository at this point in the history
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
rapidsai/ucxx#257
- cuml depends on cuvs as of rapidsai/cuml#6085
- cugraph does not depend on cugraph-ops as of
rapidsai/cugraph#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 <[email protected]>
Co-authored-by: Bradley Dice <[email protected]>
  • Loading branch information
3 people authored Dec 2, 2024
1 parent 86a01f7 commit 0acd9ac
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion features/src/rapids-build-utils/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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}
Expand All @@ -142,15 +139,15 @@ repos:
cpp:
- name: cumlprims_mg
sub_dir: cpp
depends: [raft]
depends: [rmm, raft]

- name: cuml
path: cuml
git: {<<: *git_defaults, repo: cuml}
cpp:
- name: cuml
sub_dir: cpp
depends: [cumlprims_mg]
depends: [rmm, raft, cumlprims_mg, cuvs]
parallelism:
max_device_obj_memory_usage: 3Gi
python:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0acd9ac

Please sign in to comment.