Skip to content

Commit faa06a2

Browse files
committed
Merge branch-24.10 into branch-25.02
Signed-off-by: David Gardner <[email protected]>
2 parents 60c9cd5 + 1785ef8 commit faa06a2

File tree

12 files changed

+38
-20
lines changed

12 files changed

+38
-20
lines changed

.github/workflows/ci_pipe.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ jobs:
155155
matrix:
156156
arch: ["amd64", "arm64"]
157157
include:
158-
- runner: linux-amd64-gpu-l4-latest-1
158+
- runner: linux-amd64-gpu-l4-earliest-1
159159
arch: "amd64"
160-
- runner: linux-arm64-gpu-a100-latest-1
160+
- runner: linux-arm64-gpu-a100-earliest-1
161161
arch: "arm64"
162162

163163
steps:

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ limitations under the License.
9191
- Improve `SharedProcessPool` tests performance ([#1950](https://github.com/nv-morpheus/Morpheus/pull/1950)) [@yczhang-nv](https://github.com/yczhang-nv)
9292
- 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)
9393

94+
# Morpheus 24.10.03 (03 Sep 2025)
95+
96+
## 🐛 Bug Fixes
97+
- Dependency fixes for 24.10 ([#2309](https://github.com/nv-morpheus/Morpheus/pull/2309)) [@dagardner-nv](https://github.com/dagardner-nv)
98+
9499
# Morpheus 24.10.02 (29 Aug 2025)
95100

96101
## 🛠️ Improvements
@@ -243,6 +248,11 @@ limitations under the License.
243248
- Removing support for `MultiMessage` from stages ([#1803](https://github.com/nv-morpheus/Morpheus/pull/1803)) [@yczhang-nv](https://github.com/yczhang-nv)
244249
- Batch incoming DOCA raw packet data ([#1731](https://github.com/nv-morpheus/Morpheus/pull/1731)) [@dagardner-nv](https://github.com/dagardner-nv)
245250

251+
# Morpheus 24.06.03 (03 Sep 2025)
252+
253+
## 🐛 Bug Fixes
254+
- Misc version and CI fixes ([#2306](https://github.com/nv-morpheus/Morpheus/pull/2306)) [@dagardner-nv](https://github.com/dagardner-nv)
255+
246256
# Morpheus 24.06.02 (29 Aug 2025)
247257

248258
## 🛠️ Improvements

ci/vale/styles/config/vocabularies/morpheus/accept.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ LLM(s?)
4646
# https://github.com/logpai/loghub/
4747
Loghub
4848
Milvus
49+
Numba
4950
PyPI
5051
[Mm]ixin
5152
MLflow

conda/environments/all_cuda-125_arch-aarch64.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@ dependencies:
128128
- --extra-index-url https://download.pytorch.org/whl/cu124
129129
- --find-links https://data.dgl.ai/wheels-test/repo.html
130130
- --find-links https://data.dgl.ai/wheels/cu121/repo.html
131+
- databricks-cli < 0.100
132+
- databricks-connect
131133
- dgl==2.0.0
132134
- dglgo
133-
- faiss-cpu
135+
- faiss-cpu==1.9
134136
- google-search-results==2.4
135137
- langchain-nvidia-ai-endpoints==0.0.11
136138
- langchain-openai==0.1.3

conda/environments/all_cuda-125_arch-x86_64.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,11 @@ dependencies:
134134
- --extra-index-url https://download.pytorch.org/whl/cu124
135135
- --find-links https://data.dgl.ai/wheels-test/repo.html
136136
- --find-links https://data.dgl.ai/wheels/cu121/repo.html
137+
- databricks-cli < 0.100
138+
- databricks-connect
137139
- dgl==2.0.0
138140
- dglgo
139-
- faiss-cpu
141+
- faiss-cpu==1.9
140142
- google-search-results==2.4
141143
- langchain-nvidia-ai-endpoints==0.0.11
142144
- langchain-openai==0.1.3

conda/environments/examples_cuda-125_arch-aarch64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ dependencies:
7272
- databricks-connect
7373
- dgl==2.0.0
7474
- dglgo
75-
- faiss-cpu
75+
- faiss-cpu==1.9
7676
- google-search-results==2.4
7777
- langchain-nvidia-ai-endpoints==0.0.11
7878
- langchain-openai==0.1.3

conda/environments/examples_cuda-125_arch-x86_64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ dependencies:
7474
- databricks-connect
7575
- dgl==2.0.0
7676
- dglgo
77-
- faiss-cpu
77+
- faiss-cpu==1.9
7878
- google-search-results==2.4
7979
- langchain-nvidia-ai-endpoints==0.0.11
8080
- langchain-openai==0.1.3

dependencies.yaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ files:
3636
- example-dfp-prod
3737
- example-gnn
3838
- example-llms
39+
- optional_databricks
3940
- python
4041
- runtime
4142
- test_python_morpheus
@@ -150,13 +151,14 @@ files:
150151
arch: [x86_64, aarch64]
151152
includes:
152153
- cve-mitigation
153-
- databricks_example
154154
- example-abp-nvsmi
155155
- example-dfp-prod
156156
- example-gnn
157157
- example-llms
158158
- python
159159
- runtime
160+
- optional_databricks
161+
160162

161163
# Dependencies which are needed to run the model generation scripts in the `models` directory.
162164
# Includes: none
@@ -372,6 +374,15 @@ dependencies:
372374
packages:
373375
- benchmark=1.8.3
374376

377+
optional_databricks:
378+
common:
379+
- output_types: [conda]
380+
packages:
381+
- pip
382+
- pip:
383+
- databricks-cli < 0.100
384+
- databricks-connect
385+
375386
# Runtime dependencies for Morpheus. Included in nearly all output files so dependencies should
376387
# be added only if it is needed to run the core Morpheus library.
377388
# This should be synced with `run` in ci/conda/recipes/morpheus/meta.yaml
@@ -485,7 +496,7 @@ dependencies:
485496
common:
486497
- output_types: [requirements]
487498
packages:
488-
- &faiss-cpu faiss-cpu
499+
- &faiss-cpu faiss-cpu==1.9 # Pinning to 1.9 due to incompatibility with numpy
489500
- &google-search-results google-search-results==2.4
490501
- &langchain langchain==0.1.16
491502
- &langchain-nvidia-ai-endpoints langchain-nvidia-ai-endpoints==0.0.11
@@ -591,15 +602,6 @@ dependencies:
591602
- *pypdfium2
592603

593604

594-
databricks_example:
595-
common:
596-
- output_types: [conda]
597-
packages:
598-
- pip
599-
- pip:
600-
- databricks-cli < 0.100
601-
- databricks-connect
602-
603605
model-training-tuning:
604606
common:
605607
- output_types: [conda]

docs/source/extra_info/known_issues.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717

1818
# Known Issues
1919

20+
- Numba triggering IndexError on systems with driver version 580+ ([#2305](https://github.com/nv-morpheus/Morpheus/issues/2305))
2021
- `ransomware_detection` example pipeline occasionally logs a `distributed.comm.core.CommClosedError` error during shutdown ([#2026](https://github.com/nv-morpheus/Morpheus/issues/2026)).
2122
- Arm64 users need to install CUDA enabled PyTorch by hand ([#2095](https://github.com/nv-morpheus/Morpheus/issues/2095))
2223
- 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.

python/morpheus_llm/morpheus_llm/requirements_morpheus_llm_arch-aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is generated by `rapids-dependency-file-generator`.
22
# To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
33
--extra-index-url https://download.pytorch.org/whl/cu124
4-
faiss-cpu
4+
faiss-cpu==1.9
55
google-search-results==2.4
66
langchain-nvidia-ai-endpoints==0.0.11
77
langchain-openai==0.1.3

0 commit comments

Comments
 (0)