diff --git a/ci/test_wheel_raft_dask.sh b/ci/test_wheel_raft_dask.sh index bd531e7e85..9b1187592d 100755 --- a/ci/test_wheel_raft_dask.sh +++ b/ci/test_wheel_raft_dask.sh @@ -11,7 +11,8 @@ RAPIDS_PY_WHEEL_NAME="raft_dask_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-pylibraft-dep python -m pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl -python -m pip install "raft_dask-${RAPIDS_PY_CUDA_SUFFIX}[test]>=0.0.0a0" --find-links dist/ +# echo to expand wildcard before adding `[extra]` requires for pip +python -m pip install -v "$(echo ./dist/raft_dask_${RAPIDS_PY_CUDA_SUFFIX}*.whl)[test]" test_dir="python/raft-dask/raft_dask/test" diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index 2fad2e103d..0ea75b58c8 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -21,7 +21,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - dask-cuda==24.8.*,>=0.0.0a0 -- distributed-ucxx==0.39.* +- distributed-ucxx==0.39.*,>=0.0.0a0 - doxygen>=1.8.20 - gcc_linux-aarch64=11.* - graphviz @@ -44,6 +44,7 @@ dependencies: - nvcc_linux-aarch64=11.8 - pre-commit - pydata-sphinx-theme +- pylibraft==24.8.*,>=0.0.0a0 - pytest-cov - pytest==7.* - rapids-build-backend>=0.3.0,<0.4.0.dev0 @@ -56,5 +57,5 @@ dependencies: - sphinx-copybutton - sphinx-markdown-tables - sysroot_linux-aarch64==2.17 -- ucx-py==0.39.* +- ucx-py==0.39.*,>=0.0.0a0 name: all_cuda-118_arch-aarch64 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index b141ebd7e0..5497c2a7c2 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -21,7 +21,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - dask-cuda==24.8.*,>=0.0.0a0 -- distributed-ucxx==0.39.* +- distributed-ucxx==0.39.*,>=0.0.0a0 - doxygen>=1.8.20 - gcc_linux-64=11.* - graphviz @@ -44,6 +44,7 @@ dependencies: - nvcc_linux-64=11.8 - pre-commit - pydata-sphinx-theme +- pylibraft==24.8.*,>=0.0.0a0 - pytest-cov - pytest==7.* - rapids-build-backend>=0.3.0,<0.4.0.dev0 @@ -56,5 +57,5 @@ dependencies: - sphinx-copybutton - sphinx-markdown-tables - sysroot_linux-64==2.17 -- ucx-py==0.39.* +- ucx-py==0.39.*,>=0.0.0a0 name: all_cuda-118_arch-x86_64 diff --git a/conda/environments/all_cuda-122_arch-aarch64.yaml b/conda/environments/all_cuda-122_arch-aarch64.yaml index 9333930e01..632ff471b4 100644 --- a/conda/environments/all_cuda-122_arch-aarch64.yaml +++ b/conda/environments/all_cuda-122_arch-aarch64.yaml @@ -22,7 +22,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - dask-cuda==24.8.*,>=0.0.0a0 -- distributed-ucxx==0.39.* +- distributed-ucxx==0.39.*,>=0.0.0a0 - doxygen>=1.8.20 - gcc_linux-aarch64=11.* - graphviz @@ -40,6 +40,7 @@ dependencies: - numpydoc - pre-commit - pydata-sphinx-theme +- pylibraft==24.8.*,>=0.0.0a0 - pytest-cov - pytest==7.* - rapids-build-backend>=0.3.0,<0.4.0.dev0 @@ -52,5 +53,5 @@ dependencies: - sphinx-copybutton - sphinx-markdown-tables - sysroot_linux-aarch64==2.17 -- ucx-py==0.39.* +- ucx-py==0.39.*,>=0.0.0a0 name: all_cuda-122_arch-aarch64 diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index e209b5b046..a7d59b4a5f 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -22,7 +22,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - dask-cuda==24.8.*,>=0.0.0a0 -- distributed-ucxx==0.39.* +- distributed-ucxx==0.39.*,>=0.0.0a0 - doxygen>=1.8.20 - gcc_linux-64=11.* - graphviz @@ -40,6 +40,7 @@ dependencies: - numpydoc - pre-commit - pydata-sphinx-theme +- pylibraft==24.8.*,>=0.0.0a0 - pytest-cov - pytest==7.* - rapids-build-backend>=0.3.0,<0.4.0.dev0 @@ -52,5 +53,5 @@ dependencies: - sphinx-copybutton - sphinx-markdown-tables - sysroot_linux-64==2.17 -- ucx-py==0.39.* +- ucx-py==0.39.*,>=0.0.0a0 name: all_cuda-122_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 363d2588e1..b0e5706a7f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -475,13 +475,10 @@ dependencies: - numba>=0.57 - *numpy - rapids-dask-dependency==24.8.*,>=0.0.0a0 - - ucx-py==0.39.* - output_types: conda - packages: - - &ucx_py_conda ucx-py==0.39.* - - output_types: pyproject packages: - &pylibraft_conda pylibraft==24.8.*,>=0.0.0a0 + - &ucx_py_conda ucx-py==0.39.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -494,11 +491,11 @@ dependencies: - matrix: {cuda: "12.*"} packages: - &pylibraft_cu12 pylibraft-cu12==24.8.*,>=0.0.0a0 - - &ucx_py_cu12 ucx-py-cu12==0.39.* + - &ucx_py_cu12 ucx-py-cu12==0.39.*,>=0.0.0a0 - matrix: {cuda: "11.*"} packages: - &pylibraft_cu11 pylibraft-cu11==24.8.*,>=0.0.0a0 - - &ucx_py_cu11 ucx-py-cu11==0.39.* + - &ucx_py_cu11 ucx-py-cu11==0.39.*,>=0.0.0a0 - {matrix: null, packages: [*pylibraft_conda, *ucx_py_conda]} test_python_common: common: @@ -518,7 +515,7 @@ dependencies: packages: # UCXX is not currently a hard-dependency thus only installed during tests, # this will change in the future. - - &distributed_ucxx_conda distributed-ucxx==0.39.* + - &distributed_ucxx_conda distributed-ucxx==0.39.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -529,10 +526,10 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - distributed-ucxx-cu12==0.39.* + - distributed-ucxx-cu12==0.39.*,>=0.0.0a0 - matrix: {cuda: "11.*"} packages: - - distributed-ucxx-cu11==0.39.* + - distributed-ucxx-cu11==0.39.*,>=0.0.0a0 - {matrix: null, packages: [*distributed_ucxx_conda]} depends_on_ucx_build: common: diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index f3d5acacac..64bec455e4 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -32,13 +32,13 @@ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ "dask-cuda==24.8.*,>=0.0.0a0", - "distributed-ucxx==0.39.*", + "distributed-ucxx==0.39.*,>=0.0.0a0", "joblib>=0.11", "numba>=0.57", "numpy>=1.23,<2.0a0", "pylibraft==24.8.*,>=0.0.0a0", "rapids-dask-dependency==24.8.*,>=0.0.0a0", - "ucx-py==0.39.*", + "ucx-py==0.39.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers",