Skip to content

Commit

Permalink
Relax protobuf lower bound to 3.20. (#15506)
Browse files Browse the repository at this point in the history
This PR drops the lower bound of protobuf to 3.20, to make cuDF compatible with the versions used in Google Colab.

I tested this manually in Google Colab, which uses protobuf 3.20, and cuDF 24.02 seemed to work fine when reading ORC statistics (the only runtime feature in cuDF that needs protobuf). Note: cuDF 24.02 was built was a newer protobuf/protoc, version 4.x.

I will test this by forcing protobuf 3.20 in CI, and then revert those changes if tests pass.

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

Approvers:
  - Nick Becker (https://github.com/beckernick)
  - Ray Douglass (https://github.com/raydouglass)
  - Matthew Roeschke (https://github.com/mroeschke)

URL: #15506
  • Loading branch information
bdice authored Apr 15, 2024
1 parent 64229b9 commit ca7d85b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 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 @@ -68,7 +68,7 @@ dependencies:
- pandoc
- pip
- pre-commit
- protobuf>=4.21,<5
- protobuf>=3.20,<5
- ptxcompiler
- pyarrow==14.0.2.*
- pydata-sphinx-theme!=0.14.2
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-122_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dependencies:
- pandoc
- pip
- pre-commit
- protobuf>=4.21,<5
- protobuf>=3.20,<5
- pyarrow==14.0.2.*
- pydata-sphinx-theme!=0.14.2
- pynvjitlink
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ requirements:
{% endif %}
- cuda-version ={{ cuda_version }}
run:
- {{ pin_compatible('protobuf', min_pin='x.x', max_pin='x') }}
- protobuf >=3.20,<5.0a0
- python
- typing_extensions >=4.0.0
- pandas >=2.0,<2.2.2dev0
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ dependencies:
- output_types: conda
packages:
- &rmm_conda rmm==24.6.*
- &protobuf protobuf>=4.21,<5
- &protobuf protobuf>=3.20,<5
- pip
- pip:
- git+https://github.com/python-streamz/streamz.git@master
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies = [
"nvtx>=0.2.1",
"packaging",
"pandas>=2.0,<2.2.2dev0",
"protobuf>=4.21,<5",
"protobuf>=3.20,<5",
"ptxcompiler",
"pyarrow>=14.0.1,<15.0.0a0",
"rich",
Expand Down

0 comments on commit ca7d85b

Please sign in to comment.