Forward-merge branch-25.06 into branch-25.10 (#2313)

GPUtester · web-flow · commit 5a23a44c8ff2 · 2025-09-04T15:15:46.000-04:00
Forward-merge triggered by push to branch-25.06 that creates a PR to keep branch-25.10 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See [forward-merger docs](https://docs.rapids.ai/maintainers/forward-merger/) for more info.
diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml
@@ -155,9 +155,9 @@ jobs:
       matrix:
         arch: ["amd64", "arm64"]
         include:
-          - runner: linux-amd64-gpu-l4-latest-1
+          - runner: linux-amd64-gpu-l4-earliest-1
             arch: "amd64"
-          - runner: linux-arm64-gpu-a100-latest-1
+          - runner: linux-arm64-gpu-a100-earliest-1
             arch: "arm64"
 
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -80,6 +80,18 @@ limitations under the License.
 - Forward merge branch-25.02 into branch-25.06 ([#2197](https://github.com/nv-morpheus/Morpheus/pull/2197)) [@willkill07](https://github.com/willkill07)
 - CI: Add new L4 runner for test ([#2145](https://github.com/nv-morpheus/Morpheus/pull/2145)) [@willkill07](https://github.com/willkill07)
 
+# Morpheus 25.02.03 (03 Sep 2025)
+
+## 🛠️ Improvements
+
+- Forward-merge branch-24.10 into branch-25.02 ([#2310](https://github.com/nv-morpheus/Morpheus/pull/2310))
+
+# Morpheus 25.02.02 (29 Aug 2025)
+
+## 🛠️ Improvements
+
+- Forward-merge branch-24.10 into branch-25.02 ([#2302](https://github.com/nv-morpheus/Morpheus/pull/2302))
+
 # Morpheus 25.02.01 (28 Feb 2025)
 
 ## 🐛 Bug Fixes
@@ -150,6 +162,17 @@ limitations under the License.
 - Improve `SharedProcessPool` tests performance ([#1950](https://github.com/nv-morpheus/Morpheus/pull/1950)) [@yczhang-nv](https://github.com/yczhang-nv)
 - Add parquet support to write_to_file_stage.py ([#1937](https://github.com/nv-morpheus/Morpheus/pull/1937)) [@yczhang-nv](https://github.com/yczhang-nv)
 
+# Morpheus 24.10.03 (03 Sep 2025)
+
+## 🐛 Bug Fixes
+- Dependency fixes for 24.10 ([#2309](https://github.com/nv-morpheus/Morpheus/pull/2309)) [@dagardner-nv](https://github.com/dagardner-nv)
+
+# Morpheus 24.10.02 (29 Aug 2025)
+
+## 🛠️ Improvements
+- Forward-merge branch-24.06 into branch-24.10 ([#2300](https://github.com/nv-morpheus/Morpheus/pull/2300))
+- Forward-merge branch-24.06 into branch-24.10 ([#2245](https://github.com/nv-morpheus/Morpheus/pull/2245))
+
 # Morpheus 24.10.01 (22 Nov 2024)
 
 ## 🐛 Bug Fixes
@@ -296,6 +319,16 @@ limitations under the License.
 - Removing support for `MultiMessage` from stages ([#1803](https://github.com/nv-morpheus/Morpheus/pull/1803)) [@yczhang-nv](https://github.com/yczhang-nv)
 - Batch incoming DOCA raw packet data ([#1731](https://github.com/nv-morpheus/Morpheus/pull/1731)) [@dagardner-nv](https://github.com/dagardner-nv)
 
+# Morpheus 24.06.03 (03 Sep 2025)
+
+## 🐛 Bug Fixes
+- Misc version and CI fixes ([#2306](https://github.com/nv-morpheus/Morpheus/pull/2306)) [@dagardner-nv](https://github.com/dagardner-nv)
+
+# Morpheus 24.06.02 (29 Aug 2025)
+
+## 🛠️ Improvements
+- Update dependencies for Morpheus 24.06 container ([#2217](https://github.com/nv-morpheus/Morpheus/pull/2217)) [@yczhang-nv](https://github.com/yczhang-nv)
+
 # Morpheus 24.06.01 (23 Aug 2024)
 
 ## 🛠️ Improvements
diff --git a/ci/vale/styles/config/vocabularies/morpheus/accept.txt b/ci/vale/styles/config/vocabularies/morpheus/accept.txt
@@ -46,6 +46,7 @@ LLM(s?)
 # https://github.com/logpai/loghub/
 Loghub
 Milvus
+Numba
 PyPI
 [Mm]ixin
 MLflow
diff --git a/conda/environments/all_cuda-128_arch-aarch64.yaml b/conda/environments/all_cuda-128_arch-aarch64.yaml
@@ -77,6 +77,7 @@ dependencies:
 - nlohmann_json=3.11
 - nodejs=18.*
 - numba=0.60
+- numba=0.60.0
 - numexpr
 - numpydoc=1.5
 - onnx=1.15
@@ -127,13 +128,12 @@ dependencies:
 - yapf=0.43
 - pip:
   - --extra-index-url https://download.pytorch.org/whl/cu124
-  - --find-links https://data.dgl.ai/wheels/torch-2.3/repo.html
   - --find-links https://data.dgl.ai/wheels/torch-2.4/cu124/repo.html
   - databricks-cli < 0.100
   - databricks-connect
   - dgl
   - exhale>=0.3.7
-  - faiss-cpu
+  - faiss-cpu==1.9
   - google-search-results==2.4
   - gpudb>=7.2.2.3
   - langchain-nvidia-ai-endpoints==0.0.11
diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml
@@ -79,6 +79,7 @@ dependencies:
 - nlohmann_json=3.11
 - nodejs=18.*
 - numba=0.60
+- numba=0.60.0
 - numexpr
 - numpydoc=1.5
 - onnx=1.15
@@ -133,13 +134,12 @@ dependencies:
 - yapf=0.43
 - pip:
   - --extra-index-url https://download.pytorch.org/whl/cu124
-  - --find-links https://data.dgl.ai/wheels/torch-2.3/repo.html
   - --find-links https://data.dgl.ai/wheels/torch-2.4/cu124/repo.html
   - databricks-cli < 0.100
   - databricks-connect
   - dgl
   - exhale>=0.3.7
-  - faiss-cpu
+  - faiss-cpu==1.9
   - google-search-results==2.4
   - gpudb>=7.2.2.3
   - langchain-nvidia-ai-endpoints==0.0.11
diff --git a/conda/environments/dev_cuda-128_arch-aarch64.yaml b/conda/environments/dev_cuda-128_arch-aarch64.yaml
@@ -65,6 +65,7 @@ dependencies:
 - nlohmann_json=3.11
 - nodejs=18.*
 - numba=0.60
+- numba=0.60.0
 - numpydoc=1.5
 - pip
 - pkg-config=0.29
diff --git a/conda/environments/dev_cuda-128_arch-x86_64.yaml b/conda/environments/dev_cuda-128_arch-x86_64.yaml
@@ -66,6 +66,7 @@ dependencies:
 - nlohmann_json=3.11
 - nodejs=18.*
 - numba=0.60
+- numba=0.60.0
 - numpydoc=1.5
 - pip
 - pkg-config=0.29
diff --git a/conda/environments/examples_cuda-128_arch-aarch64.yaml b/conda/environments/examples_cuda-128_arch-aarch64.yaml
@@ -36,6 +36,7 @@ dependencies:
 - networkx=2.8.8
 - nodejs=18.*
 - numba=0.60
+- numba=0.60.0
 - numexpr
 - numpydoc=1.5
 - onnx=1.15
@@ -67,12 +68,11 @@ dependencies:
 - yaml=0.2
 - pip:
   - --extra-index-url https://download.pytorch.org/whl/cu124
-  - --find-links https://data.dgl.ai/wheels/torch-2.3/repo.html
   - --find-links https://data.dgl.ai/wheels/torch-2.4/cu124/repo.html
   - databricks-cli < 0.100
   - databricks-connect
   - dgl
-  - faiss-cpu
+  - faiss-cpu==1.9
   - google-search-results==2.4
   - gpudb>=7.2.2.3
   - langchain-nvidia-ai-endpoints==0.0.11
diff --git a/conda/environments/examples_cuda-128_arch-x86_64.yaml b/conda/environments/examples_cuda-128_arch-x86_64.yaml
@@ -37,6 +37,7 @@ dependencies:
 - newspaper3k==0.2.8
 - nodejs=18.*
 - numba=0.60
+- numba=0.60.0
 - numexpr
 - numpydoc=1.5
 - onnx=1.15
@@ -69,12 +70,11 @@ dependencies:
 - yaml=0.2
 - pip:
   - --extra-index-url https://download.pytorch.org/whl/cu124
-  - --find-links https://data.dgl.ai/wheels/torch-2.3/repo.html
   - --find-links https://data.dgl.ai/wheels/torch-2.4/cu124/repo.html
   - databricks-cli < 0.100
   - databricks-connect
   - dgl
-  - faiss-cpu
+  - faiss-cpu==1.9
   - google-search-results==2.4
   - gpudb>=7.2.2.3
   - langchain-nvidia-ai-endpoints==0.0.11
diff --git a/conda/environments/runtime_cuda-128_arch-aarch64.yaml b/conda/environments/runtime_cuda-128_arch-aarch64.yaml
@@ -30,6 +30,7 @@ dependencies:
 - mrc=25.10
 - networkx=2.8.8
 - numba=0.60
+- numba=0.60.0
 - numpydoc=1.5
 - pip
 - pluggy=1.3
diff --git a/conda/environments/runtime_cuda-128_arch-x86_64.yaml b/conda/environments/runtime_cuda-128_arch-x86_64.yaml
@@ -30,6 +30,7 @@ dependencies:
 - mrc=25.10
 - networkx=2.8.8
 - numba=0.60
+- numba=0.60.0
 - numpydoc=1.5
 - pip
 - pluggy=1.3
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -38,6 +38,7 @@ files:
       - example-dlp
       - example-gnn
       - example-llms
+      - optional_databricks
       - python
       - runtime
       - test_python_morpheus
@@ -417,6 +418,7 @@ dependencies:
           - networkx=2.8.8
           - numba=0.60 # Pin version to avoid https://github.com/nv-morpheus/Morpheus/issues/2166
           - numpydoc=1.5
+          - numba=0.60.0
           - pydantic
           - python-confluent-kafka=2.6.1
           - python-graphviz
@@ -503,7 +505,7 @@ dependencies:
     common:
       - output_types: [requirements]
         packages:
-           - &faiss-cpu faiss-cpu
+           - &faiss-cpu faiss-cpu==1.9 # Pinning to 1.9 due to incompatibility with numpy
            - &google-search-results google-search-results==2.4
            - *gpudb
            - &langchain langchain==0.1.16
@@ -557,7 +559,6 @@ dependencies:
           - &cuml cuml=25.02.*
           - pip
           - pip:
-            - --find-links https://data.dgl.ai/wheels/torch-2.3/repo.html
             - --find-links https://data.dgl.ai/wheels/torch-2.4/cu124/repo.html
             - dgl
 
diff --git a/docs/source/extra_info/known_issues.md b/docs/source/extra_info/known_issues.md
@@ -17,6 +17,7 @@ limitations under the License.
 
 # Known Issues
 
+- Numba triggering IndexError on systems with driver version 580+ ([#2305](https://github.com/nv-morpheus/Morpheus/issues/2305))
 - `ransomware_detection` example pipeline occasionally logs a `distributed.comm.core.CommClosedError` error during shutdown ([#2026](https://github.com/nv-morpheus/Morpheus/issues/2026)).
 - Arm64 users need to install CUDA enabled PyTorch by hand ([#2095](https://github.com/nv-morpheus/Morpheus/issues/2095))
 - Performance issues were observed running the `abp_pcap_detection` and `ransomware_detection` pipelines on AArch64 ([#2120](https://github.com/nv-morpheus/Morpheus/issues/2120)) & ([#2124](https://github.com/nv-morpheus/Morpheus/issues/2124)) on Ubuntu 22.04. Arm64 users should consider upgrading to Ubuntu 24.04.
diff --git a/python/morpheus_llm/morpheus_llm/requirements_morpheus_llm_arch-aarch64.txt b/python/morpheus_llm/morpheus_llm/requirements_morpheus_llm_arch-aarch64.txt
@@ -1,7 +1,7 @@
 # This file is generated by `rapids-dependency-file-generator`.
 # To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
 --extra-index-url https://download.pytorch.org/whl/cu124
-faiss-cpu
+faiss-cpu==1.9
 google-search-results==2.4
 gpudb>=7.2.2.3
 langchain-nvidia-ai-endpoints==0.0.11
diff --git a/python/morpheus_llm/morpheus_llm/requirements_morpheus_llm_arch-x86_64.txt b/python/morpheus_llm/morpheus_llm/requirements_morpheus_llm_arch-x86_64.txt
@@ -1,7 +1,7 @@
 # This file is generated by `rapids-dependency-file-generator`.
 # To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
 --extra-index-url https://download.pytorch.org/whl/cu124
-faiss-cpu
+faiss-cpu==1.9
 google-search-results==2.4
 gpudb>=7.2.2.3
 langchain-nvidia-ai-endpoints==0.0.11
diff --git a/tests/morpheus/test_cli.py b/tests/morpheus/test_cli.py
@@ -133,7 +133,7 @@ def config_warning_fixture():
 
 
 @pytest.mark.reload_modules(commands)
-@pytest.mark.usefixtures("chdir_tmpdir", "reload_modules")
+@pytest.mark.usefixtures("chdir_tmpdir", "reload_modules", "reset_logging")
 class TestCLI:
 
     @pytest.mark.parametrize(
