Skip to content

Commit

Permalink
Update python_run_cugraph in dependencies.yaml (#3781)
Browse files Browse the repository at this point in the history
Closes #2811 

This PR adds `aiohttp` and `requests` as hard dependencies to cugraph. Without these packages, `cugraph.datasets` is unable to download missing datasets. `cugraph.datasets` uses `cudf.read_csv` to download files from s3.

Authors:
  - ralph (https://github.com/nv-rliu)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Rick Ratzel (https://github.com/rlratzel)
  - Brad Rees (https://github.com/BradReesWork)
  - Ray Douglass (https://github.com/raydouglass)

URL: #3781
  • Loading branch information
nv-rliu authored Aug 21, 2023
1 parent 5abbf75 commit 8b1f014
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- dask>=2023.5.1
- distributed>=2023.5.1
- doxygen
- fsspec[http]>=0.6.0
- fsspec>=0.6.0
- gcc_linux-64=11.*
- gmock>=1.13.0
- graphviz
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- dask>=2023.5.1
- distributed>=2023.5.1
- doxygen
- fsspec[http]>=0.6.0
- fsspec>=0.6.0
- gcc_linux-64=11.*
- gmock>=1.13.0
- graphviz
Expand Down
3 changes: 3 additions & 0 deletions conda/recipes/cugraph/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ requirements:
- scikit-build >=0.13.1
- setuptools
run:
- aiohttp
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major == "11" %}
- cudatoolkit
Expand All @@ -78,11 +79,13 @@ requirements:
- dask ==2023.7.1
- dask-core ==2023.7.1
- distributed ==2023.7.1
- fsspec>=0.6.0
- libcugraph ={{ version }}
- pylibcugraph ={{ version }}
- pylibraft ={{ minor_version }}
- python
- raft-dask ={{ minor_version }}
- requests
- ucx-proc=*=gpu
- ucx-py {{ ucx_py_version }}

Expand Down
11 changes: 6 additions & 5 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,20 @@ dependencies:
- &ucx_py ucx-py==0.34.*
- output_types: conda
packages:
- aiohttp
- &cupy cupy>=12.0.0
- &dask-core dask-core>=2023.5.1
- fsspec>=0.6.0
- libcudf==23.10.*
- requests
- nccl>=2.9.9
- ucx-proc=*=gpu
- output_types: pyproject
packages:
- &cupy_pip cupy-cuda11x>=12.0.0
# cudf uses fsspec but is protocol independent. cugraph
# dataset APIs require [http] extras for use with cudf.
- fsspec[http]>=0.6.0
- pylibcugraph==23.10.*
python_run_pylibcugraph:
common:
Expand Down Expand Up @@ -434,12 +440,7 @@ dependencies:
common:
- output_types: [conda, pyproject]
packages:
- aiohttp
# cudf will use fsspec but is protocol independent. cugraph tests
# specifically require http for the test files it asks cudf to read.
- fsspec[http]>=0.6.0
- python-louvain
- requests
- scikit-learn>=0.23.1
test_python_pylibcugraph:
common:
Expand Down
3 changes: 0 additions & 3 deletions python/cugraph-service/server/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ dynamic = ["entry-points"]

[project.optional-dependencies]
test = [
"aiohttp",
"fsspec[http]>=0.6.0",
"networkx>=2.5.1",
"numpy>=1.21",
"pandas",
Expand All @@ -53,7 +51,6 @@ test = [
"pytest-cov",
"pytest-xdist",
"python-louvain",
"requests",
"scikit-learn>=0.23.1",
"scipy",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down
4 changes: 1 addition & 3 deletions python/cugraph/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies = [
"dask-cudf==23.10.*",
"dask>=2023.5.1",
"distributed>=2023.5.1",
"fsspec[http]>=0.6.0",
"numba>=0.57",
"pylibcugraph==23.10.*",
"raft-dask==23.10.*",
Expand All @@ -50,8 +51,6 @@ classifiers = [

[project.optional-dependencies]
test = [
"aiohttp",
"fsspec[http]>=0.6.0",
"networkx>=2.5.1",
"numpy>=1.21",
"pandas",
Expand All @@ -60,7 +59,6 @@ test = [
"pytest-cov",
"pytest-xdist",
"python-louvain",
"requests",
"scikit-learn>=0.23.1",
"scipy",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down

0 comments on commit 8b1f014

Please sign in to comment.