diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2f064ebb6..1124d3814 100644 --- 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 index 57df9af94..4de8927b1 100755 --- 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 index b9c394062..e8749fe79 100755 --- 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 index 862c69a3a..cb74c5206 100755 --- 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 index f88ca1af5..63e57965b 100644 --- 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 b/cpp/tests/CMakeLists.txt similarity index 99% rename from cpp/test/CMakeLists.txt rename to cpp/tests/CMakeLists.txt index fdca48d71..3ed37175d 100644 --- a/cpp/test/CMakeLists.txt +++ b/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 "$") + target_include_directories(${TEST_NAME} PUBLIC "$") rapids_test_add( NAME ${TEST_NAME} diff --git a/cpp/test/cluster/kmeans.cu b/cpp/tests/cluster/kmeans.cu similarity index 100% rename from cpp/test/cluster/kmeans.cu rename to cpp/tests/cluster/kmeans.cu diff --git a/cpp/test/cluster/kmeans_balanced.cu b/cpp/tests/cluster/kmeans_balanced.cu similarity index 100% rename from cpp/test/cluster/kmeans_balanced.cu rename to cpp/tests/cluster/kmeans_balanced.cu diff --git a/cpp/test/cluster/kmeans_find_k.cu b/cpp/tests/cluster/kmeans_find_k.cu similarity index 100% rename from cpp/test/cluster/kmeans_find_k.cu rename to cpp/tests/cluster/kmeans_find_k.cu diff --git a/cpp/test/cluster/kmeans_mg.cu b/cpp/tests/cluster/kmeans_mg.cu similarity index 100% rename from cpp/test/cluster/kmeans_mg.cu rename to cpp/tests/cluster/kmeans_mg.cu diff --git a/cpp/test/cluster/linkage.cu b/cpp/tests/cluster/linkage.cu similarity index 100% rename from cpp/test/cluster/linkage.cu rename to cpp/tests/cluster/linkage.cu diff --git a/cpp/test/core/c_api.c b/cpp/tests/core/c_api.c similarity index 100% rename from cpp/test/core/c_api.c rename to cpp/tests/core/c_api.c diff --git a/cpp/test/core/interop.cu b/cpp/tests/core/interop.cu similarity index 100% rename from cpp/test/core/interop.cu rename to cpp/tests/core/interop.cu diff --git a/cpp/test/distance/dist_canberra.cu b/cpp/tests/distance/dist_canberra.cu similarity index 100% rename from cpp/test/distance/dist_canberra.cu rename to cpp/tests/distance/dist_canberra.cu diff --git a/cpp/test/distance/dist_correlation.cu b/cpp/tests/distance/dist_correlation.cu similarity index 100% rename from cpp/test/distance/dist_correlation.cu rename to cpp/tests/distance/dist_correlation.cu diff --git a/cpp/test/distance/dist_cos.cu b/cpp/tests/distance/dist_cos.cu similarity index 100% rename from cpp/test/distance/dist_cos.cu rename to cpp/tests/distance/dist_cos.cu diff --git a/cpp/test/distance/dist_hamming.cu b/cpp/tests/distance/dist_hamming.cu similarity index 100% rename from cpp/test/distance/dist_hamming.cu rename to cpp/tests/distance/dist_hamming.cu diff --git a/cpp/test/distance/dist_hellinger.cu b/cpp/tests/distance/dist_hellinger.cu similarity index 100% rename from cpp/test/distance/dist_hellinger.cu rename to cpp/tests/distance/dist_hellinger.cu diff --git a/cpp/test/distance/dist_inner_product.cu b/cpp/tests/distance/dist_inner_product.cu similarity index 100% rename from cpp/test/distance/dist_inner_product.cu rename to cpp/tests/distance/dist_inner_product.cu diff --git a/cpp/test/distance/dist_jensen_shannon.cu b/cpp/tests/distance/dist_jensen_shannon.cu similarity index 100% rename from cpp/test/distance/dist_jensen_shannon.cu rename to cpp/tests/distance/dist_jensen_shannon.cu diff --git a/cpp/test/distance/dist_kl_divergence.cu b/cpp/tests/distance/dist_kl_divergence.cu similarity index 100% rename from cpp/test/distance/dist_kl_divergence.cu rename to cpp/tests/distance/dist_kl_divergence.cu diff --git a/cpp/test/distance/dist_l1.cu b/cpp/tests/distance/dist_l1.cu similarity index 100% rename from cpp/test/distance/dist_l1.cu rename to cpp/tests/distance/dist_l1.cu diff --git a/cpp/test/distance/dist_l2_exp.cu b/cpp/tests/distance/dist_l2_exp.cu similarity index 100% rename from cpp/test/distance/dist_l2_exp.cu rename to cpp/tests/distance/dist_l2_exp.cu diff --git a/cpp/test/distance/dist_l2_sqrt_exp.cu b/cpp/tests/distance/dist_l2_sqrt_exp.cu similarity index 100% rename from cpp/test/distance/dist_l2_sqrt_exp.cu rename to cpp/tests/distance/dist_l2_sqrt_exp.cu diff --git a/cpp/test/distance/dist_l2_unexp.cu b/cpp/tests/distance/dist_l2_unexp.cu similarity index 100% rename from cpp/test/distance/dist_l2_unexp.cu rename to cpp/tests/distance/dist_l2_unexp.cu diff --git a/cpp/test/distance/dist_l_inf.cu b/cpp/tests/distance/dist_l_inf.cu similarity index 100% rename from cpp/test/distance/dist_l_inf.cu rename to cpp/tests/distance/dist_l_inf.cu diff --git a/cpp/test/distance/dist_lp_unexp.cu b/cpp/tests/distance/dist_lp_unexp.cu similarity index 100% rename from cpp/test/distance/dist_lp_unexp.cu rename to cpp/tests/distance/dist_lp_unexp.cu diff --git a/cpp/test/distance/dist_russell_rao.cu b/cpp/tests/distance/dist_russell_rao.cu similarity index 100% rename from cpp/test/distance/dist_russell_rao.cu rename to cpp/tests/distance/dist_russell_rao.cu diff --git a/cpp/test/distance/distance_base.cuh b/cpp/tests/distance/distance_base.cuh similarity index 100% rename from cpp/test/distance/distance_base.cuh rename to cpp/tests/distance/distance_base.cuh diff --git a/cpp/test/distance/gram.cu b/cpp/tests/distance/gram.cu similarity index 100% rename from cpp/test/distance/gram.cu rename to cpp/tests/distance/gram.cu diff --git a/cpp/test/distance/gram_base.cuh b/cpp/tests/distance/gram_base.cuh similarity index 100% rename from cpp/test/distance/gram_base.cuh rename to cpp/tests/distance/gram_base.cuh diff --git a/cpp/test/distance/masked_nn.cu b/cpp/tests/distance/masked_nn.cu similarity index 100% rename from cpp/test/distance/masked_nn.cu rename to cpp/tests/distance/masked_nn.cu diff --git a/cpp/test/distance/pairwise_distance_c.cu b/cpp/tests/distance/pairwise_distance_c.cu similarity index 100% rename from cpp/test/distance/pairwise_distance_c.cu rename to cpp/tests/distance/pairwise_distance_c.cu diff --git a/cpp/test/distance/run_pairwise_distance_c.c b/cpp/tests/distance/run_pairwise_distance_c.c similarity index 100% rename from cpp/test/distance/run_pairwise_distance_c.c rename to cpp/tests/distance/run_pairwise_distance_c.c diff --git a/cpp/test/distance/sparse_distance.cu b/cpp/tests/distance/sparse_distance.cu similarity index 100% rename from cpp/test/distance/sparse_distance.cu rename to cpp/tests/distance/sparse_distance.cu diff --git a/cpp/test/neighbors/ann_brute_force.cuh b/cpp/tests/neighbors/ann_brute_force.cuh similarity index 100% rename from cpp/test/neighbors/ann_brute_force.cuh rename to cpp/tests/neighbors/ann_brute_force.cuh diff --git a/cpp/test/neighbors/ann_brute_force/test_float.cu b/cpp/tests/neighbors/ann_brute_force/test_float.cu similarity index 100% rename from cpp/test/neighbors/ann_brute_force/test_float.cu rename to cpp/tests/neighbors/ann_brute_force/test_float.cu diff --git a/cpp/test/neighbors/ann_brute_force/test_half.cu b/cpp/tests/neighbors/ann_brute_force/test_half.cu similarity index 100% rename from cpp/test/neighbors/ann_brute_force/test_half.cu rename to cpp/tests/neighbors/ann_brute_force/test_half.cu diff --git a/cpp/test/neighbors/ann_cagra.cuh b/cpp/tests/neighbors/ann_cagra.cuh similarity index 100% rename from cpp/test/neighbors/ann_cagra.cuh rename to cpp/tests/neighbors/ann_cagra.cuh diff --git a/cpp/test/neighbors/ann_cagra/bug_extreme_inputs_oob.cu b/cpp/tests/neighbors/ann_cagra/bug_extreme_inputs_oob.cu similarity index 100% rename from cpp/test/neighbors/ann_cagra/bug_extreme_inputs_oob.cu rename to cpp/tests/neighbors/ann_cagra/bug_extreme_inputs_oob.cu diff --git a/cpp/test/neighbors/ann_cagra/bug_multi_cta_crash.cu b/cpp/tests/neighbors/ann_cagra/bug_multi_cta_crash.cu similarity index 100% rename from cpp/test/neighbors/ann_cagra/bug_multi_cta_crash.cu rename to cpp/tests/neighbors/ann_cagra/bug_multi_cta_crash.cu diff --git a/cpp/test/neighbors/ann_cagra/test_float_uint32_t.cu b/cpp/tests/neighbors/ann_cagra/test_float_uint32_t.cu similarity index 100% rename from cpp/test/neighbors/ann_cagra/test_float_uint32_t.cu rename to cpp/tests/neighbors/ann_cagra/test_float_uint32_t.cu diff --git a/cpp/test/neighbors/ann_cagra/test_half_uint32_t.cu b/cpp/tests/neighbors/ann_cagra/test_half_uint32_t.cu similarity index 100% rename from cpp/test/neighbors/ann_cagra/test_half_uint32_t.cu rename to cpp/tests/neighbors/ann_cagra/test_half_uint32_t.cu diff --git a/cpp/test/neighbors/ann_cagra/test_int8_t_uint32_t.cu b/cpp/tests/neighbors/ann_cagra/test_int8_t_uint32_t.cu similarity index 100% rename from cpp/test/neighbors/ann_cagra/test_int8_t_uint32_t.cu rename to cpp/tests/neighbors/ann_cagra/test_int8_t_uint32_t.cu diff --git a/cpp/test/neighbors/ann_cagra/test_uint8_t_uint32_t.cu b/cpp/tests/neighbors/ann_cagra/test_uint8_t_uint32_t.cu similarity index 100% rename from cpp/test/neighbors/ann_cagra/test_uint8_t_uint32_t.cu rename to cpp/tests/neighbors/ann_cagra/test_uint8_t_uint32_t.cu diff --git a/cpp/test/neighbors/ann_cagra_c.cu b/cpp/tests/neighbors/ann_cagra_c.cu similarity index 100% rename from cpp/test/neighbors/ann_cagra_c.cu rename to cpp/tests/neighbors/ann_cagra_c.cu diff --git a/cpp/test/neighbors/ann_hnsw_c.cu b/cpp/tests/neighbors/ann_hnsw_c.cu similarity index 100% rename from cpp/test/neighbors/ann_hnsw_c.cu rename to cpp/tests/neighbors/ann_hnsw_c.cu diff --git a/cpp/test/neighbors/ann_ivf_flat.cuh b/cpp/tests/neighbors/ann_ivf_flat.cuh similarity index 100% rename from cpp/test/neighbors/ann_ivf_flat.cuh rename to cpp/tests/neighbors/ann_ivf_flat.cuh diff --git a/cpp/test/neighbors/ann_ivf_flat/test_float_int64_t.cu b/cpp/tests/neighbors/ann_ivf_flat/test_float_int64_t.cu similarity index 100% rename from cpp/test/neighbors/ann_ivf_flat/test_float_int64_t.cu rename to cpp/tests/neighbors/ann_ivf_flat/test_float_int64_t.cu diff --git a/cpp/test/neighbors/ann_ivf_flat/test_int8_t_int64_t.cu b/cpp/tests/neighbors/ann_ivf_flat/test_int8_t_int64_t.cu similarity index 100% rename from cpp/test/neighbors/ann_ivf_flat/test_int8_t_int64_t.cu rename to cpp/tests/neighbors/ann_ivf_flat/test_int8_t_int64_t.cu diff --git a/cpp/test/neighbors/ann_ivf_flat/test_uint8_t_int64_t.cu b/cpp/tests/neighbors/ann_ivf_flat/test_uint8_t_int64_t.cu similarity index 100% rename from cpp/test/neighbors/ann_ivf_flat/test_uint8_t_int64_t.cu rename to cpp/tests/neighbors/ann_ivf_flat/test_uint8_t_int64_t.cu diff --git a/cpp/test/neighbors/ann_ivf_flat_c.cu b/cpp/tests/neighbors/ann_ivf_flat_c.cu similarity index 100% rename from cpp/test/neighbors/ann_ivf_flat_c.cu rename to cpp/tests/neighbors/ann_ivf_flat_c.cu diff --git a/cpp/test/neighbors/ann_ivf_pq.cuh b/cpp/tests/neighbors/ann_ivf_pq.cuh similarity index 100% rename from cpp/test/neighbors/ann_ivf_pq.cuh rename to cpp/tests/neighbors/ann_ivf_pq.cuh diff --git a/cpp/test/neighbors/ann_ivf_pq/test_float_int64_t.cu b/cpp/tests/neighbors/ann_ivf_pq/test_float_int64_t.cu similarity index 100% rename from cpp/test/neighbors/ann_ivf_pq/test_float_int64_t.cu rename to cpp/tests/neighbors/ann_ivf_pq/test_float_int64_t.cu diff --git a/cpp/test/neighbors/ann_ivf_pq/test_int8_t_int64_t.cu b/cpp/tests/neighbors/ann_ivf_pq/test_int8_t_int64_t.cu similarity index 100% rename from cpp/test/neighbors/ann_ivf_pq/test_int8_t_int64_t.cu rename to cpp/tests/neighbors/ann_ivf_pq/test_int8_t_int64_t.cu diff --git a/cpp/test/neighbors/ann_ivf_pq/test_uint8_t_int64_t.cu b/cpp/tests/neighbors/ann_ivf_pq/test_uint8_t_int64_t.cu similarity index 100% rename from cpp/test/neighbors/ann_ivf_pq/test_uint8_t_int64_t.cu rename to cpp/tests/neighbors/ann_ivf_pq/test_uint8_t_int64_t.cu diff --git a/cpp/test/neighbors/ann_ivf_pq_c.cu b/cpp/tests/neighbors/ann_ivf_pq_c.cu similarity index 100% rename from cpp/test/neighbors/ann_ivf_pq_c.cu rename to cpp/tests/neighbors/ann_ivf_pq_c.cu diff --git a/cpp/test/neighbors/ann_nn_descent.cuh b/cpp/tests/neighbors/ann_nn_descent.cuh similarity index 100% rename from cpp/test/neighbors/ann_nn_descent.cuh rename to cpp/tests/neighbors/ann_nn_descent.cuh diff --git a/cpp/test/neighbors/ann_nn_descent/test_float_uint32_t.cu b/cpp/tests/neighbors/ann_nn_descent/test_float_uint32_t.cu similarity index 100% rename from cpp/test/neighbors/ann_nn_descent/test_float_uint32_t.cu rename to cpp/tests/neighbors/ann_nn_descent/test_float_uint32_t.cu diff --git a/cpp/test/neighbors/ann_nn_descent/test_int8_t_uint32_t.cu b/cpp/tests/neighbors/ann_nn_descent/test_int8_t_uint32_t.cu similarity index 100% rename from cpp/test/neighbors/ann_nn_descent/test_int8_t_uint32_t.cu rename to cpp/tests/neighbors/ann_nn_descent/test_int8_t_uint32_t.cu diff --git a/cpp/test/neighbors/ann_nn_descent/test_uint8_t_uint32_t.cu b/cpp/tests/neighbors/ann_nn_descent/test_uint8_t_uint32_t.cu similarity index 100% rename from cpp/test/neighbors/ann_nn_descent/test_uint8_t_uint32_t.cu rename to cpp/tests/neighbors/ann_nn_descent/test_uint8_t_uint32_t.cu diff --git a/cpp/test/neighbors/ann_utils.cuh b/cpp/tests/neighbors/ann_utils.cuh similarity index 100% rename from cpp/test/neighbors/ann_utils.cuh rename to cpp/tests/neighbors/ann_utils.cuh diff --git a/cpp/test/neighbors/ann_vamana.cuh b/cpp/tests/neighbors/ann_vamana.cuh similarity index 100% rename from cpp/test/neighbors/ann_vamana.cuh rename to cpp/tests/neighbors/ann_vamana.cuh diff --git a/cpp/test/neighbors/ann_vamana/test_float_uint32_t.cu b/cpp/tests/neighbors/ann_vamana/test_float_uint32_t.cu similarity index 100% rename from cpp/test/neighbors/ann_vamana/test_float_uint32_t.cu rename to cpp/tests/neighbors/ann_vamana/test_float_uint32_t.cu diff --git a/cpp/test/neighbors/ann_vamana/test_int8_t_uint32_t.cu b/cpp/tests/neighbors/ann_vamana/test_int8_t_uint32_t.cu similarity index 100% rename from cpp/test/neighbors/ann_vamana/test_int8_t_uint32_t.cu rename to cpp/tests/neighbors/ann_vamana/test_int8_t_uint32_t.cu diff --git a/cpp/test/neighbors/ann_vamana/test_uint8_t_uint32_t.cu b/cpp/tests/neighbors/ann_vamana/test_uint8_t_uint32_t.cu similarity index 100% rename from cpp/test/neighbors/ann_vamana/test_uint8_t_uint32_t.cu rename to cpp/tests/neighbors/ann_vamana/test_uint8_t_uint32_t.cu diff --git a/cpp/test/neighbors/brute_force.cu b/cpp/tests/neighbors/brute_force.cu similarity index 100% rename from cpp/test/neighbors/brute_force.cu rename to cpp/tests/neighbors/brute_force.cu diff --git a/cpp/test/neighbors/brute_force_c.cu b/cpp/tests/neighbors/brute_force_c.cu similarity index 100% rename from cpp/test/neighbors/brute_force_c.cu rename to cpp/tests/neighbors/brute_force_c.cu diff --git a/cpp/test/neighbors/brute_force_prefiltered.cu b/cpp/tests/neighbors/brute_force_prefiltered.cu similarity index 100% rename from cpp/test/neighbors/brute_force_prefiltered.cu rename to cpp/tests/neighbors/brute_force_prefiltered.cu diff --git a/cpp/test/neighbors/c_api.c b/cpp/tests/neighbors/c_api.c similarity index 100% rename from cpp/test/neighbors/c_api.c rename to cpp/tests/neighbors/c_api.c diff --git a/cpp/test/neighbors/dynamic_batching.cuh b/cpp/tests/neighbors/dynamic_batching.cuh similarity index 100% rename from cpp/test/neighbors/dynamic_batching.cuh rename to cpp/tests/neighbors/dynamic_batching.cuh diff --git a/cpp/test/neighbors/dynamic_batching/test_brute_force.cu b/cpp/tests/neighbors/dynamic_batching/test_brute_force.cu similarity index 100% rename from cpp/test/neighbors/dynamic_batching/test_brute_force.cu rename to cpp/tests/neighbors/dynamic_batching/test_brute_force.cu diff --git a/cpp/test/neighbors/dynamic_batching/test_cagra.cu b/cpp/tests/neighbors/dynamic_batching/test_cagra.cu similarity index 100% rename from cpp/test/neighbors/dynamic_batching/test_cagra.cu rename to cpp/tests/neighbors/dynamic_batching/test_cagra.cu diff --git a/cpp/test/neighbors/dynamic_batching/test_ivf_flat.cu b/cpp/tests/neighbors/dynamic_batching/test_ivf_flat.cu similarity index 100% rename from cpp/test/neighbors/dynamic_batching/test_ivf_flat.cu rename to cpp/tests/neighbors/dynamic_batching/test_ivf_flat.cu diff --git a/cpp/test/neighbors/dynamic_batching/test_ivf_pq.cu b/cpp/tests/neighbors/dynamic_batching/test_ivf_pq.cu similarity index 100% rename from cpp/test/neighbors/dynamic_batching/test_ivf_pq.cu rename to cpp/tests/neighbors/dynamic_batching/test_ivf_pq.cu diff --git a/cpp/test/neighbors/hnsw.cu b/cpp/tests/neighbors/hnsw.cu similarity index 100% rename from cpp/test/neighbors/hnsw.cu rename to cpp/tests/neighbors/hnsw.cu diff --git a/cpp/test/neighbors/knn_utils.cuh b/cpp/tests/neighbors/knn_utils.cuh similarity index 100% rename from cpp/test/neighbors/knn_utils.cuh rename to cpp/tests/neighbors/knn_utils.cuh diff --git a/cpp/test/neighbors/mg.cuh b/cpp/tests/neighbors/mg.cuh similarity index 100% rename from cpp/test/neighbors/mg.cuh rename to cpp/tests/neighbors/mg.cuh diff --git a/cpp/test/neighbors/mg/test_float.cu b/cpp/tests/neighbors/mg/test_float.cu similarity index 100% rename from cpp/test/neighbors/mg/test_float.cu rename to cpp/tests/neighbors/mg/test_float.cu diff --git a/cpp/test/neighbors/naive_knn.cuh b/cpp/tests/neighbors/naive_knn.cuh similarity index 100% rename from cpp/test/neighbors/naive_knn.cuh rename to cpp/tests/neighbors/naive_knn.cuh diff --git a/cpp/test/neighbors/refine.cu b/cpp/tests/neighbors/refine.cu similarity index 100% rename from cpp/test/neighbors/refine.cu rename to cpp/tests/neighbors/refine.cu diff --git a/cpp/test/neighbors/refine_helper.cuh b/cpp/tests/neighbors/refine_helper.cuh similarity index 100% rename from cpp/test/neighbors/refine_helper.cuh rename to cpp/tests/neighbors/refine_helper.cuh diff --git a/cpp/test/neighbors/run_brute_force_c.c b/cpp/tests/neighbors/run_brute_force_c.c similarity index 100% rename from cpp/test/neighbors/run_brute_force_c.c rename to cpp/tests/neighbors/run_brute_force_c.c diff --git a/cpp/test/neighbors/run_ivf_flat_c.c b/cpp/tests/neighbors/run_ivf_flat_c.c similarity index 100% rename from cpp/test/neighbors/run_ivf_flat_c.c rename to cpp/tests/neighbors/run_ivf_flat_c.c diff --git a/cpp/test/neighbors/run_ivf_pq_c.c b/cpp/tests/neighbors/run_ivf_pq_c.c similarity index 100% rename from cpp/test/neighbors/run_ivf_pq_c.c rename to cpp/tests/neighbors/run_ivf_pq_c.c diff --git a/cpp/test/neighbors/sparse_brute_force.cu b/cpp/tests/neighbors/sparse_brute_force.cu similarity index 100% rename from cpp/test/neighbors/sparse_brute_force.cu rename to cpp/tests/neighbors/sparse_brute_force.cu diff --git a/cpp/test/preprocessing/scalar_quantization.cu b/cpp/tests/preprocessing/scalar_quantization.cu similarity index 100% rename from cpp/test/preprocessing/scalar_quantization.cu rename to cpp/tests/preprocessing/scalar_quantization.cu diff --git a/cpp/test/sparse/cluster/cluster_solvers.cu b/cpp/tests/sparse/cluster/cluster_solvers.cu similarity index 100% rename from cpp/test/sparse/cluster/cluster_solvers.cu rename to cpp/tests/sparse/cluster/cluster_solvers.cu diff --git a/cpp/test/sparse/cluster/eigen_solvers.cu b/cpp/tests/sparse/cluster/eigen_solvers.cu similarity index 100% rename from cpp/test/sparse/cluster/eigen_solvers.cu rename to cpp/tests/sparse/cluster/eigen_solvers.cu diff --git a/cpp/test/sparse/cluster/spectral.cu b/cpp/tests/sparse/cluster/spectral.cu similarity index 100% rename from cpp/test/sparse/cluster/spectral.cu rename to cpp/tests/sparse/cluster/spectral.cu diff --git a/cpp/test/sparse/cluster/spectral_matrix.cu b/cpp/tests/sparse/cluster/spectral_matrix.cu similarity index 100% rename from cpp/test/sparse/cluster/spectral_matrix.cu rename to cpp/tests/sparse/cluster/spectral_matrix.cu diff --git a/cpp/test/sparse/gram.cu b/cpp/tests/sparse/gram.cu similarity index 100% rename from cpp/test/sparse/gram.cu rename to cpp/tests/sparse/gram.cu diff --git a/cpp/test/sparse/neighbors/cross_component_nn.cu b/cpp/tests/sparse/neighbors/cross_component_nn.cu similarity index 100% rename from cpp/test/sparse/neighbors/cross_component_nn.cu rename to cpp/tests/sparse/neighbors/cross_component_nn.cu diff --git a/cpp/test/stats/silhouette_score.cu b/cpp/tests/stats/silhouette_score.cu similarity index 100% rename from cpp/test/stats/silhouette_score.cu rename to cpp/tests/stats/silhouette_score.cu diff --git a/cpp/test/stats/trustworthiness.cu b/cpp/tests/stats/trustworthiness.cu similarity index 100% rename from cpp/test/stats/trustworthiness.cu rename to cpp/tests/stats/trustworthiness.cu diff --git a/cpp/test/test.cpp b/cpp/tests/test.cpp similarity index 100% rename from cpp/test/test.cpp rename to cpp/tests/test.cpp diff --git a/cpp/test/test_utils.cuh b/cpp/tests/test_utils.cuh similarity index 100% rename from cpp/test/test_utils.cuh rename to cpp/tests/test_utils.cuh diff --git a/cpp/test/test_utils.h b/cpp/tests/test_utils.h similarity index 100% rename from cpp/test/test_utils.h rename to cpp/tests/test_utils.h diff --git a/docs/source/developer_guide.md b/docs/source/developer_guide.md index 4fdd6405e..daba99b93 100644 --- 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 b/python/cuvs/cuvs/tests/__init__py similarity index 100% rename from python/cuvs/cuvs/test/__init__py rename to python/cuvs/cuvs/tests/__init__py diff --git a/python/cuvs/cuvs/test/ann_utils.py b/python/cuvs/cuvs/tests/ann_utils.py similarity index 100% rename from python/cuvs/cuvs/test/ann_utils.py rename to python/cuvs/cuvs/tests/ann_utils.py diff --git a/python/cuvs/cuvs/test/conftest.py b/python/cuvs/cuvs/tests/conftest.py similarity index 100% rename from python/cuvs/cuvs/test/conftest.py rename to python/cuvs/cuvs/tests/conftest.py diff --git a/python/cuvs/cuvs/test/test_brute_force.py b/python/cuvs/cuvs/tests/test_brute_force.py similarity index 100% rename from python/cuvs/cuvs/test/test_brute_force.py rename to python/cuvs/cuvs/tests/test_brute_force.py diff --git a/python/cuvs/cuvs/test/test_cagra.py b/python/cuvs/cuvs/tests/test_cagra.py similarity index 99% rename from python/cuvs/cuvs/test/test_cagra.py rename to python/cuvs/cuvs/tests/test_cagra.py index 9efd48923..ab3ac4a37 100644 --- a/python/cuvs/cuvs/test/test_cagra.py +++ b/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 b/python/cuvs/cuvs/tests/test_distance.py similarity index 100% rename from python/cuvs/cuvs/test/test_distance.py rename to python/cuvs/cuvs/tests/test_distance.py diff --git a/python/cuvs/cuvs/test/test_doctests.py b/python/cuvs/cuvs/tests/test_doctests.py similarity index 100% rename from python/cuvs/cuvs/test/test_doctests.py rename to python/cuvs/cuvs/tests/test_doctests.py diff --git a/python/cuvs/cuvs/test/test_hnsw.py b/python/cuvs/cuvs/tests/test_hnsw.py similarity index 98% rename from python/cuvs/cuvs/test/test_hnsw.py rename to python/cuvs/cuvs/tests/test_hnsw.py index 20f583ae8..e00b88bb7 100644 --- a/python/cuvs/cuvs/test/test_hnsw.py +++ b/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 b/python/cuvs/cuvs/tests/test_ivf_flat.py similarity index 98% rename from python/cuvs/cuvs/test/test_ivf_flat.py rename to python/cuvs/cuvs/tests/test_ivf_flat.py index 9dd4097dc..c3ec0252a 100644 --- a/python/cuvs/cuvs/test/test_ivf_flat.py +++ b/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 b/python/cuvs/cuvs/tests/test_ivf_pq.py similarity index 98% rename from python/cuvs/cuvs/test/test_ivf_pq.py rename to python/cuvs/cuvs/tests/test_ivf_pq.py index dff65b18c..6661be7de 100644 --- a/python/cuvs/cuvs/test/test_ivf_pq.py +++ b/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 b/python/cuvs/cuvs/tests/test_refine.py similarity index 100% rename from python/cuvs/cuvs/test/test_refine.py rename to python/cuvs/cuvs/tests/test_refine.py diff --git a/python/cuvs/cuvs/test/test_scalar_quantizer.py b/python/cuvs/cuvs/tests/test_scalar_quantizer.py similarity index 100% rename from python/cuvs/cuvs/test/test_scalar_quantizer.py rename to python/cuvs/cuvs/tests/test_scalar_quantizer.py diff --git a/python/cuvs/cuvs/test/test_serialization.py b/python/cuvs/cuvs/tests/test_serialization.py similarity index 98% rename from python/cuvs/cuvs/test/test_serialization.py rename to python/cuvs/cuvs/tests/test_serialization.py index 1f4a54e87..dafaed4c7 100644 --- a/python/cuvs/cuvs/test/test_serialization.py +++ b/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 b/python/cuvs/cuvs/tests/test_version.py similarity index 100% rename from python/cuvs/cuvs/test/test_version.py rename to python/cuvs/cuvs/tests/test_version.py