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.

Sign up for GitHub

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

Jump to bottom

Fix arrow versioning logic #15755

Merged
merged 4 commits into from
May 15, 2024
Merged

Fix arrow versioning logic #15755

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fe7b95
Pin to minor version
vyasr May 14, 2024
df8e8fb
Update CMake logic
vyasr May 14, 2024
713cd51
Add padding
vyasr May 14, 2024
4c5b723
Remove debug print
vyasr May 14, 2024
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
23 changes: 16 additions & 7 deletions cpp/cmake/thirdparty/get_arrow.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,22 @@ include_guard(GLOBAL)
# pyarrow.
function(find_libarrow_in_python_wheel PYARROW_VERSION)
string(REPLACE "." ";" PYARROW_VER_COMPONENTS "${PYARROW_VERSION}")
list(GET PYARROW_VER_COMPONENTS 0 PYARROW_SO_VER)
# The soname for Arrow libraries is constructed using the major version plus "00". Note that,
# although it may seem like it due to Arrow almost exclusively releasing new major versions (i.e.
# `${MINOR_VERSION}${PATCH_VERSION}` is almost always equivalent to "00"),
# the soname is not generated by concatenating the major, minor, and patch versions into a single
# version number soname, just `${MAJOR_VERSION}00`
set(PYARROW_LIB "libarrow.so.${PYARROW_SO_VER}00")
list(GET PYARROW_VER_COMPONENTS 0 PYARROW_MAJOR_VER)
list(GET PYARROW_VER_COMPONENTS 1 PYARROW_MINOR_VER)

# Ensure that the major and minor versions are two digits long
string(LENGTH ${PYARROW_MAJOR_VER} PYARROW_MAJOR_LENGTH)
string(LENGTH ${PYARROW_MINOR_VER} PYARROW_MINOR_LENGTH)
if(${PYARROW_MAJOR_LENGTH} EQUAL 1)
set(PYARROW_MAJOR_VER "0${PYARROW_MAJOR_VER}")
endif()
if(${PYARROW_MINOR_LENGTH} EQUAL 1)
set(PYARROW_MINOR_VER "0${PYARROW_MINOR_VER}")
endif()

set(PYARROW_LIB "libarrow.so.${PYARROW_MAJOR_VER}${PYARROW_MINOR_VER}")

message("The pyarrow lib is ${PYARROW_LIB}")
vyasr marked this conversation as resolved.
Show resolved Hide resolved

string(
APPEND
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,8 @@ dependencies:
common:
- output_types: [conda, requirements, pyproject]
packages:
# Allow runtime version to float up to minor version
- pyarrow>=16.0.0,<17.0.0a0
# Allow runtime version to float up to patch version
- pyarrow>=16.0.0,<16.1.0a0
cuda_version:
specific:
- output_types: conda
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies = [
"packaging",
"pandas>=2.0,<2.2.3dev0",
"ptxcompiler",
"pyarrow>=16.0.0,<17.0.0a0",
"pyarrow>=16.0.0,<16.1.0a0",
"rich",
"rmm==24.6.*",
"typing_extensions>=4.0.0",
Expand Down
Loading