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 to RAPIDS 24.10 #75

Merged
merged 10 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function(morpheus_utils_configure_cccl)
list(APPEND CMAKE_MESSAGE_CONTEXT "cccl")

morpheus_utils_assert_cpm_initialized()
set(cccl_VERSION "2.2.0" CACHE STRING "Version of cccl to use")
set(cccl_VERSION "2.5.0" CACHE STRING "Version of cccl to use")

include("${rapids-cmake-dir}/cpm/cccl.cmake")

Expand Down
12 changes: 11 additions & 1 deletion cmake/morpheus_utils/package_config/glog/Configure_glog.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,17 @@ function(morpheus_utils_configure_glog)
list(APPEND CMAKE_MESSAGE_CONTEXT "glog")

morpheus_utils_assert_cpm_initialized()
set(GLOG_VERSION "0.6" CACHE STRING "Version of glog to use")
set(GLOG_VERSION "0.7.1" CACHE STRING "Version of glog to use")

# GLOG depends on GFlags being available. Import that now
rapids_cpm_find(gflags REQUIRED
GLOBAL_TARGETS
gflags gflags::gflags
BUILD_EXPORT_SET
${PROJECT_NAME}-exports
INSTALL_EXPORT_SET
${PROJECT_NAME}-exports
)

rapids_cpm_find(glog ${GLOG_VERSION}
GLOBAL_TARGETS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ function(morpheus_utils_configure_matx)
list(APPEND CMAKE_MESSAGE_CONTEXT "matx")

morpheus_utils_assert_cpm_initialized()
set(MATX_VERSION "0.7.0" CACHE STRING "Version of MatX to use")
set(MATX_TAG "13076b0c392add7100f55e2aa651653a29f26bf4" CACHE STRING "Tag of MatX to use")
set(MATX_VERSION "0.8.0" CACHE STRING "Version of MatX to use")

if(CUDAToolkit_FOUND AND(CUDAToolkit_VERSION VERSION_GREATER "11.5"))
# Build MatX with 32 bit indexes, this allows matx size types to match those of cuDF
Expand All @@ -36,7 +35,7 @@ function(morpheus_utils_configure_matx)
CPM_ARGS
PATCH_COMMAND git checkout -- . && git apply --whitespace=fix ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/patches/matx_cccl_interface_fix.patch
GIT_REPOSITORY https:/NVIDIA/MatX.git
GIT_TAG "${MATX_TAG}"
GIT_TAG "v${MATX_VERSION}"
GIT_SHALLOW True
OPTIONS "MATX_BUILD_32_BIT ON"
"MATX_BUILD_BENCHMARKS OFF"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
From 6ddba385b27f4f7075fcdd5a0916f59944c3ec16 Mon Sep 17 00:00:00 2001
From: Christopher Harris <[email protected]>
Date: Wed, 7 Aug 2024 21:19:56 +0000
Subject: [PATCH] fix cccl includes
cwharris marked this conversation as resolved.
Show resolved Hide resolved

---
CMakeLists.txt | 2 +-
cmake/FindCCCL.cmake | 20 +++++++++++++-------
2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 154bbf6..b27d6df 100644
index 3037a2f..93806d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,11 @@ endif()
# CMake 3.24 can auto-detect GPUs, but it's not standard on any distrobution. For now, rapids-cmake has a utility
# function to do it, so we grab that as a dependency. The user can optionally override GPU_ARCH to specify
# their own
-add_subdirectory(cmake/rapids-cmake)
-
+if(NOT DEFINED rapids-cmake-dir)
+ add_subdirectory(cmake/rapids-cmake)
+else()
+ list(APPEND CMAKE_MODULE_PATH "${rapids-cmake-dir}")
+endif()
include(rapids-cmake)
include(rapids-cpm)
include(rapids-export)
@@ -101,7 +104,7 @@ message(STATUS "Need CCCL. Finding...")
@@ -117,7 +117,7 @@ message(STATUS "Need CCCL. Finding...")
set(CCCL_VERSION "v2.2.0" CACHE STRING "Version of CCCL to use")
include(cmake/FindCCCL.cmake)

Expand Down Expand Up @@ -58,3 +54,6 @@ index f6caa75..5ea45e4 100644

endfunction()

--
2.43.2