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-10.0.1 #12327

Merged
merged 47 commits into from
Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
1bd1ea7
arrow 10.0.1
galipremsagar Dec 5, 2022
602bad0
pass pyarrow headers
galipremsagar Dec 7, 2022
f9b4ca1
enable orc
galipremsagar Dec 13, 2022
18d47ae
Merge remote-tracking branch 'upstream/branch-23.02' into arrow_10
galipremsagar Dec 13, 2022
792abba
fix pinnings
galipremsagar Dec 13, 2022
2504e9d
Update build.sh
galipremsagar Dec 13, 2022
8bc4dcb
Update build.sh
galipremsagar Dec 13, 2022
930af52
Merge remote-tracking branch 'upstream/branch-23.02' into arrow_10
galipremsagar Dec 14, 2022
2385dd4
fix tests
galipremsagar Dec 14, 2022
bc8f4de
Merge branch 'arrow_10' of https://github.com/galipremsagar/cudf into…
galipremsagar Dec 14, 2022
905f8bc
fixes
galipremsagar Dec 14, 2022
11ec40a
fix
galipremsagar Dec 15, 2022
76d01d0
merge
galipremsagar Dec 15, 2022
8bd360d
fix dependencies
galipremsagar Dec 15, 2022
0126750
pin arrow
galipremsagar Dec 15, 2022
cec4723
fix pin
galipremsagar Dec 15, 2022
7fff6fa
fix kafka build
galipremsagar Dec 15, 2022
33f1a7e
Apply suggestions from code review
galipremsagar Dec 15, 2022
ba42ed8
Update java.sh
galipremsagar Dec 15, 2022
011afaa
switch naming to libarrow
galipremsagar Dec 15, 2022
30140e6
Update ci/gpu/java.sh
galipremsagar Dec 15, 2022
7a8f08e
Update conda/environments/all_cuda-115_arch-x86_64.yaml
galipremsagar Dec 15, 2022
e7dabde
Update conda/recipes/libcudf/conda_build_config.yaml
galipremsagar Dec 15, 2022
0f3fb8b
Apply suggestions from code review
galipremsagar Dec 15, 2022
5243884
Apply suggestions from code review
galipremsagar Dec 15, 2022
40b568f
Update all_cuda-115_arch-x86_64.yaml
galipremsagar Dec 15, 2022
3abad67
Handle statuses in JNI code as well.
vyasr Dec 16, 2022
53278c0
Merge branch 'rapidsai:branch-23.02' into arrow_10
galipremsagar Dec 16, 2022
2432df2
Merge branch 'branch-23.02' into arrow_10
galipremsagar Dec 16, 2022
ac9a97d
Merge remote-tracking branch 'upstream/branch-23.02' into arrow_10
galipremsagar Dec 16, 2022
4001af6
Merge branch 'arrow_10' of https://github.com/galipremsagar/cudf into…
galipremsagar Dec 16, 2022
d285dd6
Add pragmas to suppress arrow warnings.
vyasr Dec 16, 2022
e830685
Enable arrow filesystem when building tests.
vyasr Dec 16, 2022
5066746
Enable filesystem unconditionally.
vyasr Dec 16, 2022
69db393
Merge branch 'arrow_10' of https://github.com/galipremsagar/cudf into…
galipremsagar Dec 16, 2022
120cd2c
Merge branch 'branch-23.02' into arrow_10
galipremsagar Dec 16, 2022
fc15e4d
Merge branch 'arrow_10' of https://github.com/galipremsagar/cudf into…
galipremsagar Dec 16, 2022
15bcd37
Include status string in errors.
vyasr Dec 16, 2022
979d05a
Merge branch 'arrow_10' of https://github.com/galipremsagar/cudf into…
galipremsagar Dec 16, 2022
e4ed6b5
Merge branch 'branch-23.02' into arrow_10
vyasr Dec 17, 2022
e25e384
Merge branch 'arrow_10' of https://github.com/galipremsagar/cudf into…
galipremsagar Dec 17, 2022
db13b1b
Merge remote-tracking branch 'upstream/branch-23.02' into arrow_10
galipremsagar Dec 17, 2022
84e141c
Merge branch 'branch-23.02' into arrow_10
galipremsagar Dec 17, 2022
001f132
Merge branch 'branch-23.02' into arrow_10
galipremsagar Dec 19, 2022
de94728
Remove redundant execute_process.
vyasr Dec 19, 2022
e94fbfa
Merge branch 'branch-23.02' into arrow_10
galipremsagar Dec 21, 2022
0b0ba3b
Merge remote-tracking branch 'upstream/branch-23.02' into arrow_10
galipremsagar Dec 28, 2022
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: 2 additions & 1 deletion ci/cpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ conda config --set ssl_verify False

