Fix duplicate indices in batch NN Descent (#702)

### Purpose of this PR
Handling duplicate indices in batch NN Descent graph.

Resolves the following issues
- rapidsai/raft#2450
- #559
- #753
### Notes
- Also fixed in RAFT [here](rapidsai/raft#2586) for current use with cuML

Authors:
  - Jinsol Park (https://github.com/jinsolp)
  - Corey J. Nolet (https://github.com/cjnolet)

Approvers:
  - Divye Gala (https://github.com/divyegala)

URL: #702

Author: jinsolp

cpp/src/neighbors/detail/nn_descent.cuh

@@ -244,6 +244,8 @@ class BloomFilter {
     }
   }
 
+  void set_nrow(size_t nrow) { nrow_ = nrow; }
+
   bool check(size_t list_id, Index_t key)
   {
     bool is_present       = true;
@@ -1273,7 +1275,9 @@ void GNND<Data_t, Index_t>::build(Data_t* data,
   cudaStream_t stream = raft::resource::get_cuda_stream(res);
   nrow_               = nrow;
   graph_.nrow         = nrow;
-  graph_.h_graph      = (InternalID_t<Index_t>*)output_graph;
+  graph_.bloom_filter.set_nrow(nrow);
+  update_counter_ = 0;
+  graph_.h_graph  = (InternalID_t<Index_t>*)output_graph;
 
   cudaPointerAttributes data_ptr_attr;
   RAFT_CUDA_TRY(cudaPointerGetAttributes(&data_ptr_attr, data));

cpp/src/neighbors/detail/nn_descent_batch.cuh

@@ -170,10 +170,10 @@ void get_global_nearest_k(
 
       if (i == num_batches - 1) { batch_size_ = num_rows - batch_size * i; }
       thrust::copy(raft::resource::get_thrust_policy(res),
-                   nearest_clusters_idx.data_handle() + i * batch_size_ * k,
-                   nearest_clusters_idx.data_handle() + (i + 1) * batch_size_ * k,
+                   nearest_clusters_idx.data_handle() + i * batch_size * k,
+                   nearest_clusters_idx.data_handle() + (i * batch_size + batch_size_) * k,
                    nearest_clusters_idxt.data_handle());
-      raft::copy(global_nearest_cluster.data_handle() + i * batch_size_ * k,
+      raft::copy(global_nearest_cluster.data_handle() + i * batch_size * k,
                  nearest_clusters_idxt.data_handle(),
                  batch_size_ * k,
                  resource::get_cuda_stream(res));
@@ -650,7 +650,8 @@ void batch_build(raft::resources const& res,
                            .internal_node_degree  = extended_intermediate_degree,
                            .max_iterations        = params.max_iterations,
                            .termination_threshold = params.termination_threshold,
-                           .output_graph_degree   = graph_degree};
+                           .output_graph_degree   = graph_degree,
+                           .metric                = params.metric};
 
   auto global_indices_h   = raft::make_managed_matrix<IdxT, int64_t>(res, num_rows, graph_degree);
   auto global_distances_h = raft::make_managed_matrix<float, int64_t>(res, num_rows, graph_degree);

cpp/tests/neighbors/ann_nn_descent.cuh

@@ -241,7 +241,7 @@ class AnnNNDescentBatchTest : public ::testing::TestWithParam<AnnNNDescentBatchI
         index_params.metric                    = ps.metric;
         index_params.graph_degree              = ps.graph_degree;
         index_params.intermediate_graph_degree = 2 * ps.graph_degree;
-        index_params.max_iterations            = 10;
+        index_params.max_iterations            = 100;
         index_params.return_distances          = true;
         index_params.n_clusters                = ps.recall_cluster.second;
 
@@ -287,8 +287,7 @@ class AnnNNDescentBatchTest : public ::testing::TestWithParam<AnnNNDescentBatchI
                                   ps.graph_degree,
                                   0.01,
                                   min_recall,
-                                  true,
-                                  static_cast<size_t>(ps.graph_degree * 0.1)));
+                                  true));
     }
   }
 
@@ -328,8 +327,6 @@ const std::vector<AnnNNDescentInputs> inputs =
                                                      {false, true},
                                                      {0.90});
 
-// TODO : Investigate why this test is failing Reference issue https
-// :  // github.com/rapidsai/raft/issues/2450
 const std::vector<AnnNNDescentBatchInputs> inputsBatch =
   raft::util::itertools::product<AnnNNDescentBatchInputs>(
     {std::make_pair(0.9, 3lu), std::make_pair(0.9, 2lu)},  // min_recall, n_clusters

cpp/tests/neighbors/ann_nn_descent/test_float_uint32_t.cu

@@ -23,12 +23,12 @@ namespace cuvs::neighbors::nn_descent {
 typedef AnnNNDescentTest<float, float, std::uint32_t> AnnNNDescentTestF_U32;
 TEST_P(AnnNNDescentTestF_U32, AnnNNDescent) { this->testNNDescent(); }
 
-// typedef AnnNNDescentBatchTest<float, float, std::uint32_t> AnnNNDescentBatchTestF_U32;
-// TEST_P(AnnNNDescentBatchTestF_U32, AnnNNDescentBatch) { this->testNNDescentBatch(); }
+typedef AnnNNDescentBatchTest<float, float, std::uint32_t> AnnNNDescentBatchTestF_U32;
+TEST_P(AnnNNDescentBatchTestF_U32, AnnNNDescentBatch) { this->testNNDescentBatch(); }
 
 INSTANTIATE_TEST_CASE_P(AnnNNDescentTest, AnnNNDescentTestF_U32, ::testing::ValuesIn(inputs));
-// INSTANTIATE_TEST_CASE_P(AnnNNDescentBatchTest,
-//                         AnnNNDescentBatchTestF_U32,
-//                         ::testing::ValuesIn(inputsBatch));
+INSTANTIATE_TEST_CASE_P(AnnNNDescentBatchTest,
+                        AnnNNDescentBatchTestF_U32,
+                        ::testing::ValuesIn(inputsBatch));
 
 }  // namespace   cuvs::neighbors::nn_descent