Revert "Merge branch 'integration-branch' into extend-c-api"

This reverts commit 6edcf93, reversing changes made to a245fd1.
rapidsai · Dec 10, 2024 · 311dd82 · 311dd82
1 parent 6edcf93
commit 311dd82
Show file tree

Hide file tree

Showing 34 changed files with 11 additions and 2,676 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -47,19 +47,6 @@ jobs:
       node_type: "gpu-v100-latest-1"
       run_script: "ci/build_rust.sh"
       sha: ${{ inputs.sha }}
-  go-build:
-    needs: cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: ${{ inputs.build_type || 'branch' }}
-      branch: ${{ inputs.branch }}
-      arch: "amd64"
-      date: ${{ inputs.date }}
-      container_image: "rapidsai/ci-conda:latest"
-      node_type: "gpu-v100-latest-1"
-      run_script: "ci/build_go.sh"
-      sha: ${{ inputs.sha }}
   python-build:
     needs: [cpp-build]
     secrets: inherit

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -21,7 +21,6 @@ jobs:
       - conda-python-tests
       - docs-build
       - rust-build
-      - go-build
       - wheel-build-cuvs
       - wheel-tests-cuvs
       - devcontainer
@@ -45,15 +44,13 @@ jobs:
           - '!notebooks/**'
           - '!python/**'
           - '!rust/**'
-          - '!go/**'
           - '!thirdparty/LICENSES/**'
         test_notebooks:
           - '**'
           - '!.devcontainer/**'
           - '!.pre-commit-config.yaml'
           - '!README.md'
           - '!rust/**'
-          - '!go/**'
           - '!thirdparty/LICENSES/**'
         test_python:
           - '**'
@@ -64,7 +61,6 @@ jobs:
           - '!img/**'
           - '!notebooks/**'
           - '!rust/**'
-          - '!go/**'
           - '!thirdparty/LICENSES/**'
   checks:
     secrets: inherit
@@ -126,16 +122,6 @@ jobs:
       arch: "amd64"
       container_image: "rapidsai/ci-conda:latest"
       run_script: "ci/build_rust.sh"
-  go-build:
-    needs: conda-cpp-build
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: pull-request
-      node_type: "gpu-v100-latest-1"
-      arch: "amd64"
-      container_image: "rapidsai/ci-conda:latest"
-      run_script: "ci/build_go.sh"
   wheel-build-cuvs:
     needs: checks
     secrets: inherit

diff --git a/build.sh b/build.sh
@@ -18,15 +18,14 @@ ARGS=$*
 # scripts, and that this script resides in the repo dir!
 REPODIR=$(cd $(dirname $0); pwd)
 
-VALIDARGS="clean libcuvs python rust go docs tests bench-ann examples --uninstall  -v -g -n --compile-static-lib --allgpuarch --no-mg --no-cpu --cpu-only --no-shared-libs --no-nvtx --show_depr_warn --incl-cache-stats --time -h"
+VALIDARGS="clean libcuvs python rust docs tests bench-ann examples --uninstall  -v -g -n --compile-static-lib --allgpuarch --no-mg --no-cpu --cpu-only --no-shared-libs --no-nvtx --show_depr_warn --incl-cache-stats --time -h"
 HELP="$0 [<target> ...] [<flag> ...] [--cmake-args=\"<args>\"] [--cache-tool=<tool>] [--limit-tests=<targets>] [--limit-bench-ann=<targets>] [--build-metrics=<filename>]
  where <target> is:
    clean            - remove all existing build artifacts and configuration (start over)
    libcuvs          - build the cuvs C++ code only. Also builds the C-wrapper library
                       around the C++ code.
    python           - build the cuvs Python package
    rust             - build the cuvs Rust bindings
-   go               - build the cuvs Go bindings
    docs             - build the documentation
    tests            - build the tests
    bench-ann        - build end-to-end ann benchmarks
@@ -452,13 +451,6 @@ if (( ${NUMARGS} == 0 )) || hasArg rust; then
     cargo test
 fi
 
-# Build the cuvs Go bindings
-if (( ${NUMARGS} == 0 )) || hasArg go; then
-    cd ${REPODIR}/go
-    go build ./...
-    go test ./...
-fi
-
 export RAPIDS_VERSION="$(sed -E -e 's/^([0-9]{2})\.([0-9]{2})\.([0-9]{2}).*$/\1.\2.\3/' "${REPODIR}/VERSION")"
 export RAPIDS_VERSION_MAJOR_MINOR="$(sed -E -e 's/^([0-9]{2})\.([0-9]{2})\.([0-9]{2}).*$/\1.\2/' "${REPODIR}/VERSION")"
 