# TODO: Move boa install to gpuci/rapidsai
gpuci_mamba_retry install boa

gpuci_conda_retry remove --force pyarrow arrow-cpp
gpuci_mamba_retry install -y "pyarrow=10.0.1" "arrow-cpp=10.0.1"
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
################################################################################
# BUILD - Conda package builds
################################################################################
Expand Down
3 changes: 3 additions & 0 deletions ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ function install_dask {

install_dask

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

galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then

gpuci_logger "Install dependencies"
Expand Down
7 changes: 4 additions & 3 deletions conda/environments/all_cuda-115_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ channels:
- nvidia
dependencies:
- aiobotocore>=2.2.0
- arrow-cpp=9
# - libarrow=10.0.1
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
- arrow-cpp=10.0.1
- boto3>=1.21.21
- botocore>=1.24.21
- c-compiler
Expand Down Expand Up @@ -48,9 +49,9 @@ dependencies:
- pandoc<=2.0.0
- pip
- pre-commit
- protobuf>=3.20.1,<3.21.0a0
- protobuf=4.21
- ptxcompiler
- pyarrow=9.0.0
- pyarrow=10.0.1
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
- 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 =9
- pyarrow =10
- 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"

arrow_cpp_version:
- "=9"
- "=10.0.1"
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved

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

if(NOT DEFINED CUDF_VERSION_Arrow)
set(CUDF_VERSION_Arrow
9.0.0
10.0.1
kkraus14 marked this conversation as resolved.
Show resolved Hide resolved
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 @@ -57,12 +57,12 @@ dependencies:
- cython>=0.29,<0.30
- dlpack>=0.5,<0.6.0a0
- ninja
- pyarrow=9.0.0
- pyarrow=10.0.1
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
- rmm=23.02.*
- scikit-build>=0.13.1
- output_types: conda
packages:
- arrow-cpp=9
- arrow-cpp=10
vyasr marked this conversation as resolved.
Show resolved Hide resolved
- c-compiler
- cxx-compiler
- librdkafka=1.7.0
Expand Down
13 changes: 13 additions & 0 deletions python/cudf/cudf/_lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,19 @@ foreach(target IN LISTS targets_using_dlpack)
target_include_directories(${target} PRIVATE "${DLPACK_INCLUDE_DIR}")
endforeach()

find_package(Python 3.8 REQUIRED COMPONENTS Interpreter)
vyasr marked this conversation as resolved.
Show resolved Hide resolved

execute_process(
COMMAND "${Python_EXECUTABLE}" -c "import pyarrow; print(pyarrow.get_include())"
OUTPUT_VARIABLE PYARROW_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)

set(targets_using_arrow_headers interop avro csv orc json parquet)
foreach(target IN LISTS targets_using_arrow_headers)
target_include_directories(${target} PRIVATE "${PYARROW_INCLUDE_DIR}")
endforeach()

add_subdirectory(io)
add_subdirectory(nvtext)
add_subdirectory(strings)
13 changes: 11 additions & 2 deletions python/cudf/cudf/_lib/io/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,16 @@ rapids_cython_create_modules(
LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX io_ ASSOCIATED_TARGETS cudf
)

set(targets_using_numpy io_datasource io_utils)
foreach(target IN LISTS targets_using_numpy)
find_package(Python 3.8 REQUIRED COMPONENTS Interpreter)
vyasr marked this conversation as resolved.
Show resolved Hide resolved

execute_process(
COMMAND "${Python_EXECUTABLE}" -c "import pyarrow; print(pyarrow.get_include())"
OUTPUT_VARIABLE PYARROW_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)

set(targets_using_numpy_and_arrow_headers io_datasource io_utils)
foreach(target IN LISTS targets_using_numpy_and_arrow_headers)
target_include_directories(${target} PRIVATE "${NumPy_INCLUDE_DIRS}")
target_include_directories(${target} PRIVATE "${PYARROW_INCLUDE_DIR}")
endforeach()