Merge branch 'branch-25.02' into faiss-cuvs

rapidsai · Jan 28, 2025 · d288548 · d288548
2 parents 6cffe02 + a1e3b51
commit d288548
Show file tree

Hide file tree

Showing 113 changed files with 12 additions and 12 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -86,7 +86,7 @@ repos:
                 exclude: .*/thirdparty/.*
               - id: include-check
                 name: include-check
-                entry: python ./cpp/scripts/include_checker.py cpp/bench cpp/include cpp/test
+                entry: python ./cpp/scripts/include_checker.py cpp/bench cpp/include cpp/tests
                 pass_filenames: false
                 language: python
                 additional_dependencies: [gitpython]

diff --git a/ci/run_cuvs_pytests.sh b/ci/run_cuvs_pytests.sh
@@ -6,4 +6,4 @@ set -euo pipefail
 # Support invoking run_pytests.sh outside the script directory
 cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../python/cuvs/cuvs
 
-pytest --cache-clear --verbose "$@" test
+pytest --cache-clear --verbose "$@" tests
diff --git a/ci/test_python.sh b/ci/test_python.sh
@@ -52,7 +52,7 @@ pytest \
  --cov=cuvs \
  --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cuvs-coverage.xml" \
  --cov-report=term \
- test
+ tests
 
 rapids-logger "Test script exiting with value: $EXITCODE"
 exit ${EXITCODE}
diff --git a/ci/test_wheel_cuvs.sh b/ci/test_wheel_cuvs.sh
@@ -13,4 +13,4 @@ python -m pip install \
     ./local-libcuvs-dep/libcuvs*.whl \
     "$(echo ./dist/cuvs*.whl)[test]"
 
-python -m pytest ./python/cuvs/cuvs/test
+python -m pytest ./python/cuvs/cuvs/tests
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -798,7 +798,7 @@ endif()
 if(BUILD_TESTS)
   enable_testing()
   add_subdirectory(internal)
-  add_subdirectory(test)
+  add_subdirectory(tests)
 endif()
 
 # ##################################################################################################

diff --git a/cpp/test/CMakeLists.txt → cpp/tests/CMakeLists.txt b/cpp/test/CMakeLists.txt → cpp/tests/CMakeLists.txt
@@ -77,7 +77,7 @@ function(ConfigureTest)
     target_compile_definitions(${TEST_NAME} PRIVATE "CUVS_DISABLE_CUDA")
   endif()
 
