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

[REVIEW] Upgrade to arrow-11 #12757

Merged
merged 25 commits into from
Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c1dbdde
Upgrade to arrow 11
galipremsagar Feb 10, 2023
e03f079
temp commit
galipremsagar Feb 10, 2023
57e81ca
Merge branch 'branch-23.04' into arrow_11
galipremsagar Feb 10, 2023
1899497
temp
galipremsagar Feb 10, 2023
66ed1d0
fix cpp
galipremsagar Feb 10, 2023
523c5d0
Merge branch 'arrow_11' of https://github.com/galipremsagar/cudf into…
galipremsagar Feb 10, 2023
9372a06
Apply suggestions from code review
galipremsagar Feb 11, 2023
dd705da
upgrade kafka
galipremsagar Feb 11, 2023
1b41b87
Update ci/cpu/build.sh
galipremsagar Feb 11, 2023
2ae0925
Merge branch 'arrow_11' of https://github.com/galipremsagar/cudf into…
galipremsagar Feb 11, 2023
2883005
merge
galipremsagar Feb 11, 2023
8ed2120
Apply suggestions from code review
galipremsagar Feb 11, 2023
471a9f2
temp
galipremsagar Feb 11, 2023
53712a6
Merge branch 'arrow_11' of https://github.com/galipremsagar/cudf into…
galipremsagar Feb 11, 2023
c0a6661
Fix pinnings
galipremsagar Feb 13, 2023
7f7005f
Merge branch 'branch-23.04' into arrow_11
galipremsagar Feb 13, 2023
01ca676
Merge branch 'branch-23.04' into arrow_11
galipremsagar Feb 16, 2023
da2b5a1
Update ci/build_cpp.sh
galipremsagar Feb 16, 2023
d2810d3
Merge branch 'branch-23.04' into arrow_11
galipremsagar Feb 23, 2023
7a6b866
Merge
galipremsagar Mar 27, 2023
c2a088c
updates
galipremsagar Mar 27, 2023
c004c15
merge
galipremsagar Mar 27, 2023
f1f23ca
Merge remote-tracking branch 'upstream/branch-23.06' into arrow_11
galipremsagar Mar 28, 2023
204683d
Update ci/build_cpp.sh
galipremsagar Mar 29, 2023
34fbaef
Merge branch 'branch-23.06' into arrow_11
galipremsagar Mar 29, 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
3 changes: 3 additions & 0 deletions ci/cpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ fi
gpuci_logger "Check compiler versions"
python --version

gpuci_conda_retry remove --force pyarrow arrow-cpp
gpuci_mamba_retry install -y "pyarrow=11" "libarrow=11"
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved

gpuci_logger "Check conda environment"
conda info
conda config --show-sources
Expand Down
3 changes: 3 additions & 0 deletions ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ if [ "$SOURCE_BRANCH" != "main" ] && [[ "${INSTALL_DASK_MAIN}" == 0 ]]; then
gpuci_mamba_retry install conda-forge::dask==$DASK_STABLE_VERSION conda-forge::distributed==$DASK_STABLE_VERSION conda-forge::dask-core==$DASK_STABLE_VERSION --force-reinstall
fi

gpuci_conda_retry remove --force pyarrow arrow-cpp
gpuci_mamba_retry install -y "pyarrow=11" "libarrow=11"

gpuci_logger "Check conda environment"
conda info
conda config --show-sources
Expand Down
5 changes: 4 additions & 1 deletion ci/gpu/java.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2018-2022, NVIDIA CORPORATION.
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
##############################################
# cuDF GPU build and test script for CI #
##############################################
Expand Down Expand Up @@ -68,6 +68,9 @@ gpuci_logger "Activate conda env"
. /opt/conda/etc/profile.d/conda.sh
conda activate rapids

gpuci_conda_retry remove --force pyarrow arrow-cpp
gpuci_mamba_retry install -y "pyarrow=11" "libarrow=11"

gpuci_logger "Check conda environment"
conda info
conda config --show-sources
Expand Down
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 @@ -30,7 +30,7 @@ dependencies:
- gcc_linux-64=9.*
- hypothesis
- ipython
- libarrow=10
- libarrow=11
- librdkafka=1.7.0
- mimesis>=4.1.0
- moto>=4.0.8
Expand All @@ -50,7 +50,7 @@ dependencies:
- pre-commit
- protobuf=4.21
- ptxcompiler
- pyarrow=10
- pyarrow=11
- 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 @@ -52,7 +52,7 @@ requirements:
- setuptools
- numba >=0.56.2
- dlpack >=0.5,<0.6.0a0
- pyarrow =10
- pyarrow =11
- libcudf ={{ version }}
- rmm ={{ minor_version }}
- cudatoolkit ={{ cuda_version }}
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 @@ -17,7 +17,7 @@ gtest_version:
- "=1.10.0"

libarrow_version:
- "=10"
- "=11"

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 @@ -379,7 +379,7 @@ endfunction()

if(NOT DEFINED CUDF_VERSION_Arrow)
set(CUDF_VERSION_Arrow
10.0.1
11.0.0
CACHE STRING "The version of Arrow to find (or build)"
)
endif()
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ dependencies:
- cython>=0.29,<0.30
- dlpack>=0.5,<0.6.0a0
- ninja
- pyarrow=10
- pyarrow=11
- rmm=23.04.*
- scikit-build>=0.13.1
- output_types: conda
packages:
- libarrow=10
- libarrow=11
- c-compiler
- cxx-compiler
- librdkafka=1.7.0
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ requires = [
"ninja",
"numpy",
# Hard pin the patch version used during the build.
"pyarrow==10.0.1",
"pyarrow==11.0.0",
"protoc-wheel",
"versioneer",
]
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"protobuf==4.21",
"typing_extensions",
# Allow floating minor versions for Arrow.
"pyarrow==10",
"pyarrow==11",
f"rmm{cuda_suffix}==23.4.*",
f"ptxcompiler{cuda_suffix}",
f"cubinlinker{cuda_suffix}",
Expand Down