diff --git a/ci/build_go.sh b/ci/build_go.sh
diff --git a/cpp/include/cuvs/neighbors/cagra.h b/cpp/include/cuvs/neighbors/cagra.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #include <cuvs/core/c_api.h>
-#include <cuvs/neighbors/common.h>
 #include <dlpack/dlpack.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -452,16 +451,13 @@ cuvsError_t cuvsCagraExtend(cuvsResources_t res,
  * @param[in] queries DLManagedTensor* queries dataset to search
  * @param[out] neighbors DLManagedTensor* output `k` neighbors for queries
  * @param[out] distances DLManagedTensor* output `k` distances for queries
- * @param[in] prefilter cuvsFilter input prefilter that can be used
-              to filter queries and neighbors based on the given bitset.
  */
 cuvsError_t cuvsCagraSearch(cuvsResources_t res,
                             cuvsCagraSearchParams_t params,
                             cuvsCagraIndex_t index,
                             DLManagedTensor* queries,
                             DLManagedTensor* neighbors,
-                            DLManagedTensor* distances,
-                            cuvsFilter filter);
+                            DLManagedTensor* distances);
 
 /**
  * @}

diff --git a/cpp/src/neighbors/cagra_c.cpp b/cpp/src/neighbors/cagra_c.cpp
@@ -28,7 +28,6 @@
 #include <cuvs/core/interop.hpp>
 #include <cuvs/neighbors/cagra.h>
 #include <cuvs/neighbors/cagra.hpp>
-#include <cuvs/neighbors/common.h>
 
 #include <fstream>
 
@@ -129,8 +128,7 @@ void _search(cuvsResources_t res,
              cuvsCagraIndex index,
              DLManagedTensor* queries_tensor,
              DLManagedTensor* neighbors_tensor,
-             DLManagedTensor* distances_tensor,
-             cuvsFilter filter)
+             DLManagedTensor* distances_tensor)
 {
   auto res_ptr   = reinterpret_cast<raft::resources*>(res);
   auto index_ptr = reinterpret_cast<cuvs::neighbors::cagra::index<T, uint32_t>*>(index.addr);
@@ -156,26 +154,8 @@ void _search(cuvsResources_t res,
   auto queries_mds            = cuvs::core::from_dlpack<queries_mdspan_type>(queries_tensor);
   auto neighbors_mds          = cuvs::core::from_dlpack<neighbors_mdspan_type>(neighbors_tensor);
   auto distances_mds          = cuvs::core::from_dlpack<distances_mdspan_type>(distances_tensor);
-  if (filter.type == NO_FILTER) {
-    cuvs::neighbors::cagra::search(
-      *res_ptr, search_params, *index_ptr, queries_mds, neighbors_mds, distances_mds);
-  } else if (filter.type == BITSET) {
-    using filter_mdspan_type    = raft::device_vector_view<std::uint32_t, int64_t, raft::row_major>;
-    auto removed_indices_tensor = reinterpret_cast<DLManagedTensor*>(filter.addr);
-    auto removed_indices = cuvs::core::from_dlpack<filter_mdspan_type>(removed_indices_tensor);
-    cuvs::core::bitset_view<std::uint32_t, int64_t> removed_indices_bitset(
-      removed_indices, index_ptr->dataset().extent(0));
-    auto bitset_filter_obj = cuvs::neighbors::filtering::bitset_filter(removed_indices_bitset);
-    cuvs::neighbors::cagra::search(*res_ptr,
-                                   search_params,
-                                   *index_ptr,
-                                   queries_mds,
-                                   neighbors_mds,
-                                   distances_mds,
-                                   bitset_filter_obj);
-  } else {
-    RAFT_FAIL("Unsupported filter type: BITMAP");
-  }
+  cuvs::neighbors::cagra::search(
+    *res_ptr, search_params, *index_ptr, queries_mds, neighbors_mds, distances_mds);
 }
 
 template <typename T>
@@ -294,8 +274,7 @@ extern "C" cuvsError_t cuvsCagraSearch(cuvsResources_t res,
                                        cuvsCagraIndex_t index_c_ptr,
                                        DLManagedTensor* queries_tensor,
                                        DLManagedTensor* neighbors_tensor,
-                                       DLManagedTensor* distances_tensor,
-                                       cuvsFilter filter)
+                                       DLManagedTensor* distances_tensor)
 {
   return cuvs::core::translate_exceptions([=] {
     auto queries   = queries_tensor->dl_tensor;
@@ -318,14 +297,11 @@ extern "C" cuvsError_t cuvsCagraSearch(cuvsResources_t res,
     RAFT_EXPECTS(queries.dtype.code == index.dtype.code, "type mismatch between index and queries");
 
     if (queries.dtype.code == kDLFloat && queries.dtype.bits == 32) {
-      _search<float>(
-        res, *params, index, queries_tensor, neighbors_tensor, distances_tensor, filter);
+      _search<float>(res, *params, index, queries_tensor, neighbors_tensor, distances_tensor);
     } else if (queries.dtype.code == kDLInt && queries.dtype.bits == 8) {
-      _search<int8_t>(
-        res, *params, index, queries_tensor, neighbors_tensor, distances_tensor, filter);
+      _search<int8_t>(res, *params, index, queries_tensor, neighbors_tensor, distances_tensor);
     } else if (queries.dtype.code == kDLUInt && queries.dtype.bits == 8) {
-      _search<uint8_t>(
-        res, *params, index, queries_tensor, neighbors_tensor, distances_tensor, filter);
+      _search<uint8_t>(res, *params, index, queries_tensor, neighbors_tensor, distances_tensor);
     } else {
       RAFT_FAIL("Unsupported queries DLtensor dtype: %d and bits: %d",
                 queries.dtype.code,

diff --git a/cpp/test/neighbors/ann_cagra_c.cu b/cpp/test/neighbors/ann_cagra_c.cu
@@ -46,14 +46,9 @@ float queries[4][2] = {{0.48216683, 0.0428398},
                        {0.51260436, 0.2643005},
                        {0.05198065, 0.5789965}};
 
-uint32_t filter[1] = {0b1001};  // index 1 and 2 are removed
-
 uint32_t neighbors_exp[4] = {3, 0, 3, 1};
 float distances_exp[4]    = {0.03878258, 0.12472608, 0.04776672, 0.15224178};
 
-uint32_t neighbors_exp_filtered[4] = {3, 0, 3, 0};
-float distances_exp_filtered[4]    = {0.03878258, 0.12472608, 0.04776672, 0.59063464};
-
 TEST(CagraC, BuildSearch)
 {
   // create cuvsResources_t
@@ -126,15 +121,10 @@ TEST(CagraC, BuildSearch)
   distances_tensor.dl_tensor.shape              = distances_shape;
   distances_tensor.dl_tensor.strides            = nullptr;
 
-  cuvsFilter filter;
-  filter.type = NO_FILTER;
-  filter.addr = (uintptr_t)NULL;
-
   // search index
   cuvsCagraSearchParams_t search_params;
   cuvsCagraSearchParamsCreate(&search_params);
-  cuvsCagraSearch(
-    res, search_params, index, &queries_tensor, &neighbors_tensor, &distances_tensor, filter);
+  cuvsCagraSearch(res, search_params, index, &queries_tensor, &neighbors_tensor, &distances_tensor);
 
   // verify output
   ASSERT_TRUE(
@@ -149,116 +139,6 @@ TEST(CagraC, BuildSearch)
   cuvsResourcesDestroy(res);
 }
 
-TEST(CagraC, BuildSearchFiltered)
-{
-  // create cuvsResources_t
-  cuvsResources_t res;
-  cuvsResourcesCreate(&res);
-  cudaStream_t stream;
-  cuvsStreamGet(res, &stream);
-
-  // create dataset DLTensor
-  DLManagedTensor dataset_tensor;
-  dataset_tensor.dl_tensor.data               = dataset;
-  dataset_tensor.dl_tensor.device.device_type = kDLCPU;
-  dataset_tensor.dl_tensor.ndim               = 2;
-  dataset_tensor.dl_tensor.dtype.code         = kDLFloat;
-  dataset_tensor.dl_tensor.dtype.bits         = 32;
-  dataset_tensor.dl_tensor.dtype.lanes        = 1;
-  int64_t dataset_shape[2]                    = {4, 2};
-  dataset_tensor.dl_tensor.shape              = dataset_shape;
-  dataset_tensor.dl_tensor.strides            = nullptr;
-
-  // create index
-  cuvsCagraIndex_t index;
-  cuvsCagraIndexCreate(&index);
-
-  // build index
-  cuvsCagraIndexParams_t build_params;
-  cuvsCagraIndexParamsCreate(&build_params);
-  cuvsCagraBuild(res, build_params, &dataset_tensor, index);
-
-  // create queries DLTensor
-  rmm::device_uvector<float> queries_d(4 * 2, stream);
-  raft::copy(queries_d.data(), (float*)queries, 4 * 2, stream);
-
-  DLManagedTensor queries_tensor;
-  queries_tensor.dl_tensor.data               = queries_d.data();
-  queries_tensor.dl_tensor.device.device_type = kDLCUDA;
-  queries_tensor.dl_tensor.ndim               = 2;
-  queries_tensor.dl_tensor.dtype.code         = kDLFloat;
-  queries_tensor.dl_tensor.dtype.bits         = 32;
-  queries_tensor.dl_tensor.dtype.lanes        = 1;
-  int64_t queries_shape[2]                    = {4, 2};
-  queries_tensor.dl_tensor.shape              = queries_shape;
-  queries_tensor.dl_tensor.strides            = nullptr;
-
-  // create neighbors DLTensor
-  rmm::device_uvector<uint32_t> neighbors_d(4, stream);
-
-  DLManagedTensor neighbors_tensor;
-  neighbors_tensor.dl_tensor.data               = neighbors_d.data();
-  neighbors_tensor.dl_tensor.device.device_type = kDLCUDA;
-  neighbors_tensor.dl_tensor.ndim               = 2;
-  neighbors_tensor.dl_tensor.dtype.code         = kDLUInt;
-  neighbors_tensor.dl_tensor.dtype.bits         = 32;
-  neighbors_tensor.dl_tensor.dtype.lanes        = 1;
-  int64_t neighbors_shape[2]                    = {4, 1};
-  neighbors_tensor.dl_tensor.shape              = neighbors_shape;
-  neighbors_tensor.dl_tensor.strides            = nullptr;
-
-  // create distances DLTensor
-  rmm::device_uvector<float> distances_d(4, stream);
-
-  DLManagedTensor distances_tensor;
-  distances_tensor.dl_tensor.data               = distances_d.data();
-  distances_tensor.dl_tensor.device.device_type = kDLCUDA;
-  distances_tensor.dl_tensor.ndim               = 2;
-  distances_tensor.dl_tensor.dtype.code         = kDLFloat;
-  distances_tensor.dl_tensor.dtype.bits         = 32;
-  distances_tensor.dl_tensor.dtype.lanes        = 1;
-  int64_t distances_shape[2]                    = {4, 1};
-  distances_tensor.dl_tensor.shape              = distances_shape;
-  distances_tensor.dl_tensor.strides            = nullptr;
-
-  // create filter DLTensor
-  rmm::device_uvector<uint32_t> filter_d(1, stream);
-  raft::copy(filter_d.data(), filter, 1, stream);
-
-  cuvsFilter filter;
-
-  DLManagedTensor filter_tensor;
-  filter_tensor.dl_tensor.data               = filter_d.data();
-  filter_tensor.dl_tensor.device.device_type = kDLCUDA;
-  filter_tensor.dl_tensor.ndim               = 1;
-  filter_tensor.dl_tensor.dtype.code         = kDLUInt;
-  filter_tensor.dl_tensor.dtype.bits         = 32;
-  filter_tensor.dl_tensor.dtype.lanes        = 1;
-  int64_t filter_shape[1]                    = {1};
-  filter_tensor.dl_tensor.shape              = filter_shape;
-  filter_tensor.dl_tensor.strides            = nullptr;
-
-  filter.type = BITSET;
-  filter.addr = (uintptr_t)&filter_tensor;
-
-  // search index
-  cuvsCagraSearchParams_t search_params;
-  cuvsCagraSearchParamsCreate(&search_params);
-  cuvsCagraSearch(
-    res, search_params, index, &queries_tensor, &neighbors_tensor, &distances_tensor, filter);
-  // verify output
-  ASSERT_TRUE(cuvs::devArrMatchHost(
-    neighbors_exp_filtered, neighbors_d.data(), 4, cuvs::Compare<uint32_t>()));
-  ASSERT_TRUE(cuvs::devArrMatchHost(
-    distances_exp_filtered, distances_d.data(), 4, cuvs::CompareApprox<float>(0.001f)));
-
-  // de-allocate index and res
-  cuvsCagraSearchParamsDestroy(search_params);
-  cuvsCagraIndexParamsDestroy(build_params);
-  cuvsCagraIndexDestroy(index);
-  cuvsResourcesDestroy(res);
-}
-
 TEST(CagraC, BuildExtendSearch)
 {
   // create cuvsResources_t
@@ -469,4 +349,4 @@ TEST(CagraC, BuildExtendSearch)
   cuvsCagraIndexParamsDestroy(build_params);
   cuvsCagraIndexDestroy(index);
   cuvsResourcesDestroy(res);
-}
+}