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

Replace FindcuFile with upstream FindCUDAToolkit support #17298

Merged
merged 2 commits into from
Nov 13, 2024
Merged

Replace FindcuFile with upstream FindCUDAToolkit support #17298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f35db25
Replace FindcuFile with upstream FindCUDAToolkit support
KyleFromNVIDIA Nov 12, 2024
ccda642
CUDF_CUFILE_FOUND
KyleFromNVIDIA Nov 12, 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
12 changes: 6 additions & 6 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,6 @@ if(CUDF_BUILD_TESTUTIL)
endif()
# preprocess jitify-able kernels
include(cmake/Modules/JitifyPreprocessKernels.cmake)
# find cuFile
include(cmake/thirdparty/get_cufile.cmake)
# find KvikIO
include(cmake/thirdparty/get_kvikio.cmake)
# find fmt
Expand All @@ -302,9 +300,6 @@ if(NOT BUILD_SHARED_LIBS)
include("${rapids-cmake-dir}/export/find_package_file.cmake")
list(APPEND METADATA_KINDS BUILD INSTALL)
list(APPEND dependencies KvikIO ZLIB nvcomp nanoarrow)
if(TARGET cufile::cuFile_interface)
list(APPEND dependencies cuFile)
endif()

foreach(METADATA_KIND IN LISTS METADATA_KINDS)
foreach(dep IN LISTS dependencies)
Expand Down Expand Up @@ -902,6 +897,11 @@ target_compile_definitions(cudf PUBLIC "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${LIBCU
# Enable remote IO through KvikIO
target_compile_definitions(cudf PRIVATE $<$<BOOL:${CUDF_KVIKIO_REMOTE_IO}>:CUDF_KVIKIO_REMOTE_IO>)

# Enable cuFile support
if(TARGET CUDA::cuFile)
target_compile_definitions(cudf PRIVATE CUDF_CUFILE_FOUND)
endif()

# Compile stringified JIT sources first
add_dependencies(cudf jitify_preprocess_run)

Expand All @@ -910,7 +910,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:cuFile_interface> nanoarrow
kvikio::kvikio $<TARGET_NAME_IF_EXISTS:CUDA::cuFile> nanoarrow
)

# Add Conda library, and include paths if specified
Expand Down
120 changes: 0 additions & 120 deletions cpp/cmake/Modules/FindcuFile.cmake
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions cpp/cmake/thirdparty/get_cufile.cmake
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cpp/src/io/utilities/file_io_utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ file_wrapper::file_wrapper(std::string const& filepath, int flags, mode_t mode)

file_wrapper::~file_wrapper() { close(fd); }

#ifdef CUFILE_FOUND
#ifdef CUDF_CUFILE_FOUND

/**
* @brief Class that dynamically loads the cuFile library and manages the cuFile driver.
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/io/utilities/file_io_utilities.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#ifdef CUFILE_FOUND
#ifdef CUDF_CUFILE_FOUND
#include <cudf_test/file_utilities.hpp>

#include <BS_thread_pool.hpp>
Expand Down Expand Up @@ -97,7 +97,7 @@ class cufile_output {
virtual std::future<void> write_async(void const* data, size_t offset, size_t size) = 0;
};

#ifdef CUFILE_FOUND
#ifdef CUDF_CUFILE_FOUND
KyleFromNVIDIA marked this conversation as resolved.
Show resolved Hide resolved

class cufile_shim;

Expand Down
Loading