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

Update rapids-cmake functions to non-deprecated signatures #14265

Merged
merged 3 commits into from
Oct 16, 2023
Merged

Update rapids-cmake functions to non-deprecated signatures #14265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8ab017
Update rapids-cmake functions to non-deprecated signatures
robertmaynard Oct 10, 2023
0aaf435
Fix style issues found CI
robertmaynard Oct 10, 2023
fd90c59
Fix style issues found CI
robertmaynard Oct 10, 2023
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
12 changes: 7 additions & 5 deletions cpp/cmake/thirdparty/get_arrow.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,11 +387,13 @@ function(find_and_configure_arrow VERSION BUILD_STATIC ENABLE_S3 ENABLE_ORC ENAB
endif()

include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(BUILD Arrow [=[${CMAKE_CURRENT_LIST_DIR}]=] cudf-exports)
if(ENABLE_PARQUET)
rapids_export_find_package_root(BUILD Parquet [=[${CMAKE_CURRENT_LIST_DIR}]=] cudf-exports)
rapids_export_find_package_root(BUILD ArrowDataset [=[${CMAKE_CURRENT_LIST_DIR}]=] cudf-exports)
endif()
rapids_export_find_package_root(BUILD Arrow [=[${CMAKE_CURRENT_LIST_DIR}]=] EXPORT_SET cudf-exports)
rapids_export_find_package_root(BUILD Parquet [=[${CMAKE_CURRENT_LIST_DIR}]=]
EXPORT_SET cudf-exports
CONDITION ENABLE_PARQUET)
rapids_export_find_package_root(BUILD ArrowDataset [=[${CMAKE_CURRENT_LIST_DIR}]=]
EXPORT_SET cudf-exports
CONDITION ENABLE_PARQUET)

set(ARROW_LIBRARIES
"${ARROW_LIBRARIES}"
Expand Down
6 changes: 4 additions & 2 deletions cpp/cmake/thirdparty/get_cufile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ function(find_and_configure_cufile)
if(cuFile_FOUND AND NOT BUILD_SHARED_LIBS)
include("${rapids-cmake-dir}/export/find_package_file.cmake")
rapids_export_find_package_file(
BUILD "${CUDF_SOURCE_DIR}/cmake/Modules/FindcuFile.cmake" cudf-exports
BUILD "${CUDF_SOURCE_DIR}/cmake/Modules/FindcuFile.cmake"
EXPORT_SET cudf-exports
)
rapids_export_find_package_file(
INSTALL "${CUDF_SOURCE_DIR}/cmake/Modules/FindcuFile.cmake" cudf-exports
INSTALL "${CUDF_SOURCE_DIR}/cmake/Modules/FindcuFile.cmake"
EXPORT_SET cudf-exports
)
endif()
endfunction()
Expand Down
3 changes: 2 additions & 1 deletion cpp/cmake/thirdparty/get_gtest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ function(find_and_configure_gtest)

include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(
BUILD GTest [=[${CMAKE_CURRENT_LIST_DIR}]=] cudf-testing-exports
BUILD GTest [=[${CMAKE_CURRENT_LIST_DIR}]=]
EXPORT_SET cudf-testing-exports
)
endif()

Expand Down
8 changes: 4 additions & 4 deletions cpp/cmake/thirdparty/get_kvikio.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ function(find_and_configure_kvikio VERSION)
OPTIONS "KvikIO_BUILD_EXAMPLES OFF"
)

if(KvikIO_BINARY_DIR)
include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(BUILD KvikIO "${KvikIO_BINARY_DIR}" cudf-exports)
endif()
include("${rapids-cmake-dir}/export/find_package_root.cmake")
harrism marked this conversation as resolved.
Show resolved Hide resolved
rapids_export_find_package_root(BUILD KvikIO "${KvikIO_BINARY_DIR}"
EXPORT_SET cudf-exports
CONDITION KvikIO_BINARY_DIR)

endfunction()

Expand Down
19 changes: 9 additions & 10 deletions cpp/cmake/thirdparty/get_libcudacxx.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@ function(find_and_configure_libcudacxx)
include(${rapids-cmake-dir}/cpm/libcudacxx.cmake)
rapids_cpm_libcudacxx(BUILD_EXPORT_SET cudf-exports INSTALL_EXPORT_SET cudf-exports)

if(libcudacxx_SOURCE_DIR)
# Store where CMake can find our custom Thrust install
include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(
INSTALL
libcudacxx
[=[${CMAKE_CURRENT_LIST_DIR}/../../../include/libcudf/lib/rapids/cmake/libcudacxx]=]
cudf-exports
)
endif()
# Store where CMake can find our custom Thrust install
include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(
INSTALL
libcudacxx
[=[${CMAKE_CURRENT_LIST_DIR}/../../../include/libcudf/lib/rapids/cmake/libcudacxx]=]
EXPORT_SET cudf-exports
CONDITION libcudacxx_SOURCE_DIR
)
endfunction()

find_and_configure_libcudacxx()
2 changes: 1 addition & 1 deletion cpp/cmake/thirdparty/get_spdlog.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function(find_and_configure_spdlog)
NAMESPACE spdlog::
)
include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=] cudf-exports)
rapids_export_find_package_root(BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=] EXPORT_SET cudf-exports)
endif()
endfunction()

Expand Down
16 changes: 8 additions & 8 deletions cpp/cmake/thirdparty/get_thrust.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ function(find_and_configure_thrust)
INSTALL_EXPORT_SET cudf-exports
)

if(Thrust_SOURCE_DIR)
# Store where CMake can find our custom Thrust install
include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(
INSTALL Thrust
[=[${CMAKE_CURRENT_LIST_DIR}/../../../include/libcudf/lib/rapids/cmake/thrust]=] cudf-exports
)
endif()
# Store where CMake can find our custom Thrust install
include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(
INSTALL Thrust
[=[${CMAKE_CURRENT_LIST_DIR}/../../../include/libcudf/lib/rapids/cmake/thrust]=]
EXPORT_SET cudf-exports
CONDITION Thrust_SOURCE_DIR
)
endfunction()

find_and_configure_thrust()
Loading