Update Versions for 23.01 (nv-morpheus#242)

Updates the necessary versions for 23.01. Biggest change is requirement for cmake 3.23.1 as required by RAPIDS Cmake 22.10. Closes nv-morpheus#229 Authors: - Michael Demoret (https://github.com/mdemoret-nv) Approvers: - Ryan Olson (https://github.com/ryanolson) - Devin Robison (https://github.com/drobison00) URL: nv-morpheus#242
AyodeAwe · Dec 13, 2022 · 6817831 · 6817831
1 parent 3c15683
commit 6817831
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 68 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
 
 list(APPEND CMAKE_MESSAGE_CONTEXT "mrc")
 
@@ -33,7 +33,7 @@ option(MRC_USE_CONDA "Enables finding dependencies via conda instead of vcpkg. N
 option(MRC_USE_IWYU "Enable running include-what-you-use as part of the build process" OFF)
 option(MRC_ENABLE_CODECOV "Enable gcov code coverage" OFF)
 
-set(MRC_RAPIDS_VERSION "22.08" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.")
+set(MRC_RAPIDS_VERSION "22.10" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.")
 
 set(MRC_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data")
 mark_as_advanced(MRC_CACHE_DIR)
@@ -49,16 +49,16 @@ enable_testing()
 # Add the RAPIDS cmake helper scripts
 include(cmake/import_rapids_cmake.cmake)
 
-# Default to using "NATIVE" for CUDA_ARCHITECTURES to build based on GPU in system
+# Default to using "native" (case-sensitive) for CUDA_ARCHITECTURES to build based on GPU in system
 if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
-  set(CMAKE_CUDA_ARCHITECTURES "NATIVE")
+  set(CMAKE_CUDA_ARCHITECTURES "native")
   message(STATUS "CMAKE_CUDA_ARCHITECTURES was not defined. Defaulting to '${CMAKE_CUDA_ARCHITECTURES}' to build only for local architecture. Specify -DCMAKE_CUDA_ARCHITECTURES='ALL' to build for all archs.")
 endif()
 
 rapids_cuda_init_architectures(mrc)
 
 project(mrc
-  VERSION 22.11.00
+  VERSION 23.01.00
   LANGUAGES C CXX
 )
 

diff --git a/ci/conda/environments/dev_env.yml b/ci/conda/environments/dev_env.yml
@@ -8,7 +8,7 @@ dependencies:
   - benchmark=1.6.0
   - boost-cpp=1.74
   - ccache
-  - cmake=3.22
+  - cmake=3.24
   - cuda-nvml-dev=11.4
   - cudatoolkit=11.4
   - cython=0.29.24
@@ -24,11 +24,12 @@ dependencies:
   - grpc-cpp=1.46
   - gtest=1.10
   - gxx_linux-64=11.2
+  - isort
   - jinja2=3.0
   - lcov=1.15
   - libhwloc=2.5
   - libprotobuf=3.20
-  - librmm=22.08
+  - librmm=22.10
   - libtool
   - ninja=1.10
   - nlohmann_json=3.9
@@ -46,7 +47,6 @@ dependencies:
   - pip:
     - cython
     - flake8
-    - isort
     - numpy==1.21.2
     - pytest
     - pytest-timeout

diff --git a/ci/conda/environments/dev_env_nogcc.yml b/ci/conda/environments/dev_env_nogcc.yml
@@ -8,7 +8,7 @@ dependencies:
   - benchmark=1.6.0
   - boost-cpp=1.74
   - ccache
-  - cmake>=3.22
+  - cmake>=3.24
   - cython=0.29.24
   - doxygen=1.9.2
   - flatbuffers=2.0
@@ -19,9 +19,10 @@ dependencies:
   - graphviz=3.0
   - grpc-cpp=1.46
   - gtest=1.10
+  - isort
   - libhwloc=2.5
   - libprotobuf=3.20
-  - librmm=22.08
+  - librmm=22.10
   - ninja=1.10
   - nlohmann_json=3.9
   - pkg-config=0.29
@@ -32,7 +33,6 @@ dependencies:
   - pip:
     - cython
     - flake8
-    - isort
     - pytest
     - pytest-timeout
     - yapf
diff --git a/ci/conda/recipes/libmrc/conda_build_config.yaml b/ci/conda/recipes/libmrc/conda_build_config.yaml
@@ -31,29 +31,31 @@ python:
 
 # Setup the dependencies to build with multiple versions of RAPIDS
 rapids_version: # Keep around compatibility with current version -1
-  - 22.06
   - 22.08
   - 22.08
+  - 22.10
+
 
 # Multiple versions of abseil are required to satisfy the solver for some
 # environments. RAPIDS 22.06 only works with gRPC 1.45 and 22.08 only works with
 # 1.46. For each version of gRPC, support 2 abseil versions. Zip all of the keys
 # together to avoid impossible combinations
 abseil_cpp:
-  - 20210324.2
   - 20211102.0
   - 20220623.0
+  - 20220623.0
 
 grpc_cpp:
-  - 1.45
+  - 1.46
   - 1.46
   - 1.46
 
 # UCX 1.12 is required for RAPIDS 22.06
 ucx:
-  - 1.12
   - 1.13
   - 1.13
+  - 1.13
+
 
 zip_keys:
   - rapids_version

diff --git a/ci/conda/recipes/libmrc/meta.yaml b/ci/conda/recipes/libmrc/meta.yaml
@@ -42,7 +42,7 @@ requirements:
     - {{ compiler("cxx") }}
     - autoconf >=2.69
     - ccache
-    - cmake 3.22.*
+    - cmake >=3.24
     - libtool
     - ninja
     - numactl-libs-cos7-x86_64
@@ -87,7 +87,7 @@ outputs:
         - {{ compiler("c") }}
         - {{ compiler("cuda") }}
         - {{ compiler("cxx") }}
-        - cmake 3.22.*
+        - cmake >=3.24
         - numactl-libs-cos7-x86_64
         - sysroot_linux-64 2.17
       host:

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -143,7 +143,6 @@ include(deps/Configure_prometheus)
 
 # libcudacxx
 # =========
-set(LIBCUDACXX_VERSION "1.8.0" CACHE STRING "Version of libcudacxx to use")
 include(deps/Configure_libcudacxx)
 
 if(MRC_BUILD_BENCHMARKS)

diff --git a/cmake/deps/Configure_libcudacxx.cmake b/cmake/deps/Configure_libcudacxx.cmake
@@ -15,7 +15,7 @@
 # limitations under the License.
 #=============================================================================
 
-function(find_and_configure_libcudacxx version)
+function(find_and_configure_libcudacxx)
 
   list(APPEND CMAKE_MESSAGE_CONTEXT "libcudacxx")
 
@@ -35,4 +35,4 @@ function(find_and_configure_libcudacxx version)
 
 endfunction()
 
-find_and_configure_libcudacxx(${LIBCUDACXX_VERSION})
+find_and_configure_libcudacxx()
diff --git a/cmake/deps/Configure_taskflow.cmake b/cmake/deps/Configure_taskflow.cmake
diff --git a/docs/quickstart/CMakeLists.txt b/docs/quickstart/CMakeLists.txt
@@ -15,7 +15,7 @@
 
 list(APPEND CMAKE_MESSAGE_CONTEXT "quickstart")
 
-cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
 
 # Add the Conda environment to the prefix path and add the CMake files
 list(PREPEND CMAKE_PREFIX_PATH "$ENV{CONDA_PREFIX}")
@@ -25,7 +25,7 @@ list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake")
 include(import_rapids_cmake)
 
 project(mrc-quickstart
-  VERSION 22.11.00
+  VERSION 23.01
   LANGUAGES C CXX
 )
 

diff --git a/docs/quickstart/environment_cpp.yml b/docs/quickstart/environment_cpp.yml
@@ -21,6 +21,7 @@ dependencies:
   - graphviz=3.0
   - gtest=1.10
   - gxx_linux-64=11.2
+  - isort
   - libtool
   - ninja=1.10
   - numactl-libs-cos7-x86_64
@@ -30,12 +31,11 @@ dependencies:
   - python=3.8
   - scikit-build>=0.12
   - spdlog=1.8.5
-  - mrc=22.11
+  - mrc=23.01
   - sysroot_linux-64=2.17
   - pip:
     - cython
     - flake8
-    - isort
     - numpy==1.21.2
     - pytest
     - pytest-timeout

diff --git a/python/tests/test_module_registry.py b/python/tests/test_module_registry.py
@@ -45,7 +45,7 @@ def test_contains():
 def test_is_version_compatible():
     registry = mrc.ModuleRegistry
 
-    release_version = [22, 11, 0]
+    release_version = [int(x) for x in mrc.__version__.split(".")]
     old_release_version = [22, 10, 0]
     no_version_patch = [22, 10]
     no_version_minor_and_patch = [22]