Morpheus changes related to utility consolidation

CMakeLists.txt

@@ -37,7 +37,7 @@ set(MORPHEUS_RAPIDS_CMAKE_VERSION "22.08" CACHE STRING "Sets default versions fo
 set(MORPHEUS_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data")
 mark_as_advanced(MORPHEUS_CACHE_DIR)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

docker/conda/environments/cuda11.5_dev.yml

@@ -29,10 +29,11 @@ dependencies:
     - ccache>=3.7
     - clangdev=14
     - click >=8
-    - cmake=3.22
+    - cmake=3.23.1
     - configargparse=1.5
     - cuda-nvml-dev=11.5
-    - cuda-python<=11.7.0 # Remove when Issue #251 is closed
+    - nvcc_linux-64=11.5
+    - cuda-python<=11.5.0 # Remove when Issue #251 is closed
     - cudatoolkit=11.5
     - cudf 22.08
     - cupy=9.5.0
@@ -43,7 +44,7 @@ dependencies:
     - faker=12.3.0
     - flake8
     - flatbuffers=2.0
-    - gcc_linux-64=9.4
+    - gcc_linux-64=11.2
     - gflags=2.2
     - git>=2.35.3 # Needed for wildcards on safe.directory
     - git-lfs=3.2
@@ -53,7 +54,7 @@ dependencies:
     - grpc-cpp>=1.43
     - grpcio
     - gtest=1.10
-    - gxx_linux-64=9.4
+    - gxx_linux-64=11.2
     - include-what-you-use=0.18
     - isort
     - librdkafka=1.7.0
@@ -81,7 +82,7 @@ dependencies:
     - scikit-build=0.13
     - sphinx
     - sphinx_rtd_theme
-    - mrc 23.01.*
+    - mrc=23.01.*
     - sysroot_linux-64=2.17
     - tqdm=4
     - typing_utils=0.1

morpheus/_lib/CMakeLists.txt

@@ -54,6 +54,69 @@ include(cmake/python_modules/common.cmake)
 #----------morpheus._lib.file_types---------
 include(cmake/python_modules/file_types.cmake)
 
+function(print_target_properties)
+  set(prefix F_ARGV)
+  set(options WRITE_TO_FILE PRINT_NOTFOUND)
+  set(singleValueArgs WRITE_TO_FILE_NAME)
+  set(multiValueArgs TARGETS PROPERTIES)
+
+  include(CMakeParseArguments)
+  cmake_parse_arguments(${prefix}
+      "${options}"
+      "${singleValueArgs}"
+      "${multiValueArgs}"
+      ${ARGN})
+
+  list(SORT F_ARGV_PROPERTIES)
+  list(REMOVE_DUPLICATES F_ARGV_PROPERTIES)
+  foreach(CURRENT_TARGET ${F_ARGV_TARGETS})
+    set(current_properties_list "")
+
+    message(STATUS "[Target Properties '${CURRENT_TARGET}']")
+    message(STATUS "=====================================================")
+    foreach(CURRENT_PROPERTY ${F_ARGV_PROPERTIES})
+      string(STRIP ${CURRENT_PROPERTY} CURRENT_PROPERTY) # Remove trailing/leading whitespace
+      string(REGEX MATCHALL "^[^#].*$" CURRENT_PROPERTY ${CURRENT_PROPERTY}) # Comments hack
+
+      if (NOT CURRENT_PROPERTY)
+        continue()
+      endif()
+
+      get_target_property(CURRENT_PROPERTY_VALUE ${CURRENT_TARGET} ${CURRENT_PROPERTY})
+      if((NOT F_ARGV_PRINT_NOTFOUND) AND ("${CURRENT_PROPERTY_VALUE}" STREQUAL "CURRENT_PROPERTY_VALUE-NOTFOUND"))
+      else()
+        if ("${CURRENT_PROPERTY_VALUE}" STREQUAL "")
+          set(CURRENT_PROPERTY_VALUE "<EMPTY_STR>")
+        else()
+          set(CURRENT_PROPERTY_VALUE "${CURRENT_PROPERTY_VALUE}")
+        endif()
+
+        string(JOIN ", " CURRENT_PROPERTY_VALUE ${CURRENT_PROPERTY_VALUE})
+        list(APPEND current_properties_list "${CURRENT_PROPERTY} -> \"${CURRENT_PROPERTY_VALUE}\"")
+      endif()
+    endforeach()
+
+    foreach(PROPERTY_PAIR ${current_properties_list})
+      if (F_ARGV_WRITE_TO_FILE)
+        FILE(APPEND "${CMAKE_BINARY_DIR}/morpheus_utils_debug_target_properties.txt" ${PROPERTY_PAIR})
+      endif()
+      message(STATUS "${PROPERTY_PAIR}")
+    endforeach()
+  endforeach()
+endfunction()
+
+file(STRINGS "${CMAKE_SOURCE_DIR}/test.cmake.props" PROPS_TO_GET)
+print_target_properties(
+    TARGETS
+      cudf::cudf
+      matx::matx
+      mrc::pymrc
+      cuda_utils_objs
+      cuda_utils
+    PROPERTIES
+      ${PROPS_TO_GET}
+    )
+
 if (MORPHEUS_BUILD_TESTS)
   add_subdirectory(tests)
 endif()

morpheus/_lib/cmake/libraries/cuda_utils.cmake

@@ -18,18 +18,21 @@ find_package(pybind11 REQUIRED)
 
 # Place the two cuda sources in their own target and disable IWYU for that target.
 add_library(cuda_utils_objs
-OBJECT
-      ${MORPHEUS_LIB_ROOT}/src/utilities/matx_util.cu
-      ${MORPHEUS_LIB_ROOT}/src/utilities/type_util.cu
+  OBJECT
+    ${MORPHEUS_LIB_ROOT}/src/utilities/matx_util.cu
+    ${MORPHEUS_LIB_ROOT}/src/utilities/type_util.cu
 )
 
-
 set_target_properties(
-  cuda_utils_objs
+    cuda_utils_objs
     PROPERTIES
-      C_INCLUDE_WHAT_YOU_USE ""
-      CXX_INCLUDE_WHAT_YOU_USE ""
-      EXPORT_COMPILE_COMMANDS OFF
+    CXX_STANDARD 17
+    CXX_STANDARD_REQUIRED ON
+    CUDA_STANDARD 17
+    CUDA_STANDARD_REQUIRED ON
+    C_INCLUDE_WHAT_YOU_USE ""
+    CXX_INCLUDE_WHAT_YOU_USE ""
+    EXPORT_COMPILE_COMMANDS OFF
 )
 
 target_include_directories(cuda_utils_objs
@@ -71,6 +74,15 @@ target_link_libraries(cuda_utils
       pybind11::pybind11
 )
 
+set_target_properties(
+    cuda_utils
+    PROPERTIES
+      CXX_STANDARD 17
+      CXX_STANDARD_REQUIRED ON
+      CUDA_STANDARD 17
+      CUDA_STANDARD_REQUIRED ON
+)
+
 set_target_properties(cuda_utils
     PROPERTIES OUTPUT_NAME ${PROJECT_NAME}_utils
 )