Skip to content

Commit

Permalink
remove 'wget' conda dependency, re-organize dependencies.yaml (#4805)
Browse files Browse the repository at this point in the history
In #4804, I've started working on adding `libcugraph` wheels.

This includes a few fixes for things I noticed while doing that:

* removes `wget` from `test_notebook` environment
  - *our CI images already have this system-installed, and removing it helps to remove it from the environment solve for the unified RAPIDS devcontainers*
* `dependencies.yaml` re-organization:
  - breaks `librmm` dependency out into a `depends_on_librmm` to reduce duplication, and for consistency with other RAPIDS dependencies
  - uses `depends_on_pylibwholegraph` group everywhere instead of repeating `pylibwholegraph` in multiple places
  - removes unused YAML anchors
  - alphabetizes lists

## Notes for Reviewers

I'd originally wanted to also add a `librmm` wheel dependency for wheel builds here, but looks like doing that resulted in a lot more `sccache` misses, I guess because of building with build isolation. That change will happen in #4804 .

Authors:
  - James Lamb (https://github.com/jameslamb)
  - Ralph Liu (https://github.com/nv-rliu)

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: #4805
  • Loading branch information
jameslamb authored Dec 20, 2024
1 parent 6783aec commit 3fdaba6
Show file tree
Hide file tree
Showing 7 changed files with 128 additions and 84 deletions.
1 change: 0 additions & 1 deletion ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ DEPENDENCIES=(
dask-cudf
libcudf
libraft
libraft-headers
librmm
pylibcugraph
pylibwholegraph
Expand Down
4 changes: 1 addition & 3 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ dependencies:
- graphviz
- ipython
- libcudf==25.2.*,>=0.0.0a0
- libraft-headers==25.2.*,>=0.0.0a0
- libraft==25.2.*,>=0.0.0a0
- librmm==25.2.*,>=0.0.0a0
- nbsphinx
Expand Down Expand Up @@ -68,11 +67,10 @@ dependencies:
- sphinx-markdown-tables
- sphinx<6
- sphinxcontrib-websupport
- thriftpy2!=0.5.0,!=0.5.1
- thriftpy2>=0.4.15,!=0.5.0,!=0.5.1
- torchdata
- torchmetrics
- ucx-proc=*=gpu
- ucx-py==0.42.*,>=0.0.0a0
- wget
- wheel
name: all_cuda-118_arch-x86_64
4 changes: 1 addition & 3 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ dependencies:
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
- libraft-headers==25.2.*,>=0.0.0a0
- libraft==25.2.*,>=0.0.0a0
- librmm==25.2.*,>=0.0.0a0
- nbsphinx
Expand Down Expand Up @@ -73,11 +72,10 @@ dependencies:
- sphinx-markdown-tables
- sphinx<6
- sphinxcontrib-websupport
- thriftpy2!=0.5.0,!=0.5.1
- thriftpy2>=0.4.15,!=0.5.0,!=0.5.1
- torchdata
- torchmetrics
- ucx-proc=*=gpu
- ucx-py==0.42.*,>=0.0.0a0
- wget
- wheel
name: all_cuda-125_arch-x86_64
2 changes: 0 additions & 2 deletions conda/recipes/libcugraph/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ requirements:
- doxygen {{ doxygen_version }}
- libcudf ={{ minor_version }}
- libraft ={{ minor_version }}
- libraft-headers ={{ minor_version }}
- librmm ={{ minor_version }}
- nccl {{ nccl_version }}
- ucx-proc=*=gpu
Expand Down Expand Up @@ -114,7 +113,6 @@ outputs:
- libcusparse
{% endif %}
- libraft ={{ minor_version }}
- libraft-headers ={{ minor_version }}
- librmm ={{ minor_version }}
- nccl {{ nccl_version }}
- ucx-proc=*=gpu
Expand Down
Loading

0 comments on commit 3fdaba6

Please sign in to comment.