Skip to content

Commit

Permalink
Upgrade to arrow 12 (#13728)
Browse files Browse the repository at this point in the history
This PR upgrades arrow version in `cudf` to `12.0.1`

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - Vyas Ramasubramani (https://github.com/vyasr)

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

URL: #13728
  • Loading branch information
galipremsagar authored Jul 31, 2023
1 parent 7746af4 commit 9d465f2
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies:
- hypothesis
- identify>=2.5.20
- ipython
- libarrow==11.0.0.*
- libarrow==12.0.1.*
- libcufile-dev=1.4.0.31
- libcufile=1.4.0.31
- libcurand-dev=10.3.0.86
Expand Down Expand Up @@ -66,7 +66,7 @@ dependencies:
- pre-commit
- protobuf>=4.21,<5
- ptxcompiler
- pyarrow==11.0.0.*
- pyarrow==12.0.1.*
- pydata-sphinx-theme
- pyorc
- pytest
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies:
- hypothesis
- identify>=2.5.20
- ipython
- libarrow==11.0.0.*
- libarrow==12.0.1.*
- libcufile-dev
- libcurand-dev
- libkvikio==23.10.*
Expand All @@ -63,7 +63,7 @@ dependencies:
- pip
- pre-commit
- protobuf>=4.21,<5
- pyarrow==11.0.0.*
- pyarrow==12.0.1.*
- pydata-sphinx-theme
- pyorc
- pytest
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 @@ -61,7 +61,7 @@ requirements:
- scikit-build >=0.13.1
- setuptools
- dlpack >=0.5,<0.6.0a0
- pyarrow =11
- pyarrow =12
- libcudf ={{ version }}
- rmm ={{ minor_version }}
{% if cuda_major == "11" %}
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 @@ -23,7 +23,7 @@ gtest_version:
- ">=1.13.0"

libarrow_version:
- "=11"
- "=12"

dlpack_version:
- ">=0.5,<0.6.0a0"
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 @@ -381,7 +381,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.
11.0.0
12.0.1
CACHE STRING "The version of Arrow to find (or build)"
)
endif()
Expand Down
1 change: 1 addition & 0 deletions cpp/tests/io/arrow_io_source_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ TEST_F(ArrowIOTest, S3FileSystem)
ASSERT_EQ(1, tbl.tbl->num_columns()); // Only single column specified in reader_options
ASSERT_EQ(244, tbl.tbl->num_rows()); // known number of rows from the S3 file
}
CUDF_EXPECTS(arrow::fs::EnsureS3Finalized().ok(), "Failed to finalize s3 filesystem");
}

CUDF_TEST_PROGRAM_MAIN()
8 changes: 4 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ dependencies:
- &gmock gmock>=1.13.0
# Hard pin the patch version used during the build. This must be kept
# in sync with the version pinned in get_arrow.cmake.
- libarrow==11.0.0.*
- libarrow==12.0.1.*
- librdkafka>=1.9.0,<1.10.0a0
- spdlog>=1.11.0,<1.12
specific:
Expand Down Expand Up @@ -253,7 +253,7 @@ dependencies:
- cython>=0.29,<0.30
# Hard pin the patch version used during the build. This must be kept
# in sync with the version pinned in get_arrow.cmake.
- pyarrow==11.0.0.*
- pyarrow==12.0.1.*
- numpy>=1.21
build_python:
common:
Expand All @@ -272,13 +272,13 @@ dependencies:
- output_types: [conda, requirements]
packages:
# Allow runtime version to float up to minor version
- libarrow==11.*
- libarrow==12.*
pyarrow_run:
common:
- output_types: [conda, requirements, pyproject]
packages:
# Allow runtime version to float up to minor version
- pyarrow==11.*
- pyarrow==12.*
cudatoolkit:
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 @@ -8,7 +8,7 @@ requires = [
"ninja",
"numpy>=1.21",
"protoc-wheel",
"pyarrow==11.0.0.*",
"pyarrow==12.0.1.*",
"rmm==23.10.*",
"scikit-build>=0.13.1",
"setuptools",
Expand Down Expand Up @@ -38,7 +38,7 @@ dependencies = [
"pandas>=1.3,<1.6.0dev0",
"protobuf>=4.21,<5",
"ptxcompiler",
"pyarrow==11.*",
"pyarrow==12.*",
"rmm==23.10.*",
"typing_extensions>=4.0.0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
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 @@ -5,7 +5,7 @@
requires = [
"cython>=0.29,<0.30",
"numpy>=1.21",
"pyarrow==11.0.0.*",
"pyarrow==12.0.1.*",
"setuptools",
"wheel",
] # 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 9d465f2

Please sign in to comment.