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

Update for changes to Arrow linkage in libcudf #2357

Merged
merged 5 commits into from
Aug 28, 2024
Merged
Changes from 3 commits
Commits
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
15 changes: 10 additions & 5 deletions src/main/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -153,28 +153,32 @@ find_library(CUDFJNI_LIB "libcudfjni.a" REQUIRED NO_DEFAULT_PATH
HINTS "${CUDFJNI_BUILD_DIR}"
)

# arrow
find_library(ARROW_LIB "libarrow.a" REQUIRED NO_DEFAULT_PATH
HINTS "${CUDFJNI_BUILD_DIR}/_deps/arrow-build/release/"
)

# parquet
find_library(PARQUET_LIB "libparquet.a" REQUIRED NO_DEFAULT_PATH
HINTS "${CUDF_INSTALL_DIR}/lib64"
HINTS "${CUDF_INSTALL_DIR}/lib"
HINTS "${CUDFJNI_BUILD_DIR}/_deps/arrow-build/release/"
)

# Internal parquet headers
set (GENERATED_PARQUET_INCLUDE
"${CUDF_CPP_BUILD_DIR}/_deps/arrow-src/cpp/src/"
"${CUDFJNI_BUILD_DIR}/_deps/arrow-src/cpp/src/"
CACHE STRING "generated parquet thrift headers"
)

# thrift
find_library(THRIFT_LIB "libthrift.a" REQUIRED NO_DEFAULT_PATH
HINTS "${CUDF_CPP_BUILD_DIR}/_deps/arrow-build/thrift_ep-install/lib/"
HINTS "${CUDFJNI_BUILD_DIR}/_deps/arrow-build/thrift_ep-install/lib/"
)

set(CUDFJNI_INCLUDE_DIRS
"${CUDF_DIR}/java/src/main/native/include"
"${CUDF_DIR}/java/src/main/native/src"
"${GENERATED_PARQUET_INCLUDE}"
"${CUDF_CPP_BUILD_DIR}/_deps/arrow-build/thrift_ep-install/include/"
"${CUDFJNI_BUILD_DIR}/_deps/arrow-build/thrift_ep-install/include/"
)

# ##################################################################################################
Expand Down Expand Up @@ -270,6 +274,7 @@ target_link_libraries(
cudf::cudf
nvtx3::nvtx3-cpp
-Wl,--no-whole-archive
${ARROW_LIB}
jlowe marked this conversation as resolved.
Show resolved Hide resolved
${PARQUET_LIB}
${THRIFT_LIB}
)
Expand Down
Loading