-  target_include_directories(${TEST_NAME} PUBLIC "$<BUILD_INTERFACE:${CUVS_SOURCE_DIR}/test>")
+  target_include_directories(${TEST_NAME} PUBLIC "$<BUILD_INTERFACE:${CUVS_SOURCE_DIR}/tests>")
 
   rapids_test_add(
     NAME ${TEST_NAME}

diff --git a/cpp/test/cluster/kmeans.cu → cpp/tests/cluster/kmeans.cu b/cpp/test/cluster/kmeans.cu → cpp/tests/cluster/kmeans.cu
diff --git a/cpp/test/cluster/kmeans_balanced.cu → cpp/tests/cluster/kmeans_balanced.cu b/cpp/test/cluster/kmeans_balanced.cu → cpp/tests/cluster/kmeans_balanced.cu
diff --git a/cpp/test/cluster/kmeans_find_k.cu → cpp/tests/cluster/kmeans_find_k.cu b/cpp/test/cluster/kmeans_find_k.cu → cpp/tests/cluster/kmeans_find_k.cu
diff --git a/cpp/test/cluster/kmeans_mg.cu → cpp/tests/cluster/kmeans_mg.cu b/cpp/test/cluster/kmeans_mg.cu → cpp/tests/cluster/kmeans_mg.cu
diff --git a/cpp/test/cluster/linkage.cu → cpp/tests/cluster/linkage.cu b/cpp/test/cluster/linkage.cu → cpp/tests/cluster/linkage.cu
diff --git a/cpp/test/core/c_api.c → cpp/tests/core/c_api.c b/cpp/test/core/c_api.c → cpp/tests/core/c_api.c
diff --git a/cpp/test/core/interop.cu → cpp/tests/core/interop.cu b/cpp/test/core/interop.cu → cpp/tests/core/interop.cu
diff --git a/cpp/test/distance/dist_canberra.cu → cpp/tests/distance/dist_canberra.cu b/cpp/test/distance/dist_canberra.cu → cpp/tests/distance/dist_canberra.cu
diff --git a/cpp/test/distance/dist_correlation.cu → cpp/tests/distance/dist_correlation.cu b/cpp/test/distance/dist_correlation.cu → cpp/tests/distance/dist_correlation.cu
diff --git a/cpp/test/distance/dist_cos.cu → cpp/tests/distance/dist_cos.cu b/cpp/test/distance/dist_cos.cu → cpp/tests/distance/dist_cos.cu
diff --git a/cpp/test/distance/dist_hamming.cu → cpp/tests/distance/dist_hamming.cu b/cpp/test/distance/dist_hamming.cu → cpp/tests/distance/dist_hamming.cu
diff --git a/cpp/test/distance/dist_hellinger.cu → cpp/tests/distance/dist_hellinger.cu b/cpp/test/distance/dist_hellinger.cu → cpp/tests/distance/dist_hellinger.cu
diff --git a/cpp/test/distance/dist_inner_product.cu → cpp/tests/distance/dist_inner_product.cu b/cpp/test/distance/dist_inner_product.cu → cpp/tests/distance/dist_inner_product.cu
diff --git a/cpp/test/distance/dist_jensen_shannon.cu → cpp/tests/distance/dist_jensen_shannon.cu b/cpp/test/distance/dist_jensen_shannon.cu → cpp/tests/distance/dist_jensen_shannon.cu
diff --git a/cpp/test/distance/dist_kl_divergence.cu → cpp/tests/distance/dist_kl_divergence.cu b/cpp/test/distance/dist_kl_divergence.cu → cpp/tests/distance/dist_kl_divergence.cu
diff --git a/cpp/test/distance/dist_l1.cu → cpp/tests/distance/dist_l1.cu b/cpp/test/distance/dist_l1.cu → cpp/tests/distance/dist_l1.cu
diff --git a/cpp/test/distance/dist_l2_exp.cu → cpp/tests/distance/dist_l2_exp.cu b/cpp/test/distance/dist_l2_exp.cu → cpp/tests/distance/dist_l2_exp.cu
diff --git a/cpp/test/distance/dist_l2_sqrt_exp.cu → cpp/tests/distance/dist_l2_sqrt_exp.cu b/cpp/test/distance/dist_l2_sqrt_exp.cu → cpp/tests/distance/dist_l2_sqrt_exp.cu
diff --git a/cpp/test/distance/dist_l2_unexp.cu → cpp/tests/distance/dist_l2_unexp.cu b/cpp/test/distance/dist_l2_unexp.cu → cpp/tests/distance/dist_l2_unexp.cu
diff --git a/cpp/test/distance/dist_l_inf.cu → cpp/tests/distance/dist_l_inf.cu b/cpp/test/distance/dist_l_inf.cu → cpp/tests/distance/dist_l_inf.cu
diff --git a/cpp/test/distance/dist_lp_unexp.cu → cpp/tests/distance/dist_lp_unexp.cu b/cpp/test/distance/dist_lp_unexp.cu → cpp/tests/distance/dist_lp_unexp.cu
diff --git a/cpp/test/distance/dist_russell_rao.cu → cpp/tests/distance/dist_russell_rao.cu b/cpp/test/distance/dist_russell_rao.cu → cpp/tests/distance/dist_russell_rao.cu
diff --git a/cpp/test/distance/distance_base.cuh → cpp/tests/distance/distance_base.cuh b/cpp/test/distance/distance_base.cuh → cpp/tests/distance/distance_base.cuh
diff --git a/cpp/test/distance/gram.cu → cpp/tests/distance/gram.cu b/cpp/test/distance/gram.cu → cpp/tests/distance/gram.cu
diff --git a/cpp/test/distance/gram_base.cuh → cpp/tests/distance/gram_base.cuh b/cpp/test/distance/gram_base.cuh → cpp/tests/distance/gram_base.cuh
diff --git a/cpp/test/distance/masked_nn.cu → cpp/tests/distance/masked_nn.cu b/cpp/test/distance/masked_nn.cu → cpp/tests/distance/masked_nn.cu
diff --git a/cpp/test/distance/pairwise_distance_c.cu → cpp/tests/distance/pairwise_distance_c.cu b/cpp/test/distance/pairwise_distance_c.cu → cpp/tests/distance/pairwise_distance_c.cu
diff --git a/cpp/test/distance/run_pairwise_distance_c.c → cpp/tests/distance/run_pairwise_distance_c.c b/cpp/test/distance/run_pairwise_distance_c.c → cpp/tests/distance/run_pairwise_distance_c.c
diff --git a/cpp/test/distance/sparse_distance.cu → cpp/tests/distance/sparse_distance.cu b/cpp/test/distance/sparse_distance.cu → cpp/tests/distance/sparse_distance.cu
diff --git a/cpp/test/neighbors/ann_brute_force.cuh → cpp/tests/neighbors/ann_brute_force.cuh b/cpp/test/neighbors/ann_brute_force.cuh → cpp/tests/neighbors/ann_brute_force.cuh
diff --git a/...t/neighbors/ann_brute_force/test_float.cu → ...s/neighbors/ann_brute_force/test_float.cu b/...t/neighbors/ann_brute_force/test_float.cu → ...s/neighbors/ann_brute_force/test_float.cu
diff --git a/...st/neighbors/ann_brute_force/test_half.cu → ...ts/neighbors/ann_brute_force/test_half.cu b/...st/neighbors/ann_brute_force/test_half.cu → ...ts/neighbors/ann_brute_force/test_half.cu
diff --git a/cpp/test/neighbors/ann_cagra.cuh → cpp/tests/neighbors/ann_cagra.cuh b/cpp/test/neighbors/ann_cagra.cuh → cpp/tests/neighbors/ann_cagra.cuh
diff --git a/...hbors/ann_cagra/bug_extreme_inputs_oob.cu → ...hbors/ann_cagra/bug_extreme_inputs_oob.cu b/...hbors/ann_cagra/bug_extreme_inputs_oob.cu → ...hbors/ann_cagra/bug_extreme_inputs_oob.cu
diff --git a/...eighbors/ann_cagra/bug_multi_cta_crash.cu → ...eighbors/ann_cagra/bug_multi_cta_crash.cu b/...eighbors/ann_cagra/bug_multi_cta_crash.cu → ...eighbors/ann_cagra/bug_multi_cta_crash.cu
diff --git a/...eighbors/ann_cagra/test_float_uint32_t.cu → ...eighbors/ann_cagra/test_float_uint32_t.cu b/...eighbors/ann_cagra/test_float_uint32_t.cu → ...eighbors/ann_cagra/test_float_uint32_t.cu
diff --git a/...neighbors/ann_cagra/test_half_uint32_t.cu → ...neighbors/ann_cagra/test_half_uint32_t.cu b/...neighbors/ann_cagra/test_half_uint32_t.cu → ...neighbors/ann_cagra/test_half_uint32_t.cu
diff --git a/...ighbors/ann_cagra/test_int8_t_uint32_t.cu → ...ighbors/ann_cagra/test_int8_t_uint32_t.cu b/...ighbors/ann_cagra/test_int8_t_uint32_t.cu → ...ighbors/ann_cagra/test_int8_t_uint32_t.cu
diff --git a/...ghbors/ann_cagra/test_uint8_t_uint32_t.cu → ...ghbors/ann_cagra/test_uint8_t_uint32_t.cu b/...ghbors/ann_cagra/test_uint8_t_uint32_t.cu → ...ghbors/ann_cagra/test_uint8_t_uint32_t.cu
diff --git a/cpp/test/neighbors/ann_cagra_c.cu → cpp/tests/neighbors/ann_cagra_c.cu b/cpp/test/neighbors/ann_cagra_c.cu → cpp/tests/neighbors/ann_cagra_c.cu
diff --git a/cpp/test/neighbors/ann_hnsw_c.cu → cpp/tests/neighbors/ann_hnsw_c.cu b/cpp/test/neighbors/ann_hnsw_c.cu → cpp/tests/neighbors/ann_hnsw_c.cu
diff --git a/cpp/test/neighbors/ann_ivf_flat.cuh → cpp/tests/neighbors/ann_ivf_flat.cuh b/cpp/test/neighbors/ann_ivf_flat.cuh → cpp/tests/neighbors/ann_ivf_flat.cuh
diff --git a/...ghbors/ann_ivf_flat/test_float_int64_t.cu → ...ghbors/ann_ivf_flat/test_float_int64_t.cu b/...ghbors/ann_ivf_flat/test_float_int64_t.cu → ...ghbors/ann_ivf_flat/test_float_int64_t.cu
diff --git a/...hbors/ann_ivf_flat/test_int8_t_int64_t.cu → ...hbors/ann_ivf_flat/test_int8_t_int64_t.cu b/...hbors/ann_ivf_flat/test_int8_t_int64_t.cu → ...hbors/ann_ivf_flat/test_int8_t_int64_t.cu
diff --git a/...bors/ann_ivf_flat/test_uint8_t_int64_t.cu → ...bors/ann_ivf_flat/test_uint8_t_int64_t.cu b/...bors/ann_ivf_flat/test_uint8_t_int64_t.cu → ...bors/ann_ivf_flat/test_uint8_t_int64_t.cu
diff --git a/cpp/test/neighbors/ann_ivf_flat_c.cu → cpp/tests/neighbors/ann_ivf_flat_c.cu b/cpp/test/neighbors/ann_ivf_flat_c.cu → cpp/tests/neighbors/ann_ivf_flat_c.cu
diff --git a/cpp/test/neighbors/ann_ivf_pq.cuh → cpp/tests/neighbors/ann_ivf_pq.cuh b/cpp/test/neighbors/ann_ivf_pq.cuh → cpp/tests/neighbors/ann_ivf_pq.cuh
diff --git a/...eighbors/ann_ivf_pq/test_float_int64_t.cu → ...eighbors/ann_ivf_pq/test_float_int64_t.cu b/...eighbors/ann_ivf_pq/test_float_int64_t.cu → ...eighbors/ann_ivf_pq/test_float_int64_t.cu
diff --git a/...ighbors/ann_ivf_pq/test_int8_t_int64_t.cu → ...ighbors/ann_ivf_pq/test_int8_t_int64_t.cu b/...ighbors/ann_ivf_pq/test_int8_t_int64_t.cu → ...ighbors/ann_ivf_pq/test_int8_t_int64_t.cu
diff --git a/...ghbors/ann_ivf_pq/test_uint8_t_int64_t.cu → ...ghbors/ann_ivf_pq/test_uint8_t_int64_t.cu b/...ghbors/ann_ivf_pq/test_uint8_t_int64_t.cu → ...ghbors/ann_ivf_pq/test_uint8_t_int64_t.cu
diff --git a/cpp/test/neighbors/ann_ivf_pq_c.cu → cpp/tests/neighbors/ann_ivf_pq_c.cu b/cpp/test/neighbors/ann_ivf_pq_c.cu → cpp/tests/neighbors/ann_ivf_pq_c.cu
diff --git a/cpp/test/neighbors/ann_nn_descent.cuh → cpp/tests/neighbors/ann_nn_descent.cuh b/cpp/test/neighbors/ann_nn_descent.cuh → cpp/tests/neighbors/ann_nn_descent.cuh
diff --git a/...ors/ann_nn_descent/test_float_uint32_t.cu → ...ors/ann_nn_descent/test_float_uint32_t.cu b/...ors/ann_nn_descent/test_float_uint32_t.cu → ...ors/ann_nn_descent/test_float_uint32_t.cu
diff --git a/...rs/ann_nn_descent/test_int8_t_uint32_t.cu → ...rs/ann_nn_descent/test_int8_t_uint32_t.cu b/...rs/ann_nn_descent/test_int8_t_uint32_t.cu → ...rs/ann_nn_descent/test_int8_t_uint32_t.cu
diff --git a/...s/ann_nn_descent/test_uint8_t_uint32_t.cu → ...s/ann_nn_descent/test_uint8_t_uint32_t.cu b/...s/ann_nn_descent/test_uint8_t_uint32_t.cu → ...s/ann_nn_descent/test_uint8_t_uint32_t.cu
diff --git a/cpp/test/neighbors/ann_utils.cuh → cpp/tests/neighbors/ann_utils.cuh b/cpp/test/neighbors/ann_utils.cuh → cpp/tests/neighbors/ann_utils.cuh
diff --git a/cpp/test/neighbors/ann_vamana.cuh → cpp/tests/neighbors/ann_vamana.cuh b/cpp/test/neighbors/ann_vamana.cuh → cpp/tests/neighbors/ann_vamana.cuh
diff --git a/...ighbors/ann_vamana/test_float_uint32_t.cu → ...ighbors/ann_vamana/test_float_uint32_t.cu b/...ighbors/ann_vamana/test_float_uint32_t.cu → ...ighbors/ann_vamana/test_float_uint32_t.cu
diff --git a/...ghbors/ann_vamana/test_int8_t_uint32_t.cu → ...ghbors/ann_vamana/test_int8_t_uint32_t.cu b/...ghbors/ann_vamana/test_int8_t_uint32_t.cu → ...ghbors/ann_vamana/test_int8_t_uint32_t.cu
diff --git a/...hbors/ann_vamana/test_uint8_t_uint32_t.cu → ...hbors/ann_vamana/test_uint8_t_uint32_t.cu b/...hbors/ann_vamana/test_uint8_t_uint32_t.cu → ...hbors/ann_vamana/test_uint8_t_uint32_t.cu
diff --git a/cpp/test/neighbors/brute_force.cu → cpp/tests/neighbors/brute_force.cu b/cpp/test/neighbors/brute_force.cu → cpp/tests/neighbors/brute_force.cu
diff --git a/cpp/test/neighbors/brute_force_c.cu → cpp/tests/neighbors/brute_force_c.cu b/cpp/test/neighbors/brute_force_c.cu → cpp/tests/neighbors/brute_force_c.cu
diff --git a/...test/neighbors/brute_force_prefiltered.cu → ...ests/neighbors/brute_force_prefiltered.cu b/...test/neighbors/brute_force_prefiltered.cu → ...ests/neighbors/brute_force_prefiltered.cu
diff --git a/cpp/test/neighbors/c_api.c → cpp/tests/neighbors/c_api.c b/cpp/test/neighbors/c_api.c → cpp/tests/neighbors/c_api.c
diff --git a/cpp/test/neighbors/dynamic_batching.cuh → cpp/tests/neighbors/dynamic_batching.cuh b/cpp/test/neighbors/dynamic_batching.cuh → cpp/tests/neighbors/dynamic_batching.cuh
diff --git a/...bors/dynamic_batching/test_brute_force.cu → ...bors/dynamic_batching/test_brute_force.cu b/...bors/dynamic_batching/test_brute_force.cu → ...bors/dynamic_batching/test_brute_force.cu
diff --git a/.../neighbors/dynamic_batching/test_cagra.cu → .../neighbors/dynamic_batching/test_cagra.cu b/.../neighbors/dynamic_batching/test_cagra.cu → .../neighbors/dynamic_batching/test_cagra.cu
diff --git a/...ighbors/dynamic_batching/test_ivf_flat.cu → ...ighbors/dynamic_batching/test_ivf_flat.cu b/...ighbors/dynamic_batching/test_ivf_flat.cu → ...ighbors/dynamic_batching/test_ivf_flat.cu
diff --git a/...neighbors/dynamic_batching/test_ivf_pq.cu → ...neighbors/dynamic_batching/test_ivf_pq.cu b/...neighbors/dynamic_batching/test_ivf_pq.cu → ...neighbors/dynamic_batching/test_ivf_pq.cu
diff --git a/cpp/test/neighbors/hnsw.cu → cpp/tests/neighbors/hnsw.cu b/cpp/test/neighbors/hnsw.cu → cpp/tests/neighbors/hnsw.cu
diff --git a/cpp/test/neighbors/knn_utils.cuh → cpp/tests/neighbors/knn_utils.cuh b/cpp/test/neighbors/knn_utils.cuh → cpp/tests/neighbors/knn_utils.cuh
diff --git a/cpp/test/neighbors/mg.cuh → cpp/tests/neighbors/mg.cuh b/cpp/test/neighbors/mg.cuh → cpp/tests/neighbors/mg.cuh
diff --git a/cpp/test/neighbors/mg/test_float.cu → cpp/tests/neighbors/mg/test_float.cu b/cpp/test/neighbors/mg/test_float.cu → cpp/tests/neighbors/mg/test_float.cu
diff --git a/cpp/test/neighbors/naive_knn.cuh → cpp/tests/neighbors/naive_knn.cuh b/cpp/test/neighbors/naive_knn.cuh → cpp/tests/neighbors/naive_knn.cuh
diff --git a/cpp/test/neighbors/refine.cu → cpp/tests/neighbors/refine.cu b/cpp/test/neighbors/refine.cu → cpp/tests/neighbors/refine.cu
diff --git a/cpp/test/neighbors/refine_helper.cuh → cpp/tests/neighbors/refine_helper.cuh b/cpp/test/neighbors/refine_helper.cuh → cpp/tests/neighbors/refine_helper.cuh
diff --git a/cpp/test/neighbors/run_brute_force_c.c → cpp/tests/neighbors/run_brute_force_c.c b/cpp/test/neighbors/run_brute_force_c.c → cpp/tests/neighbors/run_brute_force_c.c
diff --git a/cpp/test/neighbors/run_ivf_flat_c.c → cpp/tests/neighbors/run_ivf_flat_c.c b/cpp/test/neighbors/run_ivf_flat_c.c → cpp/tests/neighbors/run_ivf_flat_c.c
diff --git a/cpp/test/neighbors/run_ivf_pq_c.c → cpp/tests/neighbors/run_ivf_pq_c.c b/cpp/test/neighbors/run_ivf_pq_c.c → cpp/tests/neighbors/run_ivf_pq_c.c
diff --git a/cpp/test/neighbors/sparse_brute_force.cu → cpp/tests/neighbors/sparse_brute_force.cu b/cpp/test/neighbors/sparse_brute_force.cu → cpp/tests/neighbors/sparse_brute_force.cu
diff --git a/...test/preprocessing/scalar_quantization.cu → ...ests/preprocessing/scalar_quantization.cu b/...test/preprocessing/scalar_quantization.cu → ...ests/preprocessing/scalar_quantization.cu
diff --git a/cpp/test/sparse/cluster/cluster_solvers.cu → cpp/tests/sparse/cluster/cluster_solvers.cu b/cpp/test/sparse/cluster/cluster_solvers.cu → cpp/tests/sparse/cluster/cluster_solvers.cu
diff --git a/cpp/test/sparse/cluster/eigen_solvers.cu → cpp/tests/sparse/cluster/eigen_solvers.cu b/cpp/test/sparse/cluster/eigen_solvers.cu → cpp/tests/sparse/cluster/eigen_solvers.cu
diff --git a/cpp/test/sparse/cluster/spectral.cu → cpp/tests/sparse/cluster/spectral.cu b/cpp/test/sparse/cluster/spectral.cu → cpp/tests/sparse/cluster/spectral.cu
diff --git a/cpp/test/sparse/cluster/spectral_matrix.cu → cpp/tests/sparse/cluster/spectral_matrix.cu b/cpp/test/sparse/cluster/spectral_matrix.cu → cpp/tests/sparse/cluster/spectral_matrix.cu
diff --git a/cpp/test/sparse/gram.cu → cpp/tests/sparse/gram.cu b/cpp/test/sparse/gram.cu → cpp/tests/sparse/gram.cu
diff --git a/...st/sparse/neighbors/cross_component_nn.cu → ...ts/sparse/neighbors/cross_component_nn.cu b/...st/sparse/neighbors/cross_component_nn.cu → ...ts/sparse/neighbors/cross_component_nn.cu
diff --git a/cpp/test/stats/silhouette_score.cu → cpp/tests/stats/silhouette_score.cu b/cpp/test/stats/silhouette_score.cu → cpp/tests/stats/silhouette_score.cu
diff --git a/cpp/test/stats/trustworthiness.cu → cpp/tests/stats/trustworthiness.cu b/cpp/test/stats/trustworthiness.cu → cpp/tests/stats/trustworthiness.cu
diff --git a/cpp/test/test.cpp → cpp/tests/test.cpp b/cpp/test/test.cpp → cpp/tests/test.cpp
diff --git a/cpp/test/test_utils.cuh → cpp/tests/test_utils.cuh b/cpp/test/test_utils.cuh → cpp/tests/test_utils.cuh
diff --git a/cpp/test/test_utils.h → cpp/tests/test_utils.h b/cpp/test/test_utils.h → cpp/tests/test_utils.h
diff --git a/docs/source/developer_guide.md b/docs/source/developer_guide.md
@@ -211,7 +211,7 @@ This will bring up an interactive prompt to select which spelling fixes to apply
 
 Manually, run the following to bulk-fix include style issues:
 ```bash
-python ./cpp/scripts/include_checker.py --inplace [cpp/include cpp/test ... list of folders which you want to fix]
+python ./cpp/scripts/include_checker.py --inplace [cpp/include cpp/tests ... list of folders which you want to fix]
 ```
 
 ### Copyright header

diff --git a/python/cuvs/cuvs/test/__init__py → python/cuvs/cuvs/tests/__init__py b/python/cuvs/cuvs/test/__init__py → python/cuvs/cuvs/tests/__init__py
diff --git a/python/cuvs/cuvs/test/ann_utils.py → python/cuvs/cuvs/tests/ann_utils.py b/python/cuvs/cuvs/test/ann_utils.py → python/cuvs/cuvs/tests/ann_utils.py
diff --git a/python/cuvs/cuvs/test/conftest.py → python/cuvs/cuvs/tests/conftest.py b/python/cuvs/cuvs/test/conftest.py → python/cuvs/cuvs/tests/conftest.py
diff --git a/python/cuvs/cuvs/test/test_brute_force.py → python/cuvs/cuvs/tests/test_brute_force.py b/python/cuvs/cuvs/test/test_brute_force.py → python/cuvs/cuvs/tests/test_brute_force.py
diff --git a/python/cuvs/cuvs/test/test_cagra.py → python/cuvs/cuvs/tests/test_cagra.py b/python/cuvs/cuvs/test/test_cagra.py → python/cuvs/cuvs/tests/test_cagra.py
@@ -20,7 +20,7 @@
 from sklearn.preprocessing import normalize
 
 from cuvs.neighbors import cagra, filters
-from cuvs.test.ann_utils import calc_recall, generate_data
+from cuvs.tests.ann_utils import calc_recall, generate_data
 
 
 def run_cagra_build_search_test(

diff --git a/python/cuvs/cuvs/test/test_distance.py → python/cuvs/cuvs/tests/test_distance.py b/python/cuvs/cuvs/test/test_distance.py → python/cuvs/cuvs/tests/test_distance.py
diff --git a/python/cuvs/cuvs/test/test_doctests.py → python/cuvs/cuvs/tests/test_doctests.py b/python/cuvs/cuvs/test/test_doctests.py → python/cuvs/cuvs/tests/test_doctests.py
diff --git a/python/cuvs/cuvs/test/test_hnsw.py → python/cuvs/cuvs/tests/test_hnsw.py b/python/cuvs/cuvs/test/test_hnsw.py → python/cuvs/cuvs/tests/test_hnsw.py
@@ -19,7 +19,7 @@
 from sklearn.preprocessing import normalize
 
 from cuvs.neighbors import cagra, hnsw
-from cuvs.test.ann_utils import calc_recall, generate_data
+from cuvs.tests.ann_utils import calc_recall, generate_data
 
 
 def run_hnsw_build_search_test(

diff --git a/python/cuvs/cuvs/test/test_ivf_flat.py → python/cuvs/cuvs/tests/test_ivf_flat.py b/python/cuvs/cuvs/test/test_ivf_flat.py → python/cuvs/cuvs/tests/test_ivf_flat.py
@@ -20,7 +20,7 @@
 from sklearn.preprocessing import normalize
 
 from cuvs.neighbors import ivf_flat
-from cuvs.test.ann_utils import calc_recall, generate_data
+from cuvs.tests.ann_utils import calc_recall, generate_data
 
 
 def run_ivf_flat_build_search_test(

diff --git a/python/cuvs/cuvs/test/test_ivf_pq.py → python/cuvs/cuvs/tests/test_ivf_pq.py b/python/cuvs/cuvs/test/test_ivf_pq.py → python/cuvs/cuvs/tests/test_ivf_pq.py
@@ -20,7 +20,7 @@
 from sklearn.preprocessing import normalize
 
 from cuvs.neighbors import ivf_pq
-from cuvs.test.ann_utils import calc_recall, generate_data
+from cuvs.tests.ann_utils import calc_recall, generate_data
 
 
 def run_ivf_pq_build_search_test(

diff --git a/python/cuvs/cuvs/test/test_refine.py → python/cuvs/cuvs/tests/test_refine.py b/python/cuvs/cuvs/test/test_refine.py → python/cuvs/cuvs/tests/test_refine.py
diff --git a/...n/cuvs/cuvs/test/test_scalar_quantizer.py → .../cuvs/cuvs/tests/test_scalar_quantizer.py b/...n/cuvs/cuvs/test/test_scalar_quantizer.py → .../cuvs/cuvs/tests/test_scalar_quantizer.py
diff --git a/python/cuvs/cuvs/test/test_serialization.py → python/cuvs/cuvs/tests/test_serialization.py b/python/cuvs/cuvs/test/test_serialization.py → python/cuvs/cuvs/tests/test_serialization.py
@@ -18,7 +18,7 @@
 from pylibraft.common import device_ndarray
 
 from cuvs.neighbors import brute_force, cagra, ivf_flat, ivf_pq
-from cuvs.test.ann_utils import generate_data
+from cuvs.tests.ann_utils import generate_data
 
 
 @pytest.mark.parametrize("dtype", [np.float32, np.int8, np.ubyte])

diff --git a/python/cuvs/cuvs/test/test_version.py → python/cuvs/cuvs/tests/test_version.py b/python/cuvs/cuvs/test/test_version.py → python/cuvs/cuvs/tests/test_version.py