From db4f8b29c931a2399ac7774633a6d1572eaefbc1 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 21 Jan 2025 16:15:10 -0600 Subject: [PATCH 1/3] add libcuvs Python builds --- .../src/rapids-build-utils/devcontainer-feature.json | 2 +- .../opt/rapids-build-utils/manifest.yaml | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index 4a279f0b0..b88079512 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.6", + "version": "25.2.7", "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 b0f5c6d13..fd0a68a86 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,8 @@ repos: - name: cuvs path: cuvs - git: {<<: *git_defaults, repo: cuvs} + # TODO(jameslamb): revert this before merging + git: {<<: *git_defaults, repo: cuvs, upstream: jameslamb, tag: libcuvs-wheels} cpp: - name: cuvs sub_dir: cpp @@ -132,10 +133,14 @@ repos: max_device_obj_memory_usage: 3Gi args: {cmake: -DBUILD_C_LIBRARY=ON} python: + - name: libcuvs + sub_dir: python/libcuvs + depends: [cuvs] + args: {install: *rapids_build_backend_args} - name: cuvs sub_dir: python/cuvs depends: [cuvs] - args: {cmake: -DFIND_CUVS_CPP=ON, install: *rapids_build_backend_args} + args: {install: *rapids_build_backend_args} - name: cumlprims_mg path: cumlprims_mg From 30cda08b594d9bea72c61282d55eb3c13a54538c Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 22 Jan 2025 08:48:21 -0600 Subject: [PATCH 2/3] fix indentation --- .../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 fd0a68a86..0dffc9f7d 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 @@ -133,7 +133,7 @@ repos: max_device_obj_memory_usage: 3Gi args: {cmake: -DBUILD_C_LIBRARY=ON} python: - - name: libcuvs + - name: libcuvs sub_dir: python/libcuvs depends: [cuvs] args: {install: *rapids_build_backend_args} From 80ededac873450493d1f6a099c1f15f8d4432b50 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 22 Jan 2025 17:14:59 -0600 Subject: [PATCH 3/3] Revert. Co-authored-by: James Lamb --- .../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 0dffc9f7d..821fcbf2c 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,8 +123,7 @@ repos: - name: cuvs path: cuvs - # TODO(jameslamb): revert this before merging - git: {<<: *git_defaults, repo: cuvs, upstream: jameslamb, tag: libcuvs-wheels} + git: {<<: *git_defaults, repo: cuvs} cpp: - name: cuvs sub_dir: cpp