diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index 86eef035cd..9f473b1890 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -35,9 +35,13 @@ rapids-logger "pytest cuml single GPU" -k 'test_sparse_pca_inputs' \ --junitxml="${RAPIDS_TESTS_DIR}/junit-cuml-sparse-pca.xml" -rapids-logger "pytest cuml-dask" -./ci/run_cuml_dask_pytests.sh \ - --junitxml="${RAPIDS_TESTS_DIR}/junit-cuml-dask.xml" +# Temporarily disabled for CUDA 12.x wheels. +# Reference issue: https://github.com/rapidsai/cuml/issues/6050 +if [[ "${RAPIDS_PY_CUDA_SUFFIX}" == "cu11" ]]; then + rapids-logger "pytest cuml-dask" + ./ci/run_cuml_dask_pytests.sh \ + --junitxml="${RAPIDS_TESTS_DIR}/junit-cuml-dask.xml" +fi rapids-logger "Test script exiting with value: $EXITCODE" exit ${EXITCODE} diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 73cfd8f1e0..363ce4f13e 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -45,13 +45,14 @@ dependencies: - ninja - nltk - numba>=0.57 +- numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-64=11.8 - packaging - pip - pydata-sphinx-theme!=0.14.2 - pylibraft==24.10.*,>=0.0.0a0 -- pynndescent==0.5.8 +- pynndescent - pytest-benchmark - pytest-cases - pytest-cov diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 43bf7117b3..b70186deab 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -42,12 +42,13 @@ dependencies: - ninja - nltk - numba>=0.57 +- numpy>=1.23,<3.0a0 - numpydoc - packaging - pip - pydata-sphinx-theme!=0.14.2 - pylibraft==24.10.*,>=0.0.0a0 -- pynndescent==0.5.8 +- pynndescent - pytest-benchmark - pytest-cases - pytest-cov diff --git a/conda/recipes/cuml-cpu/meta.yaml b/conda/recipes/cuml-cpu/meta.yaml index 09686ff9dd..bf59fed151 100644 --- a/conda/recipes/cuml-cpu/meta.yaml +++ b/conda/recipes/cuml-cpu/meta.yaml @@ -31,7 +31,7 @@ requirements: - rapids-build-backend>=0.3.0,<0.4.0.dev0 run: - python x.x - - numpy>=1.23,<2.0a0 + - numpy>=1.23,<3.0a0 - pandas - scikit-learn=1.2 - hdbscan>=0.8.38,<0.8.39 diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index bca0b0378c..74ba26ea14 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -85,6 +85,7 @@ requirements: - joblib >=0.11 - libcuml ={{ version }} - libcumlprims ={{ minor_version }} + - numpy >=1.23,<3.0a0 - pylibraft ={{ minor_version }} - python x.x - raft-dask ={{ minor_version }} diff --git a/dependencies.yaml b/dependencies.yaml index 1c8afd0a81..e3a045efea 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -229,6 +229,7 @@ dependencies: - dask-cuda==24.10.*,>=0.0.0a0 - joblib>=0.11 - numba>=0.57 + - numpy>=1.23,<3.0a0 # TODO: Is scipy really a hard dependency, or should # we make it optional (i.e. an extra for pip # installation/run_constrained for conda)? @@ -509,7 +510,7 @@ dependencies: - *scikit_learn - statsmodels - umap-learn==0.5.3 - - pynndescent==0.5.8 + - pynndescent - output_types: conda packages: - pip diff --git a/python/cuml/cuml/neighbors/CMakeLists.txt b/python/cuml/cuml/neighbors/CMakeLists.txt index 2938fac779..dbb23550aa 100644 --- a/python/cuml/cuml/neighbors/CMakeLists.txt +++ b/python/cuml/cuml/neighbors/CMakeLists.txt @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -34,7 +34,3 @@ rapids_cython_create_modules( MODULE_PREFIX neighbors_ ASSOCIATED_TARGETS cuml ) - -foreach(target IN LISTS targets_using_numpy) - target_include_directories(${target} PRIVATE "${Python_NumPy_INCLUDE_DIRS}") -endforeach() diff --git a/python/cuml/pyproject.toml b/python/cuml/pyproject.toml index 357f427bff..4149c721ce 100644 --- a/python/cuml/pyproject.toml +++ b/python/cuml/pyproject.toml @@ -86,6 +86,7 @@ dependencies = [ "dask-cudf==24.10.*,>=0.0.0a0", "joblib>=0.11", "numba>=0.57", + "numpy>=1.23,<3.0a0", "nvidia-cublas", "nvidia-cufft", "nvidia-curand", @@ -115,7 +116,7 @@ test = [ "hypothesis>=6.0,<7", "nltk", "numpydoc", - "pynndescent==0.5.8", + "pynndescent", "pytest-benchmark", "pytest-cases", "pytest-cov",