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

Fea/move to latest nanoarrow #15526

Merged
merged 6 commits into from
Apr 17, 2024
Merged

Fea/move to latest nanoarrow #15526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ad077d
nanoarrow uses package override for proper pinned versions generation
robertmaynard Apr 11, 2024
e007013
update nanoarrow to latest version that has all of our patches integr…
robertmaynard Apr 11, 2024
d649bf4
Merge branch 'branch-24.06' into fea/move_to_latest_nanoarrow
robertmaynard Apr 12, 2024
6616080
Correct style issues found by CI
robertmaynard Apr 15, 2024
a199724
Merge branch 'branch-24.06' into fea/move_to_latest_nanoarrow
robertmaynard Apr 15, 2024
c74ff02
Merge branch 'branch-24.06' into fea/move_to_latest_nanoarrow
vyasr Apr 16, 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
13 changes: 6 additions & 7 deletions cpp/cmake/thirdparty/get_nanoarrow.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@

# This function finds nanoarrow and sets any additional necessary environment variables.
function(find_and_configure_nanoarrow)
include(${rapids-cmake-dir}/cpm/package_override.cmake)

set(cudf_patch_dir "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/patches")
rapids_cpm_package_override("${cudf_patch_dir}/nanoarrow_override.json")

# The git_repo and git_tag are provided by the nanoarrow_override file
# Currently we need to always build nanoarrow so we don't pickup a previous installed version
set(CPM_DOWNLOAD_nanoarrow ON)
rapids_cpm_find(
nanoarrow 0.4.0
nanoarrow 0.5.0
GLOBAL_TARGETS nanoarrow
CPM_ARGS
GIT_REPOSITORY https://github.com/apache/arrow-nanoarrow.git
GIT_TAG 11e73a8c85b45e3d49c8c541b4e1497a649fe03c
GIT_SHALLOW FALSE
OPTIONS "BUILD_SHARED_LIBS OFF" "NANOARROW_NAMESPACE cudf"
)
set_target_properties(nanoarrow PROPERTIES POSITION_INDEPENDENT_CODE ON)
Expand Down
184 changes: 0 additions & 184 deletions cpp/cmake/thirdparty/patches/nanoarrow_cmake.diff
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions cpp/cmake/thirdparty/patches/nanoarrow_override.json
View file
Open in desktop

This file was deleted.

Loading