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 13 #14330

Merged
merged 27 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a3d159b
Upgrade arrow to 13
galipremsagar Oct 25, 2023
4148723
Update all_cuda-118_arch-x86_64.yaml
galipremsagar Oct 25, 2023
8e5cdc2
xfail pytest
galipremsagar Oct 25, 2023
6383cc1
Merge branch 'arrow_13' of https://github.com/galipremsagar/cudf into…
galipremsagar Oct 25, 2023
03121ea
Merge remote-tracking branch 'upstream/branch-23.12' into arrow_13
galipremsagar Oct 25, 2023
c08c1d5
test
galipremsagar Oct 26, 2023
9ae4189
Merge branch 'branch-23.12' into arrow_13
galipremsagar Oct 26, 2023
322cf90
test
galipremsagar Oct 26, 2023
0631ea5
Merge branch 'arrow_13' of https://github.com/galipremsagar/cudf into…
galipremsagar Oct 26, 2023
ceb2c67
Update test_python_common.sh
galipremsagar Oct 26, 2023
740eb32
Merge branch 'branch-23.12' into arrow_13
galipremsagar Oct 26, 2023
1965cae
Update test_python_common.sh
galipremsagar Oct 26, 2023
f446e86
Update test_python_common.sh
galipremsagar Oct 26, 2023
221b5e1
Update test_python_common.sh
galipremsagar Oct 26, 2023
5aa1e09
Use libarrow run_exports to define a compatible version from host to …
bdice Oct 26, 2023
82b2b4e
Update pyarrow pinning for cudf conda packages.
bdice Oct 26, 2023
c3fef5b
Revert test_python_common.sh.
bdice Oct 26, 2023
5c5f763
Merge branch 'branch-23.12' into arrow_13
galipremsagar Oct 26, 2023
2fc229b
Apply suggestions from code review
galipremsagar Oct 26, 2023
5e6ccb5
Use protobuf 4.23 at build time.
bdice Oct 26, 2023
515709a
Merge branch 'arrow_13' of github.com:galipremsagar/cudf into arrow_13
bdice Oct 26, 2023
55f046a
Use libarrow run_exports to define a compatible version from host to …
bdice Oct 26, 2023
e5c360d
Use Arrow 13 for conda and Arrow 12 for wheels.
bdice Oct 26, 2023
1bfc349
Merge branch 'branch-23.12' into arrow_13
jakirkham Oct 26, 2023
00e08b3
handle test xfail based on pyarrow version
galipremsagar Oct 26, 2023
b8b50bd
Merge branch 'arrow_13' of https://github.com/galipremsagar/cudf into…
galipremsagar Oct 26, 2023
c3e33ef
Fix style checks.
bdice Oct 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ci/test_python_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ mkdir -p "${RAPIDS_TESTS_DIR}" "${RAPIDS_COVERAGE_DIR}"
rapids-print-env

rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
--channel "${PYTHON_CHANNEL}" \
cudf libcudf
file:///"${CPP_CHANNEL}"::libcudf \
file:///"${PYTHON_CHANNEL}"::cudf
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 @@ -39,7 +39,7 @@ dependencies:
- hypothesis
- identify>=2.5.20
- ipython
- libarrow==12.0.1.*
- libarrow==13.0.0.*
- libcufile-dev=1.4.0.31
- libcufile=1.4.0.31
- libcurand-dev=10.3.0.86
Expand Down Expand Up @@ -68,7 +68,7 @@ dependencies:
- pre-commit
- protobuf>=4.21,<5
- ptxcompiler
- pyarrow==12.0.1.*
- pyarrow==13.0.0.*
- pydata-sphinx-theme!=0.14.2
- pytest
- pytest-benchmark
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 @@ -41,7 +41,7 @@ dependencies:
- hypothesis
- identify>=2.5.20
- ipython
- libarrow==12.0.1.*
- libarrow==13.0.0.*
- libcufile-dev
- libcurand-dev
- libkvikio==23.12.*
Expand All @@ -66,7 +66,7 @@ dependencies:
- pip
- pre-commit
- protobuf>=4.21,<5
- pyarrow==12.0.1.*
- pyarrow==13.0.0.*
- pydata-sphinx-theme!=0.14.2
- pytest
- pytest-benchmark
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:
- "==12.0.1"
- "==13.0.0"

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 @@ -411,7 +411,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.
12.0.1
13.0.0
CACHE STRING "The version of Arrow to find (or build)"
)
endif()
Expand Down
8 changes: 4 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,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==12.0.1.*
- libarrow==13.0.0.*
- librdkafka>=1.9.0,<1.10.0a0
# Align nvcomp version with rapids-cmake
- nvcomp==2.6.1
Expand All @@ -242,7 +242,7 @@ dependencies:
- cython>=3.0.0
# Hard pin the patch version used during the build. This must be kept
# in sync with the version pinned in get_arrow.cmake.
- pyarrow==12.0.1.*
- pyarrow==13.0.0.*
# TODO: Pin to numpy<1.25 until cudf requires pandas 2
- &numpy numpy>=1.21,<1.25
build_python:
Expand All @@ -262,13 +262,13 @@ dependencies:
- output_types: conda
packages:
# Allow runtime version to float up to minor version
- libarrow==12.*
- libarrow==13.*
pyarrow_run:
common:
- output_types: [conda, requirements, pyproject]
packages:
# Allow runtime version to float up to minor version
- pyarrow==12.*
- pyarrow==13.*
cudatoolkit:
specific:
- output_types: conda
Expand Down
9 changes: 8 additions & 1 deletion python/cudf/cudf/tests/test_decimal.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,14 @@ def test_from_arrow_max_precision_decimal32():
"to_dtype",
[Decimal64Dtype(7, 2), Decimal64Dtype(11, 4), Decimal64Dtype(18, 9)],
)
def test_typecast_from_float_to_decimal(data, from_dtype, to_dtype):
def test_typecast_from_float_to_decimal(request, data, from_dtype, to_dtype):
request.applymarker(
pytest.mark.xfail(
condition=from_dtype == np.dtype("float32")
and to_dtype.precision > 7,
reason="https://github.com/rapidsai/cudf/issues/14169",
)
)
got = data.astype(from_dtype)

pa_arr = got.to_arrow().cast(
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,<1.25",
"protoc-wheel",
"pyarrow==12.0.1.*",
"pyarrow==13.0.0.*",
"rmm==23.12.*",
"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==12.*",
"pyarrow==13.*",
"rmm==23.12.*",
"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>=3.0.0",
"numpy>=1.21,<1.25",
"pyarrow==12.0.1.*",
"pyarrow==13.0.0.*",
"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
Loading