Skip to content

Commit

Permalink
Fix cupy dependency in pyproject.toml (#5705)
Browse files Browse the repository at this point in the history
The cupy dependency in pyproject.toml is currently wrong due to changes made in the devcontainers PR. Unlike in conda environments where simultaneous installation of both pip and conda cupy results in coexistence followed by clobbering at import time, since this approach results in two pip installations (one wheel and one from source) one simply overwrites the other, so we haven't seen serious issues yet. The only manifestation at present is slower CI due to cupy being compiled during the wheel builds.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: #5705
  • Loading branch information
vyasr authored Dec 20, 2023
1 parent 546bcb5 commit b8daf81
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ dependencies:
- matrix: {cuda: "11.8"}
packages: &py_run_packages_cu11
- cudf-cu11==24.2.*
- cupy-cuda11x>=12.0.0
- &cupy_pyproject_cu11 cupy-cuda11x>=12.0.0
- dask-cudf-cu11==24.2.*
- *pylibraft_cu11
- raft-dask-cu11==24.2.*
Expand All @@ -247,11 +247,10 @@ dependencies:
- matrix: null
packages:
- *cudf_conda
- *cupy_conda
- *cupy_pyproject_cu11
- *dask_cudf_conda
- *pylibraft_conda
- *raft_dask_conda
- *pylibraft_conda
- *rmm_conda
cudatoolkit:
specific:
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ license = { text = "Apache 2.0" }
requires-python = ">=3.9"
dependencies = [
"cudf==24.2.*",
"cupy>=12.0.0",
"cupy-cuda11x>=12.0.0",
"dask-cuda==24.2.*",
"dask-cudf==24.2.*",
"joblib>=0.11",
Expand Down

0 comments on commit b8daf81

Please sign in to comment.