From 02859c0a072955bd7e5478371edf153073e3cf48 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 16 Jan 2025 10:25:41 -0600 Subject: [PATCH 1/2] add libraft wheels --- .../src/rapids-build-utils/devcontainer-feature.json | 2 +- .../opt/rapids-build-utils/manifest.yaml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index ba55907f5..0de7339f0 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.4", + "version": "25.2.5", "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 8cf85b588..bfd8f6419 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 @@ -99,7 +99,8 @@ repos: - name: raft path: raft - git: {<<: *git_defaults, repo: raft} + # TODO(jameslamb): revert this before merging + git: {<<: *git_defaults, repo: raft, upstream: jameslamb, tag: libraft-wheels} cpp: - name: raft sub_dir: cpp @@ -108,14 +109,18 @@ repos: max_device_obj_memory_usage: 3Gi args: {cmake: -DRAFT_COMPILE_LIBRARY=ON} python: + - name: libraft + sub_dir: python/libraft + depends: [raft] + args: {install: *rapids_build_backend_args} - name: pylibraft sub_dir: python/pylibraft depends: [raft] - args: {cmake: -DFIND_RAFT_CPP=ON, install: *rapids_build_backend_args} + args: {install: *rapids_build_backend_args} - name: raft-dask sub_dir: python/raft-dask depends: [ucxx, raft] - args: {cmake: -DFIND_RAFT_CPP=ON, install: *rapids_build_backend_args} + args: {install: *rapids_build_backend_args} - name: cuvs path: cuvs From b570df0a837079af44a2399ebc88aa917f8ea11d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 16 Jan 2025 17:15:56 -0600 Subject: [PATCH 2/2] Revert testing changes. --- .../rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 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 bfd8f6419..d6113be3e 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 @@ -99,8 +99,7 @@ repos: - name: raft path: raft - # TODO(jameslamb): revert this before merging - git: {<<: *git_defaults, repo: raft, upstream: jameslamb, tag: libraft-wheels} + git: {<<: *git_defaults, repo: raft} cpp: - name: raft sub_dir: cpp