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

Remove another reference to FindcuFile #17315

Merged
merged 9 commits into from
Nov 15, 2024
Merged

Remove another reference to FindcuFile #17315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
beb3817
Remove another reference to FindcuFile
KyleFromNVIDIA Nov 13, 2024
51b48c2
Re-run CI
KyleFromNVIDIA Nov 13, 2024
72276d2
Error if cuFile not found
KyleFromNVIDIA Nov 13, 2024
b9173a1
Backport FindCUDAToolkit from CMake 3.31
KyleFromNVIDIA Nov 14, 2024
afa1f19
Fix include
KyleFromNVIDIA Nov 14, 2024
a54b14e
Exclude FindCUDAToolkit from linting
KyleFromNVIDIA Nov 14, 2024
e055d86
CMAKE_MODULE_PATH
KyleFromNVIDIA Nov 14, 2024
0704f6e
Add option for static cuFile
KyleFromNVIDIA Nov 14, 2024
dceaadb
copyright
KyleFromNVIDIA Nov 14, 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
11 changes: 10 additions & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ repos:
- cmakelang==0.6.13
verbose: true
require_serial: true
exclude: |
(?x)^(
cpp/cmake/Modules/FindCUDAToolkit[.]cmake$
)
- id: cmake-lint
name: cmake-lint
entry: ./cpp/scripts/run-cmake-format.sh cmake-lint
Expand All @@ -116,6 +120,10 @@ repos:
- cmakelang==0.6.13
verbose: true
require_serial: true
exclude: |
(?x)^(
cpp/cmake/Modules/FindCUDAToolkit[.]cmake$
)
- id: doxygen-check
name: doxygen-check
entry: ./ci/checks/doxygen.sh
Expand Down Expand Up @@ -151,7 +159,8 @@ repos:
(?x)^(
cpp/include/cudf_test/cxxopts[.]hpp$|
cpp/src/io/parquet/ipc/Message_generated[.]h$|
cpp/src/io/parquet/ipc/Schema_generated[.]h$
cpp/src/io/parquet/ipc/Schema_generated[.]h$|
cpp/cmake/Modules/FindCUDAToolkit[.]cmake$
)
- id: verify-alpha-spec
- repo: https://github.com/rapidsai/dependency-file-generator
Expand Down
10 changes: 8 additions & 2 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ option(CUDA_ENABLE_LINEINFO
option(CUDA_WARNINGS_AS_ERRORS "Enable -Werror=all-warnings for all CUDA compilation" ON)
# cudart can be statically linked or dynamically linked. The python ecosystem wants dynamic linking
option(CUDA_STATIC_RUNTIME "Statically link the CUDA runtime" OFF)
option(CUDA_STATIC_CUFILE "Statically link cuFile" OFF)
KyleFromNVIDIA marked this conversation as resolved.
Show resolved Hide resolved

set(DEFAULT_CUDF_BUILD_STREAMS_TEST_UTIL ON)
if(CUDA_STATIC_RUNTIME OR NOT BUILD_SHARED_LIBS)
Expand Down Expand Up @@ -238,6 +239,7 @@ rapids_cmake_support_conda_env(conda_env MODIFY_PREFIX_PATH)

# ##################################################################################################
# * compiler options ------------------------------------------------------------------------------
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH})
rapids_find_package(
CUDAToolkit REQUIRED
BUILD_EXPORT_SET cudf-exports
Expand Down Expand Up @@ -899,7 +901,11 @@ target_compile_definitions(cudf PUBLIC "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${LIBCU
target_compile_definitions(cudf PRIVATE $<$<BOOL:${CUDF_KVIKIO_REMOTE_IO}>:CUDF_KVIKIO_REMOTE_IO>)

# Enable cuFile support
if(TARGET CUDA::cuFile)
set(_cufile_suffix)
if(CUDA_STATIC_CUFILE)
set(_cufile_suffix _static)
endif()
if(TARGET CUDA::cuFile${_cufile_suffix})
target_compile_definitions(cudf PRIVATE CUDF_CUFILE_FOUND)
endif()

Expand All @@ -911,7 +917,7 @@ target_link_libraries(
cudf
PUBLIC CCCL::CCCL rmm::rmm $<BUILD_LOCAL_INTERFACE:BS::thread_pool> spdlog::spdlog_header_only
PRIVATE $<BUILD_LOCAL_INTERFACE:nvtx3::nvtx3-cpp> cuco::cuco ZLIB::ZLIB nvcomp::nvcomp
kvikio::kvikio $<TARGET_NAME_IF_EXISTS:CUDA::cuFile> nanoarrow
kvikio::kvikio $<TARGET_NAME_IF_EXISTS:CUDA::cuFile${_cufile_suffix}> nanoarrow
)

# Add Conda library, and include paths if specified
Expand Down
Loading
Loading