From 273293148f9e7dd855e42cb48c56dd040a2f9400 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Sat, 16 Nov 2024 16:10:22 +0000 Subject: [PATCH 1/8] Fix rmm dependency in cudf --- features/src/rapids-build-utils/devcontainer-feature.json | 2 +- .../src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index eebfe160..e99f0538 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.0", + "version": "25.2.1", "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 cc6baad1..87a6d7cc 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 @@ -69,7 +69,7 @@ repos: cpp: - name: cudf sub_dir: cpp - depends: [kvikio] + depends: [rmm, kvikio] - name: cudf_kafka sub_dir: cpp/libcudf_kafka depends: [cudf] From 8e21eb8cfb07cee820c776ebe9bc7373bd87ae5d Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Sun, 17 Nov 2024 00:19:08 +0000 Subject: [PATCH 2/8] Remove flag that was removed from ucxx --- .../rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 87a6d7cc..65cfb597 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 From 48b6150783d768569746c5993062c3706d93b1d6 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Sun, 17 Nov 2024 01:41:16 +0000 Subject: [PATCH 3/8] Make cuvs a dependency of cuml --- .../src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 65cfb597..26a3a145 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 @@ -147,7 +147,7 @@ repos: cpp: - name: cuml sub_dir: cpp - depends: [cumlprims_mg] + depends: [cumlprims_mg, cuvs] parallelism: max_device_obj_memory_usage: 3Gi python: From ffa197176f387af93e20099d61a3a6a0683152c5 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Mon, 18 Nov 2024 00:15:40 +0000 Subject: [PATCH 4/8] Remove cugraph-ops and add raft as a dependency of cugraph --- .../src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 26a3a145..2da16b37 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 @@ -205,7 +205,7 @@ repos: cpp: - name: cugraph sub_dir: cpp - depends: [cugraph-ops] + depends: [raft] parallelism: max_device_obj_memory_usage: 6Gi - name: cugraph_etl From 46837f81d8c7febaaf720905c8d993cd44d74d90 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Mon, 18 Nov 2024 00:19:22 +0000 Subject: [PATCH 5/8] Stop relying on transitive includes --- .../opt/rapids-build-utils/manifest.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 2da16b37..edeeec53 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 @@ -123,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} @@ -139,7 +139,7 @@ repos: cpp: - name: cumlprims_mg sub_dir: cpp - depends: [raft] + depends: [rmm, raft] - name: cuml path: cuml @@ -147,7 +147,7 @@ repos: cpp: - name: cuml sub_dir: cpp - depends: [cumlprims_mg, cuvs] + depends: [rmm, raft, cumlprims_mg, cuvs] parallelism: max_device_obj_memory_usage: 3Gi python: @@ -205,7 +205,7 @@ repos: cpp: - name: cugraph sub_dir: cpp - depends: [raft] + depends: [rmm, raft] parallelism: max_device_obj_memory_usage: 6Gi - name: cugraph_etl From e140cfff5a8dd7ee8283507d58a2a2911d70dddf Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 26 Nov 2024 08:26:41 -0600 Subject: [PATCH 6/8] Fix wholegraph to pylibwholegraph. --- .../src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ceae24f0..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 @@ -223,7 +223,7 @@ repos: args: cmake: -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}" python: - - name: wholegraph + - name: pylibwholegraph sub_dir: python/pylibwholegraph depends: [wholegraph] args: {install: *rapids_build_backend_args} From 021ab0a5ce57fbd0db62f4545b7041ec37ed37f0 Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:41:34 -0800 Subject: [PATCH 7/8] Update rapids-build-utils feature version --- features/src/rapids-build-utils/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index e99f0538..a834d3b2 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.1", + "version": "25.2.2", "description": "A feature to install the RAPIDS devcontainer build utilities", "containerEnv": { "BASH_ENV": "/etc/bash.bash_env" From 9b221caa0c0800924f3f212d8ff039510ce50df8 Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Tue, 26 Nov 2024 20:10:56 -0800 Subject: [PATCH 8/8] Update devcontainer-utils version --- features/src/rapids-build-utils/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"