Skip to content

Move cuFile linking to kvikio target #379

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

Merged
rapids-bot merged 13 commits into from
May 15, 2024
Merged

Move cuFile linking to kvikio target #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b31928f
Build Python Conda package with cuFile support
KyleFromNVIDIA May 14, 2024
c8fc2c0
Fix build config
KyleFromNVIDIA May 14, 2024
8b276d3
Debugging
KyleFromNVIDIA May 15, 2024
c8bf1ba
More debugging
KyleFromNVIDIA May 15, 2024
d2d9bc6
Revert "More debugging"
KyleFromNVIDIA May 15, 2024
1f6a806
Revert "Debugging"
KyleFromNVIDIA May 15, 2024
da4592f
Link cuFile at BUILD_LOCAL_INTERFACE level
KyleFromNVIDIA May 15, 2024
5f65ec5
Style
KyleFromNVIDIA May 15, 2024
e6f9396
Test
KyleFromNVIDIA May 15, 2024
c2e7578
Remove Conda changes
KyleFromNVIDIA May 15, 2024
4afceb6
Remove debugging
KyleFromNVIDIA May 15, 2024
8ab148f
Add explanation comment
KyleFromNVIDIA May 15, 2024
6d31725
Fix style
KyleFromNVIDIA May 15, 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
24 changes: 24 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,30 @@ endif()
add_library(kvikio INTERFACE)
add_library(kvikio::kvikio ALIAS kvikio)

# Enable supported cuFile features in KvikIO
Comment thread
KyleFromNVIDIA marked this conversation as resolved.
#
# While the code block below (in the value of final_code_string) sets this information when KvikIO
# is imported from a kvikio-config.cmake file, this code block is intended to be used by projects
# that include KvikIO's source directory in their own CMake build.
#
# Normally we would just set the below without using $<BUILD_LOCAL_INTERFACE:...>, and without the
# final_code_string, but in this case we want to conditionally set these things at import time, not
# export time, since KvikIO is a header-only library that can adapt to different build environments.
if(cuFile_FOUND)
target_link_libraries(kvikio INTERFACE $<BUILD_LOCAL_INTERFACE:cufile::cuFile_interface>)
target_compile_definitions(kvikio INTERFACE $<BUILD_LOCAL_INTERFACE:KVIKIO_CUFILE_FOUND>)
if(cuFile_BATCH_API_FOUND)
target_compile_definitions(
kvikio INTERFACE $<BUILD_LOCAL_INTERFACE:KVIKIO_CUFILE_BATCH_API_FOUND>
)
endif()
if(cuFile_STREAM_API_FOUND)
target_compile_definitions(
kvikio INTERFACE $<BUILD_LOCAL_INTERFACE:KVIKIO_CUFILE_STREAM_API_FOUND>
)
endif()
endif()

target_include_directories(
kvikio INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:include>"
Expand Down
12 changes: 0 additions & 12 deletions cpp/examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,6 @@ set_target_properties(BASIC_IO_TEST PROPERTIES INSTALL_RPATH "\$ORIGIN/../../lib
target_include_directories(BASIC_IO_TEST PRIVATE ../include ${cuFile_INCLUDE_DIRS})
target_link_libraries(BASIC_IO_TEST PRIVATE kvikio CUDA::cudart)

# Enable supported cuFile features in KvikIO examples
if(cuFile_FOUND)
target_link_libraries(BASIC_IO_TEST PRIVATE cufile::cuFile_interface)
target_compile_definitions(BASIC_IO_TEST PRIVATE KVIKIO_CUFILE_FOUND)
if(cuFile_BATCH_API_FOUND)
target_compile_definitions(BASIC_IO_TEST PRIVATE KVIKIO_CUFILE_BATCH_API_FOUND)
endif()
if(cuFile_STREAM_API_FOUND)
target_compile_definitions(BASIC_IO_TEST PRIVATE KVIKIO_CUFILE_STREAM_API_FOUND)
endif()
endif()

if(CMAKE_COMPILER_IS_GNUCXX)
set(KVIKIO_CXX_FLAGS "-Wall;-Werror;-Wno-unknown-pragmas")
target_compile_options(BASIC_IO_TEST PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${KVIKIO_CXX_FLAGS}>")
Expand Down