From faa6ec88c0db2a370f08e6488b343e4693e03c98 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 23 Feb 2026 10:50:46 -0500 Subject: [PATCH 1/4] Move `test_compute_matrix_product.py` to `cpp/tests` Follow-up to https://github.com/rapidsai/cuvs/pull/1812 --- ci/test_cpp.sh | 10 ++++++++-- conda/environments/all_cuda-129_arch-aarch64.yaml | 1 + conda/environments/all_cuda-129_arch-x86_64.yaml | 1 + conda/environments/all_cuda-131_arch-aarch64.yaml | 1 + conda/environments/all_cuda-131_arch-x86_64.yaml | 1 + .../tests/python}/test_compute_matrix_product.py | 0 dependencies.yaml | 1 + 7 files changed, 13 insertions(+), 2 deletions(-) rename {python/cuvs/cuvs/tests => cpp/tests/python}/test_compute_matrix_product.py (100%) diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index d1a1d2d5f4..5b7a393f31 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION. +# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION. # SPDX-License-Identifier: Apache-2.0 set -euo pipefail @@ -43,9 +43,15 @@ EXITCODE=0 trap "EXITCODE=1" ERR set +e +# Run Python build utilities tests +rapids-logger "Run libcuvs Python build utilities tests" +pytest cpp/tests/python + # Run libcuvs gtests from libcuvs-tests package -cd "$CONDA_PREFIX"/bin/gtests/libcuvs +rapids-logger "Run libcuvs tests" +pushd "$CONDA_PREFIX"/bin/gtests/libcuvs ctest -j8 --output-on-failure +popd rapids-logger "Test script exiting with value: $EXITCODE" exit ${EXITCODE} diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index 066fff2fa5..d641c42768 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -40,6 +40,7 @@ dependencies: - openblas - pre-commit - pylibraft==26.4.*,>=0.0.0a0 +- pytest - pytest-cov - pytest<9.0.0 - rapids-build-backend>=0.4.0,<0.5.0 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index 352623d9d2..c2a2c69340 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -40,6 +40,7 @@ dependencies: - openblas - pre-commit - pylibraft==26.4.*,>=0.0.0a0 +- pytest - pytest-cov - pytest<9.0.0 - rapids-build-backend>=0.4.0,<0.5.0 diff --git a/conda/environments/all_cuda-131_arch-aarch64.yaml b/conda/environments/all_cuda-131_arch-aarch64.yaml index ca42510723..0a10faefcd 100644 --- a/conda/environments/all_cuda-131_arch-aarch64.yaml +++ b/conda/environments/all_cuda-131_arch-aarch64.yaml @@ -41,6 +41,7 @@ dependencies: - openblas - pre-commit - pylibraft==26.4.*,>=0.0.0a0 +- pytest - pytest-cov - pytest<9.0.0 - rapids-build-backend>=0.4.0,<0.5.0 diff --git a/conda/environments/all_cuda-131_arch-x86_64.yaml b/conda/environments/all_cuda-131_arch-x86_64.yaml index a5261a38dc..c1f6977d08 100644 --- a/conda/environments/all_cuda-131_arch-x86_64.yaml +++ b/conda/environments/all_cuda-131_arch-x86_64.yaml @@ -41,6 +41,7 @@ dependencies: - openblas - pre-commit - pylibraft==26.4.*,>=0.0.0a0 +- pytest - pytest-cov - pytest<9.0.0 - rapids-build-backend>=0.4.0,<0.5.0 diff --git a/python/cuvs/cuvs/tests/test_compute_matrix_product.py b/cpp/tests/python/test_compute_matrix_product.py similarity index 100% rename from python/cuvs/cuvs/tests/test_compute_matrix_product.py rename to cpp/tests/python/test_compute_matrix_product.py diff --git a/dependencies.yaml b/dependencies.yaml index 10aabd4dc0..2c72a2e9dd 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -382,6 +382,7 @@ dependencies: packages: - *cmake_ver - openblas + - pytest docs: common: - output_types: [conda] From cbc77214d537c7244195b3e70f18ce51992706d4 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 23 Feb 2026 11:29:38 -0500 Subject: [PATCH 2/4] fix path --- cpp/tests/python/test_compute_matrix_product.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/tests/python/test_compute_matrix_product.py b/cpp/tests/python/test_compute_matrix_product.py index 7ed54276ff..81b6b13bc2 100644 --- a/cpp/tests/python/test_compute_matrix_product.py +++ b/cpp/tests/python/test_compute_matrix_product.py @@ -17,7 +17,7 @@ compute_matrix_product_script = runpy.run_path( str( pathlib.Path(__file__).parent - / "../../../../cpp/cmake/modules/compute_matrix_product.py" + / "../../cmake/modules/compute_matrix_product.py" ) ) From 4693179d9782ed30e257d194ad663188214dc704 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 23 Feb 2026 11:30:08 -0500 Subject: [PATCH 3/4] pre-commit --- .pre-commit-config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4578f1db1b..28546f8332 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,7 +31,8 @@ repos: additional_dependencies: [types-cachetools] args: ["--config-file=pyproject.toml", "python/cuvs/cuvs", - "cpp/cmake/modules"] + "cpp/cmake/modules", + "cpp/tests/python"] pass_filenames: false - repo: https://github.com/PyCQA/pydocstyle rev: 6.1.1 From 38d12c5a075a2a01759f4bda78345ee24b06ac62 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 23 Feb 2026 12:13:14 -0500 Subject: [PATCH 4/4] Review feedback --- conda/environments/all_cuda-129_arch-aarch64.yaml | 1 - conda/environments/all_cuda-129_arch-x86_64.yaml | 1 - conda/environments/all_cuda-131_arch-aarch64.yaml | 1 - conda/environments/all_cuda-131_arch-x86_64.yaml | 1 - dependencies.yaml | 4 ++-- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index d641c42768..066fff2fa5 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -40,7 +40,6 @@ dependencies: - openblas - pre-commit - pylibraft==26.4.*,>=0.0.0a0 -- pytest - pytest-cov - pytest<9.0.0 - rapids-build-backend>=0.4.0,<0.5.0 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index c2a2c69340..352623d9d2 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -40,7 +40,6 @@ dependencies: - openblas - pre-commit - pylibraft==26.4.*,>=0.0.0a0 -- pytest - pytest-cov - pytest<9.0.0 - rapids-build-backend>=0.4.0,<0.5.0 diff --git a/conda/environments/all_cuda-131_arch-aarch64.yaml b/conda/environments/all_cuda-131_arch-aarch64.yaml index 0a10faefcd..ca42510723 100644 --- a/conda/environments/all_cuda-131_arch-aarch64.yaml +++ b/conda/environments/all_cuda-131_arch-aarch64.yaml @@ -41,7 +41,6 @@ dependencies: - openblas - pre-commit - pylibraft==26.4.*,>=0.0.0a0 -- pytest - pytest-cov - pytest<9.0.0 - rapids-build-backend>=0.4.0,<0.5.0 diff --git a/conda/environments/all_cuda-131_arch-x86_64.yaml b/conda/environments/all_cuda-131_arch-x86_64.yaml index c1f6977d08..a5261a38dc 100644 --- a/conda/environments/all_cuda-131_arch-x86_64.yaml +++ b/conda/environments/all_cuda-131_arch-x86_64.yaml @@ -41,7 +41,6 @@ dependencies: - openblas - pre-commit - pylibraft==26.4.*,>=0.0.0a0 -- pytest - pytest-cov - pytest<9.0.0 - rapids-build-backend>=0.4.0,<0.5.0 diff --git a/dependencies.yaml b/dependencies.yaml index 2c72a2e9dd..329265aae1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -382,7 +382,7 @@ dependencies: packages: - *cmake_ver - openblas - - pytest + - &pytest pytest<9.0.0 docs: common: - output_types: [conda] @@ -445,7 +445,7 @@ dependencies: common: - output_types: [conda, requirements, pyproject] packages: - - pytest<9.0.0 + - *pytest - pytest-cov test_py_cuvs: common: