Skip to content

Commit

Permalink
Explicitly depend on zlib in conda recipes (#14018)
Browse files Browse the repository at this point in the history
We were previously obtaining zlib transitively through our cmake dependency, but since the 3.27.4 conda package, this dependency no longer exists. Therefore we must depend on zlib ourselves.

- Closes #14021

Authors:
  - Lawrence Mitchell (https://github.com/wence-)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #14018
  • Loading branch information
wence- authored Aug 31, 2023
1 parent c73ff70 commit a2fd688
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ dependencies:
- tokenizers==0.13.1
- transformers==4.24.0
- typing_extensions>=4.0.0
- zlib>=1.2.13
- pip:
- git+https://github.com/python-streamz/streamz.git@master
name: all_cuda-118_arch-x86_64
1 change: 1 addition & 0 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ dependencies:
- tokenizers==0.13.1
- transformers==4.24.0
- typing_extensions>=4.0.0
- zlib>=1.2.13
- pip:
- git+https://github.com/python-streamz/streamz.git@master
name: all_cuda-120_arch-x86_64
2 changes: 2 additions & 0 deletions conda/recipes/libcudf/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spdlog_version:
nvcomp_version:
- "=2.6.1"

zlib_version:
- ">=1.2.13"
# The CTK libraries below are missing from the conda-forge::cudatoolkit package
# for CUDA 11. The "*_host_*" version specifiers correspond to `11.8` packages
# and the "*_run_*" version specifiers correspond to `11.x` packages.
Expand Down
1 change: 1 addition & 0 deletions conda/recipes/libcudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ requirements:
- benchmark {{ gbench_version }}
- gtest {{ gtest_version }}
- gmock {{ gtest_version }}
- zlib {{ zlib_version }}

outputs:
- name: libcudf
Expand Down
1 change: 1 addition & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ dependencies:
- c-compiler
- cxx-compiler
- dlpack>=0.5,<0.6.0a0
- zlib>=1.2.13
specific:
- output_types: conda
matrices:
Expand Down

0 comments on commit a2fd688

Please sign in to comment.