Update to RAPIDS 24.10 (#75)

Authors:
  - Christopher Harris (https://github.com/cwharris)
  - Michael Demoret (https://github.com/mdemoret-nv)

Approvers:
  - David Gardner (https://github.com/dagardner-nv)

URL: #75

cmake/morpheus_utils/package_config/cccl/Configure_cccl.cmake

@@ -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")
 

cmake/morpheus_utils/package_config/glog/Configure_glog.cmake

@@ -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

cmake/morpheus_utils/package_config/matx/Configure_matx.cmake

@@ -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
@@ -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://github.com/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"

cmake/morpheus_utils/package_config/matx/patches/matx_cccl_interface_fix.patch

@@ -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
+
+---
+ 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)
 
@@ -58,3 +54,6 @@ index f6caa75..5ea45e4 100644
 
  endfunction()
 
+-- 
+2.43.2
+

cmake/morpheus_utils/package_config/nlohmann_json/Configure_nlohmann_json.cmake

@@ -0,0 +1,40 @@
+#=============================================================================
+# SPDX-FileCopyrightText: Copyright (c) 2020-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+include_guard(GLOBAL)
+
+function(morpheus_utils_configure_nlohmann_json)
+  list(APPEND CMAKE_MESSAGE_CONTEXT "nlohmann_json")
+
+  morpheus_utils_assert_cpm_initialized()
+  set(nlohmann_json_VERSION "3.11.3" CACHE STRING "Version of nlohmann_json to use")
+
+  rapids_cpm_find(nlohmann_json ${nlohmann_json_VERSION}
+    GLOBAL_TARGETS
+      nlohmann_json nlohmann_json::nlohmann_json
+    BUILD_EXPORT_SET
+      ${PROJECT_NAME}-exports
+    INSTALL_EXPORT_SET
+      ${PROJECT_NAME}-exports
+    CPM_ARGS
+        GIT_REPOSITORY          https://github.com/nlohmann/json.git
+        GIT_TAG                 "v${nlohmann_json_VERSION}"
+        OPTIONS                 "JSON_Install ON"
+  )
+
+  list(POP_BACK CMAKE_MESSAGE_CONTEXT)
+endfunction()

cmake/morpheus_utils/package_config/register_api.cmake

@@ -34,6 +34,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/grpc/Configure_grpc.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/hwloc/Configure_hwloc.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/matx/Configure_matx.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/mrc/Configure_mrc.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/nlohmann_json/Configure_nlohmann_json.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/prometheus/Configure_prometheus.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/pybind11/Configure_pybind11.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/rdkafka/Configure_rdkafka.cmake)