Changing tests and bench distancetype naming

rapidsai · Jan 28, 2021 · c96a8c4 · c96a8c4
1 parent 050f4d0
commit c96a8c4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cpp/src_prims/sparse/distance/distance.cuh b/cpp/src_prims/sparse/distance/distance.cuh
@@ -348,7 +348,7 @@ void pairwiseDistance(value_t *out,
                       raft::distance::DistanceType metric) {
   switch (metric) {
     case raft::distance::DistanceType::L2Expanded:
-      // EucExpandedL2
+      // L2Expanded
       l2_distances_t<value_idx, value_t>(input_config).compute(out);
       break;
     case raft::distance::DistanceType::InnerProduct:

diff --git a/cpp/test/prims/sparse/knn.cu b/cpp/test/prims/sparse/knn.cu
@@ -50,7 +50,7 @@ struct SparseKNNInputs {
   int batch_size_index = 2;
   int batch_size_query = 2;
 
-  raft::distance::DistanceType metric = raft::distance::DistanceType::EucUnexpandedL2;
+  raft::distance::DistanceType metric = raft::distance::DistanceType::L2Unexpanded;
 };
 
 template <typename value_idx, typename value_t>
@@ -165,7 +165,7 @@ const std::vector<SparseKNNInputs<int, float>> inputs_i32_f = {
    {0, 3, 1, 0, 2, 0, 3, 0},                          // inds
    2,
    2,
-   raft::distance::DistanceType::EucUnexpandedL2}};
+   raft::distance::DistanceType::L2Unexpanded}};
 typedef SparseKNNTest<int, float> KNNTestF;
 TEST_P(KNNTestF, Result) { compare(); }
 INSTANTIATE_TEST_CASE_P(SparseKNNTest, KNNTestF,

diff --git a/cpp/test/sg/umap_test.cu b/cpp/test/sg/umap_test.cu
@@ -82,7 +82,7 @@ class UMAPTest : public ::testing::Test {
 
     CUDA_CHECK(cudaStreamSynchronize(handle.get_stream()));
 
-    xformed_score = trustworthiness_score<float, EucUnexpandedL2Sqrt>(
+    xformed_score = trustworthiness_score<float, L2SqrtUnexpanded>(
       handle, X_d.data(), xformed.data(), n_samples, n_features,
       umap_params->n_components, umap_params->n_neighbors);
   }
@@ -117,7 +117,7 @@ class UMAPTest : public ::testing::Test {
 
     CUDA_CHECK(cudaStreamSynchronize(handle.get_stream()));
 
-    fit_score = trustworthiness_score<float, EucUnexpandedL2Sqrt>(
+    fit_score = trustworthiness_score<float, L2SqrtUnexpanded>(
       handle, X_d.data(), embeddings.data(), n_samples, n_features,
       umap_params->n_components, umap_params->n_neighbors);
   }
@@ -154,7 +154,7 @@ class UMAPTest : public ::testing::Test {
 
     CUDA_CHECK(cudaStreamSynchronize(handle.get_stream()));
 
-    supervised_score = trustworthiness_score<float, EucUnexpandedL2Sqrt>(
+    supervised_score = trustworthiness_score<float, L2SqrtUnexpanded>(
       handle, X_d.data(), embeddings.data(), n_samples, n_features,
       umap_params->n_components, umap_params->n_neighbors);
   }
@@ -213,7 +213,7 @@ class UMAPTest : public ::testing::Test {
 
     CUDA_CHECK(cudaStreamSynchronize(handle.get_stream()));
 
-    fit_with_knn_score = trustworthiness_score<float, EucUnexpandedL2Sqrt>(
+    fit_with_knn_score = trustworthiness_score<float, L2SqrtUnexpanded>(
       handle, X_d.data(), embeddings.data(), n_samples, n_features,
       umap_params->n_components, umap_params->n_neighbors);
   }