Skip to content

Commit 90a6f59

Browse files
committed
Merge branch-24.03 into branch-24.06
2 parents 951e3b8 + ab8d0a7 commit 90a6f59

File tree

12 files changed

+34
-21
lines changed

12 files changed

+34
-21
lines changed

CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17+
# Morpheus 24.03.01 (10 Apr 2024)
18+
19+
## 🚨 Breaking Changes
20+
21+
- Move MemoryDescriptor to the morpheus namespace ([#1602](https://github.com/nv-morpheus/Morpheus/pull/1602)) [@dagardner-nv](https://github.com/dagardner-nv)
22+
23+
## 🐛 Bug Fixes
24+
25+
- Switch to kafka 3.5.2 ([#1612](https://github.com/nv-morpheus/Morpheus/pull/1612)) [@dagardner-nv](https://github.com/dagardner-nv)
26+
- Update mlflow to avoid CVE-2024-27132 and CVE-2024-27133 ([#1609](https://github.com/nv-morpheus/Morpheus/pull/1609)) [@dagardner-nv](https://github.com/dagardner-nv)
27+
- Fix for databricks_cli import error ([#1604](https://github.com/nv-morpheus/Morpheus/pull/1604)) [@dagardner-nv](https://github.com/dagardner-nv)
28+
- Move MemoryDescriptor to the morpheus namespace ([#1602](https://github.com/nv-morpheus/Morpheus/pull/1602)) [@dagardner-nv](https://github.com/dagardner-nv)
29+
1730

1831
# Morpheus 24.03.00 (7 Apr 2024)
1932

ci/conda/recipes/morpheus/meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ outputs:
9191
- grpcio # Version determined from cudf
9292
- libmrc
9393
- libwebp>=1.3.2 # Required for CVE mitigation: https://nvd.nist.gov/vuln/detail/CVE-2023-4863
94-
- mlflow>=2.2.1,<3
94+
- mlflow>=2.10.0,<3
9595
- mrc
9696
- networkx>=2.8
9797
- numpydoc =1.5.*

ci/scripts/download_kafka.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import pytest_kafka
2121
from pytest_kafka.install import set_up_kafka
2222

23-
DEFAULT_KAFKA_URL = 'https://downloads.apache.org/kafka/3.4.1/kafka_2.13-3.4.1.tgz'
24-
DEFAULT_KAFKA_TAR_ROOTDIR = 'kafka_2.13-3.4.1/'
23+
DEFAULT_KAFKA_URL = 'https://downloads.apache.org/kafka/3.5.2/kafka_2.13-3.5.2.tgz'
24+
DEFAULT_KAFKA_TAR_ROOTDIR = 'kafka_2.13-3.5.2/'
2525

2626

2727
def main():

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ dependencies:
5656
- librdkafka>=1.9.2,<1.10.0a0
5757
- libtool
5858
- libwebp=1.3.2
59-
- mlflow=2.9.2
59+
- mlflow>=2.10.0,<3
6060
- mrc=24.06
6161
- myst-parser=0.18.1
6262
- nbsphinx

conda/environments/dev_cuda-121_arch-x86_64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies:
4545
- isort
4646
- librdkafka>=1.9.2,<1.10.0a0
4747
- libtool
48-
- mlflow=2.9.2
48+
- mlflow>=2.10.0,<3
4949
- mrc=24.06
5050
- myst-parser=0.18.1
5151
- nbsphinx

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies:
2727
- jsonpatch>=1.33
2828
- kfp
2929
- libwebp=1.3.2
30-
- mlflow=2.9.2
30+
- mlflow>=2.10.0,<3
3131
- networkx=2.8.8
3232
- newspaper3k=0.2
3333
- nodejs=18.*

conda/environments/runtime_cuda-121_arch-x86_64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- elasticsearch==8.9.0
1717
- feedparser=6.0.10
1818
- grpcio=1.59
19-
- mlflow=2.9.2
19+
- mlflow>=2.10.0,<3
2020
- networkx=2.8.8
2121
- numpydoc=1.5
2222
- nvtabular=23.08.00

dependencies.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ dependencies:
253253
- elasticsearch==8.9.0
254254
- feedparser=6.0.10
255255
- grpcio=1.59
256-
- mlflow=2.9.2
256+
- mlflow>=2.10.0,<3
257257
- networkx=2.8.8
258258
- nvtabular=23.08.00
259259
- pydantic
@@ -301,7 +301,7 @@ dependencies:
301301
- dask=2023.12.1
302302
- distributed=2023.12.1
303303
- kfp
304-
- mlflow=2.9.2
304+
- mlflow>=2.10.0,<3
305305
- papermill=2.4.0
306306
- s3fs=2023.12.2
307307

examples/digital_fingerprinting/production/conda_env.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies:
2727
- distributed
2828
- kfp
2929
- librdkafka
30-
- mlflow>=2.2.1,<3
30+
- mlflow>=2.10.0,<3
3131
- nodejs=18.*
3232
- nvtabular=23.06
3333
- papermill

examples/digital_fingerprinting/production/mlflow/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN apt update && \
2424
rm -rf /var/cache/apt/* /var/lib/apt/lists/*
2525

2626
# Install python packages
27-
RUN pip install "mlflow >=2.2.1,<3" boto3 pymysql pyyaml
27+
RUN pip install "mlflow >=2.10.0,<3" boto3 pymysql pyyaml
2828

2929
# We run on port 5000
3030
EXPOSE 5000

models/mlflow/README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ are included for publishing TensorRT, ONNX and FIL models to your MLflow Model R
2222

2323
## Requirements
2424

25-
* MLflow (tested on 1.24.0)
26-
* Python (tested on 3.8)
25+
* MLflow (tested on 2.11.3)
26+
* Python (tested on 3.11)
2727

2828
## Install Triton Docker Image
2929

@@ -89,7 +89,7 @@ Create an MLflow container with a volume mounting the Triton model repository:
8989
```bash
9090
docker run -it -v /opt/triton_models:/triton_models \
9191
--env TRITON_MODEL_REPO=/triton_models \
92-
--env MLFLOW_TRACKING_URI=localhost:5000 \
92+
--env MLFLOW_TRACKING_URI="http://localhost:5000" \
9393
--gpus '"device=0"' \
9494
--net=host \
9595
--rm \
@@ -115,29 +115,29 @@ The `publish_model_to_mlflow` script is used to publish `triton` flavor models t
115115
```
116116
python publish_model_to_mlflow.py \
117117
--model_name sid-minibert-onnx \
118-
--model_directory <path-to-morpheus-models-repo>/models/triton-model-repo/sid-minibert-onnx \
118+
--model_directory /triton_models/triton-model-repo/sid-minibert-onnx \
119119
--flavor triton
120120
```
121121

122122
## Deployments
123123

124124
The Triton `mlflow-triton-plugin` is installed on this container and can be used to deploy your models from MLflow to Triton Inference Server. The following are examples of how the plugin is used with the `sid-minibert-onnx` model that we published to MLflow above. For more information about the
125-
`mlflow-triton-plugin`, refer to Triton's [documentation](https://github.com/triton-inference-server/server/tree/r23.01/deploy/mlflow-triton-plugin)
125+
`mlflow-triton-plugin`, refer to Triton's [documentation](https://github.com/triton-inference-server/server/tree/r24.03/deploy/mlflow-triton-plugin)
126126

127127
### Create Deployment
128128

129129
To create a deployment use the following command
130130

131131
##### CLI
132132
```
133-
mlflow deployments create -t triton --flavor triton --name sid-minibert-onnx -m models:/sid-minibert-onnx/1
133+
mlflow deployments create -t triton --flavor triton --name sid-minibert-onnx -m "models:/sid-minibert-onnx/1"
134134
```
135135

136136
##### Python API
137137
```
138138
from mlflow.deployments import get_deploy_client
139139
client = get_deploy_client('triton')
140-
client.create_deployment("sid-minibert-onnx", " models:/sid-minibert-onnx/1", flavor="triton")
140+
client.create_deployment("sid-minibert-onnx", "models:/sid-minibert-onnx/1", flavor="triton")
141141
```
142142

143143
### Delete Deployment
@@ -158,14 +158,14 @@ client.delete_deployment("sid-minibert-onnx")
158158

159159
##### CLI
160160
```
161-
mlflow deployments update -t triton --flavor triton --name sid-minibert-onnx -m models:/sid-minibert-onnx/2
161+
mlflow deployments update -t triton --flavor triton --name sid-minibert-onnx -m "models:/sid-minibert-onnx/1"
162162
```
163163

164164
##### Python API
165165
```
166166
from mlflow.deployments import get_deploy_client
167167
client = get_deploy_client('triton')
168-
client.update_deployment("sid-minibert-onnx", "models:/sid-minibert-onnx/2", flavor="triton")
168+
client.update_deployment("sid-minibert-onnx", "models:/sid-minibert-onnx/1", flavor="triton")
169169
```
170170

171171
### List Deployments

models/mlflow/docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN sed -i 's/conda activate base/conda activate mlflow/g' ~/.bashrc
4444
SHELL ["/opt/conda/bin/conda", "run", "-n", "mlflow", "/bin/bash", "-c"]
4545

4646
ARG TRITON_DIR=/mlflow/triton-inference-server
47-
ARG TRITON_VER=r24.01
47+
ARG TRITON_VER=r24.03
4848

4949
RUN mkdir ${TRITON_DIR} && \
5050
cd ${TRITON_DIR} && \

0 commit comments

Comments
 (0)