Skip to content

Commit

Permalink
Fea/move to latest nanoarrow (#15526)
Browse files Browse the repository at this point in the history
Move to the latest nightly build of nano arrow so that we don't need to keep patches around for it.

Authors:
  - Robert Maynard (https://github.com/robertmaynard)
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #15526
  • Loading branch information
robertmaynard authored Apr 17, 2024
1 parent b378b13 commit 02f8e2f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 209 deletions.
13 changes: 6 additions & 7 deletions cpp/cmake/thirdparty/get_nanoarrow.cmake
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

This file was deleted.

18 changes: 0 additions & 18 deletions cpp/cmake/thirdparty/patches/nanoarrow_override.json

This file was deleted.

0 comments on commit 02f8e2f

Please sign in to comment.