Merge pull request #550 from nv-morpheus/branch-25.06

[RELEASE] MRC v25.06.00

Author: dagardner-nv

.devcontainer/opt/mrc/bin/post-attach-command.sh

@@ -28,6 +28,6 @@ sed -ri "s/conda activate base/conda activate $ENV_NAME/g" ~/.bashrc;
 
 if conda_env_find "${ENV_NAME}" ; \
 
-then mamba env update --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-125_arch-x86_64.yaml --prune; \
-else mamba env create --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-125_arch-x86_64.yaml; \
+then mamba env update --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-128_arch-x86_64.yaml --prune; \
+else mamba env create --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-128_arch-x86_64.yaml; \
 fi

.github/workflows/ci_pipe.yml

@@ -96,11 +96,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
+          fetch-depth: 0
+          fetch-tags: true
           lfs: false
           path: 'mrc'
-          fetch-depth: 0
 
       - name: Get AWS credentials using OIDC
         uses: aws-actions/configure-aws-credentials@v1-node16
@@ -130,8 +131,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
+          fetch-depth: 0
+          fetch-tags: true
           lfs: false
           path: 'mrc'
 
@@ -168,15 +171,17 @@ jobs:
         arch: ["amd64", "arm64"]
         build_cc: ["gcc", "clang"]
         include:
-          - runner: linux-amd64-gpu-v100-latest-1
+          - runner: linux-amd64-gpu-l4-latest-1
             arch: "amd64"
           - runner: linux-arm64-gpu-a100-latest-1
             arch: "arm64"
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
+          fetch-depth: 0
+          fetch-tags: true
           lfs: false
           path: 'mrc'
 
@@ -196,7 +201,7 @@ jobs:
 
   codecov:
     name: Code Coverage
-    runs-on: linux-amd64-gpu-v100-latest-1
+    runs-on: linux-amd64-gpu-l4-latest-1
     timeout-minutes: 60
     container:
       credentials:
@@ -213,8 +218,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
+          fetch-depth: 0
+          fetch-tags: true
           lfs: false
           path: 'mrc'
 
@@ -250,7 +257,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           lfs: false
           path: 'mrc'
@@ -282,7 +289,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           lfs: false
           path: 'mrc'
@@ -323,11 +330,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           lfs: false
           path: 'mrc'
-          fetch-depth: 0
 
       - name: Get AWS credentials using OIDC
         uses: aws-actions/configure-aws-credentials@v1-node16

.github/workflows/pr.yaml

@@ -89,9 +89,9 @@ jobs:
       # Update conda package only for non PR branches. Use 'main' for main branch and 'dev' for all other branches
       conda_upload_label: ${{ !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || '' }}
       # Build container
-      container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-build-241219
+      container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-build-250221
       # Test container
-      test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-241219
+      test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-250221
       # Info about the PR. Empty for non PR branches. Useful for extracting PR number, title, etc.
       pr_info: ${{ needs.prepare.outputs.pr_info }}
     secrets:

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "morpheus_utils"]
 	path = external/utilities
 	url = https://github.com/nv-morpheus/utilities.git
-	branch = branch-25.02
+	branch = branch-25.06

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
         rev: 5.12.0
         hooks:
               - id: isort
-                args: ["--settings-file=./python/setup.cfg"]
+                args: ["--filter-files", "--settings-file=./python/setup.cfg"]
                 files: ^python/
       - repo: https://github.com/PyCQA/flake8
         rev: 6.1.0

CHANGELOG.md

@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,30 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
+# MRC 25.06.00 (22 Jul 2025)
+
+## 🚨 Breaking Changes
+
+- Add a pre-flight check when `pe_count > cpu_set.weight()` ([#547](https://github.com/nv-morpheus/MRC/pull/547)) [@dagardner-nv](https://github.com/dagardner-nv)
+- Bugfix: Remove `MRC_USE_CONDA` option since it must always be On ([#539](https://github.com/nv-morpheus/MRC/pull/539)) [@willkill07](https://github.com/willkill07)
+
+## 🐛 Bug Fixes
+
+- Add a pre-flight check when `pe_count > cpu_set.weight()` ([#547](https://github.com/nv-morpheus/MRC/pull/547)) [@dagardner-nv](https://github.com/dagardner-nv)
+- Bugfix: Remove `MRC_USE_CONDA` option since it must always be On ([#539](https://github.com/nv-morpheus/MRC/pull/539)) [@willkill07](https://github.com/willkill07)
+- Forward-merge branch-25.02 into branch-25.06 ([#534](https://github.com/nv-morpheus/MRC/pull/534)) @rapids-bot[bot]
+
+## 🚀 New Features
+
+- Adopt Python 3.12 ([#544](https://github.com/nv-morpheus/MRC/pull/544)) [@willkill07](https://github.com/willkill07)
+- Adopt Rapids 25.02 ([#536](https://github.com/nv-morpheus/MRC/pull/536)) [@dagardner-nv](https://github.com/dagardner-nv)
+
+## 🛠️ Improvements
+
+- Replace `conda-mambabuild` with `conda-build` ([#546](https://github.com/nv-morpheus/MRC/pull/546)) [@willkill07](https://github.com/willkill07)
+- CI: Add new L4 runner for test ([#531](https://github.com/nv-morpheus/MRC/pull/531)) [@willkill07](https://github.com/willkill07)
+- [chore] Suppress innocent warning with clang; add simple CMakePresets.json ([#530](https://github.com/nv-morpheus/MRC/pull/530)) [@willkill07](https://github.com/willkill07)
+
 # MRC 25.02.00 (03 Feb 2025)
 
 ## 🐛 Bug Fixes

CMakeLists.txt

@@ -33,11 +33,9 @@ option(MRC_ENABLE_DEBUG_INFO "Enable printing debug information" OFF)
 option(MRC_PYTHON_INPLACE_BUILD "Whether or not to copy built python modules back to the source tree for debug purposes." OFF)
 option(MRC_USE_CCACHE "Enable caching compilation results with ccache" OFF)
 option(MRC_USE_CLANG_TIDY "Enable running clang-tidy as part of the build process" OFF)
-option(MRC_USE_CONDA "Enables finding dependencies via conda. All dependencies must be installed first in the conda
-  environment" ON)
 option(MRC_USE_IWYU "Enable running include-what-you-use as part of the build process" OFF)
 
-set(MRC_RAPIDS_VERSION "24.10" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.")
+set(MRC_RAPIDS_VERSION "25.02" 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)
@@ -69,21 +67,18 @@ set(MORPHEUS_UTILS_RAPIDS_CPM_INIT_OVERRIDE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/r
 include(morpheus_utils/load)
 
 # Configure project package manager
-morpheus_utils_initialize_package_manager(
-    MRC_USE_CONDA
-    BUILD_SHARED_LIBS
-    )
+morpheus_utils_initialize_package_manager()
 
 # Configure CUDA architecture
 # NOTE: This MUST occur before any 'project' calls because of rapids_cmake requirements.
 morpheus_utils_initialize_cuda_arch(mrc)
 
 project(mrc
-  VERSION 25.02.00
+  VERSION 25.06.00
   LANGUAGES C CXX
 )
 
-morpheus_utils_initialize_install_prefix(MRC_USE_CONDA)
+morpheus_utils_initialize_install_prefix()
 
 # Delay enabling CUDA until after we have determined our CXX compiler
 if(NOT DEFINED CMAKE_CUDA_HOST_COMPILER)
@@ -112,6 +107,8 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcoroutines-ts")
   endif()
 
+  # Suppress unused argument during compilation due to -L being included
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument")
 endif()
 
 # Now enable CUDA