Skip to content

Update devcontainers to use cuda12.2#72

Merged
rapids-bot[bot] merged 3 commits into
NVIDIA:branch-24.06from
benfred:devcontainers_cuda12_2
Apr 9, 2024
Merged

Update devcontainers to use cuda12.2#72
rapids-bot[bot] merged 3 commits into
NVIDIA:branch-24.06from
benfred:devcontainers_cuda12_2

Conversation

@benfred

@benfred benfred commented Apr 8, 2024

Copy link
Copy Markdown
Contributor

No description provided.

@benfred benfred requested a review from a team as a code owner April 8, 2024 21:12
@benfred benfred added improvement Improves an existing functionality non-breaking Introduces a non-breaking change labels Apr 8, 2024
@trxcllnt

trxcllnt commented Apr 9, 2024

Copy link
Copy Markdown
Member

I believe for rapidsai/devcontainers#261 to pass, we need to also apply the following patch to the cuvs python CMake:

diff --git a/python/cuvs/CMakeLists.txt b/python/cuvs/CMakeLists.txt
index 36a6204..b2a6579 100644
--- a/python/cuvs/CMakeLists.txt
+++ b/python/cuvs/CMakeLists.txt
@@ -53,7 +53,7 @@ rapids_cpm_init()
 
 # If the user requested it we attempt to find CUVS.
 if(FIND_CUVS_CPP)
-  find_package(cuvs "${RAPIDS_VERSION}" REQUIRED)
+  find_package(cuvs "${RAPIDS_VERSION}" REQUIRED COMPONENTS c_api)
   include(../../cpp/cmake/thirdparty/get_dlpack.cmake)
 else()
   set(cuvs_FOUND OFF)
diff --git a/python/cuvs/cuvs/common/CMakeLists.txt b/python/cuvs/cuvs/common/CMakeLists.txt
index b477fdb..3de3805 100644
--- a/python/cuvs/cuvs/common/CMakeLists.txt
+++ b/python/cuvs/cuvs/common/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 # Set the list of Cython files to build
 set(cython_sources cydlpack.pyx exceptions.pyx)
-set(linked_libraries cuvs::cuvs cuvs_c)
+set(linked_libraries cuvs::cuvs cuvs::c_api)
 
 # Build all of the Cython targets
 rapids_cython_create_modules(
diff --git a/python/cuvs/cuvs/neighbors/cagra/CMakeLists.txt b/python/cuvs/cuvs/neighbors/cagra/CMakeLists.txt
index 377cfe7..87e6597 100644
--- a/python/cuvs/cuvs/neighbors/cagra/CMakeLists.txt
+++ b/python/cuvs/cuvs/neighbors/cagra/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 # Set the list of Cython files to build
 set(cython_sources cagra.pyx)
-set(linked_libraries cuvs::cuvs cuvs_c)
+set(linked_libraries cuvs::cuvs cuvs::c_api)
 
 # Build all of the Cython targets
 rapids_cython_create_modules(

@benfred benfred requested a review from a team as a code owner April 9, 2024 16:42
@AyodeAwe AyodeAwe requested a review from trxcllnt April 9, 2024 18:31
@benfred

benfred commented Apr 9, 2024

Copy link
Copy Markdown
Contributor Author

/merge

@rapids-bot rapids-bot Bot merged commit 36926d2 into NVIDIA:branch-24.06 Apr 9, 2024
AyodeAwe added a commit to AyodeAwe/cuvs that referenced this pull request Apr 10, 2024
@AyodeAwe AyodeAwe mentioned this pull request Apr 10, 2024
@benfred benfred deleted the devcontainers_cuda12_2 branch April 10, 2024 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CMake improvement Improves an existing functionality non-breaking Introduces a non-breaking change Python

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants