Trying again

rapidsai · Jan 26, 2024 · 0d4333c · 0d4333c
1 parent ff3fddf
commit 0d4333c
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 1,581 deletions.
diff --git a/conda/recipes/libcuvs/meta.yaml b/conda/recipes/libcuvs/meta.yaml
@@ -159,8 +159,8 @@ outputs:
         - ninja
         - sysroot_{{ target_platform }} {{ sysroot_version }}
       host:
-        - {{ pin_compatible('libraft', exact=True) }}
-        - {{ pin_compatible('libcuvs', exact=True) }}
+        - libraft ={{ minor_version }}
+        - libcuvs ={{ minor_version }}
         - cuda-version ={{ cuda_version }}
         {% if cuda_major == "11" %}
         - cuda-profiler-api {{ cuda11_cuda_profiler_api_run_version }}
@@ -187,8 +187,8 @@ outputs:
         {% if cuda_major == "11" %}
         - cudatoolkit
         {% endif %}
-        - {{ pin_compatible('libraft', exact=True) }}
-        - {{ pin_compatible('libcuvs', exact=True) }}
+        - libraft ={{ minor_version }}
+        - libcuvs ={{ minor_version }}
         - gmock {{ gtest_version }}
         - gtest {{ gtest_version }}
     about:
@@ -220,8 +220,8 @@ outputs:
         - ninja
         - sysroot_{{ target_platform }} {{ sysroot_version }}
       host:
-        - {{ pin_compatible('libraft', exact=True) }}
-        - {{ pin_compatible('libcuvs', exact=True) }}
+        - libraft ={{ minor_version }}
+        - libcuvs ={{ minor_version }}
         - cuda-version ={{ cuda_version }}
         {% if cuda_major == "11" %}
         - cuda-profiler-api {{ cuda11_cuda_profiler_api_run_version }}
@@ -236,8 +236,8 @@ outputs:
         {% if cuda_major == "11" %}
         - cudatoolkit
         {% endif %}
-        - {{ pin_compatible('libraft', exact=True) }}
-        - {{ pin_compatible('libcuvs', exact=True) }}
+        - libraft ={{ minor_version }}
+        - libcuvs ={{ minor_version }}
     about:
       home: https://rapids.ai/
       license: Apache-2.0

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -373,16 +373,10 @@ rapids_export(
   NAMESPACE cuvs::
 )
 
-# ##################################################################################################
-# * shared test/bench headers ------------------------------------------------
-
-if(BUILD_TESTS OR BUILD_C_TESTS)
-  include(internal/CMakeLists.txt)
-endif()
-
 # ##################################################################################################
 # * build test executable ----------------------------------------------------
 
 if(BUILD_TESTS OR BUILD_C_TESTS)
+  include(internal/CMakeLists.txt)
   include(test/CMakeLists.txt)
 endif()
diff --git a/python/cuvs/CMakeLists.txt b/python/cuvs/CMakeLists.txt
@@ -21,10 +21,10 @@ set(cuvs_version 24.02.00)
 # We always need CUDA for cuvs because the cuvs dependency brings in a header-only cuco dependency
 # that enables CUDA unconditionally.
 include(rapids-cuda)
-rapids_cuda_init_architectures(cuvs)
+rapids_cuda_init_architectures(cuvs_py)
 
 project(
-  cuvs
+  cuvs_py
   VERSION ${cuvs_version}
   LANGUAGES # TODO: Building Python extension modules via the python_extension_module requires the C
             # language to be enabled here. The test project that is built in scikit-build to verify
@@ -67,17 +67,14 @@ if(NOT cuvs_FOUND)
 
   add_subdirectory(../../cpp cuvs-cpp ${_exclude_from_all})
 
-  # When building the C++ libraries from source we must copy libcuvs.so alongside the
-  # pairwise_distance and random Cython libraries TODO: when we have a single 'compiled' cuvs
-  # library, we shouldn't need this
-  set(cython_lib_dir cuvs)
+  # When building the C++ libraries from source we must copy libcuvs.so alongside the Cython
+  # libraries TODO: when we have a single 'compiled' cuvs library, we shouldn't need this
+  set(cython_lib_dir cuvs_py)
   install(TARGETS cuvs DESTINATION ${cython_lib_dir})
 endif()
 
 rapids_cython_init()
 
-add_subdirectory(cuvs/neighbors)
-
 if(DEFINED cython_lib_dir)
   rapids_cython_add_rpath_entries(TARGET cuvs PATHS "${cython_lib_dir}")
 endif()
diff --git a/python/cuvs/cuvs/neighbors/CMakeLists.txt b/python/cuvs/cuvs/neighbors/CMakeLists.txt
diff --git a/python/cuvs/cuvs/neighbors/__init__.pxd b/python/cuvs/cuvs/neighbors/__init__.pxd
diff --git a/python/cuvs/cuvs/neighbors/__init__.py b/python/cuvs/cuvs/neighbors/__init__.py
diff --git a/python/cuvs/cuvs/neighbors/cagra/CMakeLists.txt b/python/cuvs/cuvs/neighbors/cagra/CMakeLists.txt
diff --git a/python/cuvs/cuvs/neighbors/cagra/__init__.pxd b/python/cuvs/cuvs/neighbors/cagra/__init__.pxd
diff --git a/python/cuvs/cuvs/neighbors/cagra/__init__.py b/python/cuvs/cuvs/neighbors/cagra/__init__.py