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

Correct static builds + static arrow #15715

Merged
merged 3 commits into from
May 13, 2024
Merged

Correct static builds + static arrow #15715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a3130e
Ensure that our static CI builds also use a static arrow
robertmaynard May 10, 2024
124a985
Ensure that arrow_static doesn't incorrectly export OBJECT dependencies
robertmaynard May 10, 2024
4e475cc
Correct issues found by style check
robertmaynard May 10, 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
2 changes: 1 addition & 1 deletion ci/configure_cpp_static.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ rapids-dependency-file-generator \
python -m pip install -r "${REQUIREMENTS_FILE}"
pyenv rehash

cmake -S cpp -B build_static -GNinja -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF
cmake -S cpp -B build_static -GNinja -DBUILD_SHARED_LIBS=OFF -DCUDF_USE_ARROW_STATIC=ON -DBUILD_TESTS=OFF
15 changes: 14 additions & 1 deletion cpp/cmake/thirdparty/get_arrow.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,20 @@ function(find_and_configure_arrow VERSION BUILD_STATIC ENABLE_S3 ENABLE_ORC ENAB
"
)
endif()

rapids_cmake_install_lib_dir(lib_dir)
if(TARGET arrow_static)
get_target_property(interface_libs arrow_static INTERFACE_LINK_LIBRARIES)
# The `arrow_static` library is leaking a dependency on the object libraries it was built with
# we need to remove this from the interface, since keeping them around would cause duplicate
# symbols and CMake export errors
if(interface_libs MATCHES "arrow_array" AND interface_libs MATCHES "arrow_compute")
string(REPLACE "BUILD_INTERFACE:" "BUILD_LOCAL_INTERFACE:" interface_libs
"${interface_libs}"
)
KyleFromNVIDIA marked this conversation as resolved.
Show resolved Hide resolved
set_target_properties(arrow_static PROPERTIES INTERFACE_LINK_LIBRARIES "${interface_libs}")
get_target_property(interface_libs arrow_static INTERFACE_LINK_LIBRARIES)
endif()
endif()
rapids_export(
BUILD Arrow
VERSION ${VERSION}
Expand Down
Loading