Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade arrow to 16.1 #15787

Merged
merged 14 commits into from
May 21, 2024
10 changes: 5 additions & 5 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ dependencies:
- hypothesis
- identify>=2.5.20
- ipython
- libarrow-acero==16.0.0.*
- libarrow-dataset==16.0.0.*
- libarrow==16.0.0.*
- libarrow-acero==16.1.0.*
- libarrow-dataset==16.1.0.*
- libarrow==16.1.0.*
- libcufile-dev=1.4.0.31
- libcufile=1.4.0.31
- libcurand-dev=10.3.0.86
- libcurand=10.3.0.86
- libkvikio==24.6.*
- libparquet==16.0.0.*
- libparquet==16.1.0.*
- librdkafka>=1.9.0,<1.10.0a0
- librmm==24.6.*
- make
Expand All @@ -66,7 +66,7 @@ dependencies:
- pip
- pre-commit
- ptxcompiler
- pyarrow==16.0.0.*
- pyarrow==16.1.0.*
- pydata-sphinx-theme!=0.14.2
- pytest-benchmark
- pytest-cases>=3.8.2
Expand Down
10 changes: 5 additions & 5 deletions conda/environments/all_cuda-122_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ dependencies:
- hypothesis
- identify>=2.5.20
- ipython
- libarrow-acero==16.0.0.*
- libarrow-dataset==16.0.0.*
- libarrow==16.0.0.*
- libarrow-acero==16.1.0.*
- libarrow-dataset==16.1.0.*
- libarrow==16.1.0.*
- libcufile-dev
- libcurand-dev
- libkvikio==24.6.*
- libparquet==16.0.0.*
- libparquet==16.1.0.*
- librdkafka>=1.9.0,<1.10.0a0
- librmm==24.6.*
- make
Expand All @@ -63,7 +63,7 @@ dependencies:
- pandoc
- pip
- pre-commit
- pyarrow==16.0.0.*
- pyarrow==16.1.0.*
- pydata-sphinx-theme!=0.14.2
- pynvjitlink
- pytest-benchmark
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ requirements:
- scikit-build-core >=0.7.0
- dlpack >=0.8,<1.0
- numpy 1.23
- pyarrow ==16.0.0.*
- pyarrow ==16.1.0.*
- libcudf ={{ version }}
- rmm ={{ minor_version }}
{% if cuda_major == "11" %}
Expand All @@ -82,7 +82,7 @@ requirements:
- cupy >=12.0.0
- numba >=0.57
- {{ pin_compatible('numpy', max_pin='x') }}
- {{ pin_compatible('pyarrow', max_pin='x') }}
- {{ pin_compatible('pyarrow', max_pin='x.x') }}
- libcudf ={{ version }}
- {{ pin_compatible('rmm', max_pin='x.x') }}
- fsspec >=0.6.0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libcudf/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cmake_version:
- ">=3.26.4"

libarrow_version:
- "==16.0.0"
- "==16.1.0"

dlpack_version:
- ">=0.8,<1.0"
Expand Down
9 changes: 0 additions & 9 deletions conda/recipes/libcudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ outputs:
{% else %}
- {{ compiler('cuda') }}
{% endif %}
# TODO: start taking libarrow's run exports again wwhen they're correct for 16.0
# ref: https://github.com/conda-forge/arrow-cpp-feedstock/issues/1418
- libarrow
requirements:
build:
- cmake {{ cmake_version }}
Expand All @@ -108,12 +105,6 @@ outputs:
- librmm ={{ minor_version }}
- libkvikio ={{ minor_version }}
- dlpack {{ dlpack_version }}
# TODO: start taking libarrow's run exports again wwhen they're correct for 16.0
# ref: https://github.com/conda-forge/arrow-cpp-feedstock/issues/1418
- libarrow>=16.0.0,<16.1.0a0
- libarrow-acero>=16.0.0,<16.1.0a0
- libarrow-dataset>=16.0.0,<16.1.0a0
- libparquet>=16.0.0,<16.1.0a0
test:
commands:
- test -f $PREFIX/lib/libcudf.so
Expand Down
2 changes: 1 addition & 1 deletion cpp/cmake/thirdparty/get_arrow.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ if(NOT DEFINED CUDF_VERSION_Arrow)
set(CUDF_VERSION_Arrow
# This version must be kept in sync with the libarrow version pinned for builds in
# dependencies.yaml.
16.0.0
16.1.0
CACHE STRING "The version of Arrow to find (or build)"
)
endif()
Expand Down
22 changes: 11 additions & 11 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ dependencies:
- cython>=3.0.3
# Hard pin the patch version used during the build. This must be kept
# in sync with the version pinned in get_arrow.cmake.
- pyarrow==16.0.0.*
- pyarrow==16.1.0.*
- output_types: conda
packages:
- scikit-build-core>=0.7.0
Expand Down Expand Up @@ -332,25 +332,25 @@ dependencies:
packages:
# Hard pin the Arrow patch version used during the build. This must
# be kept in sync with the version pinned in get_arrow.cmake.
- libarrow-acero==16.0.0.*
- libarrow-dataset==16.0.0.*
- libarrow==16.0.0.*
- libparquet==16.0.0.*
- libarrow-acero==16.1.0.*
- libarrow-dataset==16.1.0.*
- libarrow==16.1.0.*
- libparquet==16.1.0.*
libarrow_run:
common:
- output_types: conda
packages:
# Allow runtime version to float up to minor version
- libarrow-acero>=16.0.0,<16.1.0a0
- libarrow-dataset>=16.0.0,<16.1.0a0
- libarrow>=16.0.0,<16.1.0a0
- libparquet>=16.0.0,<16.1.0a0
# Allow runtime version to float up to patch version
- libarrow-acero>=16.1.0,<16.2.0a0
- libarrow-dataset>=16.1.0,<16.2.0a0
- libarrow>=16.1.0,<16.2.0a0
- libparquet>=16.1.0,<16.2.0a0
pyarrow_run:
common:
- output_types: [conda, requirements, pyproject]
packages:
# Allow runtime version to float up to patch version
- pyarrow>=16.0.0,<16.1.0a0
- pyarrow>=16.1.0,<16.2.0a0
cuda_version:
specific:
- output_types: conda
Expand Down
4 changes: 2 additions & 2 deletions python/cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ requires = [
"cython>=3.0.3",
"ninja",
"numpy==1.23.*",
"pyarrow==16.0.0.*",
"pyarrow==16.1.0.*",
"rmm==24.6.*",
"scikit-build-core[pyproject]>=0.7.0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand All @@ -34,7 +34,7 @@ dependencies = [
"packaging",
"pandas>=2.0,<2.2.3dev0",
"ptxcompiler",
"pyarrow>=16.0.0,<16.1.0a0",
"pyarrow>=16.1.0,<16.2.0a0",
"rich",
"rmm==24.6.*",
"typing_extensions>=4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion python/cudf_kafka/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ requires = [
"cython>=3.0.3",
"ninja",
"numpy==1.23.*",
"pyarrow==16.0.0.*",
"pyarrow==16.1.0.*",
"scikit-build-core[pyproject]>=0.7.0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

Expand Down
Loading