From 6ad39c8cb2355ed8cc1e74499ee2aa8c0352fc04 Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Wed, 11 Oct 2023 09:36:51 -0600 Subject: [PATCH 1/4] Updating versions for v23.07.03 --- CMakeLists.txt | 2 +- examples/digital_fingerprinting/production/Dockerfile | 2 +- examples/digital_fingerprinting/production/docker-compose.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d0b7716c0..f59d305fed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ morpheus_utils_initialize_cuda_arch(morpheus) rapids_cmake_build_type(Release) # Project definition project(morpheus - VERSION 23.07.00 + VERSION 23.07.03 LANGUAGES C CXX CUDA) rapids_cmake_write_version_file(${CMAKE_BINARY_DIR}/autogenerated/include/morpheus/version.hpp) diff --git a/examples/digital_fingerprinting/production/Dockerfile b/examples/digital_fingerprinting/production/Dockerfile index c33291cc6a..778b63b7cd 100644 --- a/examples/digital_fingerprinting/production/Dockerfile +++ b/examples/digital_fingerprinting/production/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. ARG MORPHEUS_CONTAINER=nvcr.io/nvidia/morpheus/morpheus -ARG MORPHEUS_CONTAINER_VERSION=v23.07.00-runtime +ARG MORPHEUS_CONTAINER_VERSION=v23.07.03-runtime FROM ${MORPHEUS_CONTAINER}:${MORPHEUS_CONTAINER_VERSION} as base diff --git a/examples/digital_fingerprinting/production/docker-compose.yml b/examples/digital_fingerprinting/production/docker-compose.yml index d9bf53badb..0263444f5b 100644 --- a/examples/digital_fingerprinting/production/docker-compose.yml +++ b/examples/digital_fingerprinting/production/docker-compose.yml @@ -77,7 +77,7 @@ services: target: jupyter args: - MORPHEUS_CONTAINER=${MORPHEUS_CONTAINER:-nvcr.io/nvidia/morpheus/morpheus} - - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v23.07.00-runtime} + - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v23.07.03-runtime} deploy: resources: reservations: @@ -109,7 +109,7 @@ services: target: runtime args: - MORPHEUS_CONTAINER=${MORPHEUS_CONTAINER:-nvcr.io/nvidia/morpheus/morpheus} - - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v23.07.00-runtime} + - MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v23.07.03-runtime} image: dfp_morpheus container_name: morpheus_pipeline deploy: From 82b291a7ab12435f9a9c3da283b29a4c39b63d5c Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Wed, 11 Oct 2023 09:42:40 -0600 Subject: [PATCH 2/4] Updating CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7ac9de50f..aaca14e549 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> +# Morpheus 23.07.03 (11 Oct 2023) + +## 🐛 Bug Fixes +- Add pinned libwebp to resolve CVE ([#1236](https://github.com/nv-morpheus/Morpheus/pull/1236)) [@drobison00](https://github.com/drobison00) +- Add libwebp to meta.yaml for CVE 2307 ([#1242](https://github.com/nv-morpheus/Morpheus/pull/1242)) [@drobison00](https://github.com/drobison00) +- [BUG] Fix Control Message Utils & SQL Max Connections Exhaust ([#1243](https://github.com/nv-morpheus/Morpheus/pull/1243)) [@bsuryadevara](https://github.com/bsuryadevara) + # Morpheus 23.07.02 (25 Jul 2023) ## 🐛 Bug Fixes From 5443da9b10642fb4095927648887ac9040489e3b Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Wed, 11 Oct 2023 22:32:43 +0000 Subject: [PATCH 3/4] Fixing an issue with the incorrect version being used to register a module from C++ --- morpheus/_lib/modules/module.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/morpheus/_lib/modules/module.cpp b/morpheus/_lib/modules/module.cpp index a63bb75aa0..b315b321d8 100644 --- a/morpheus/_lib/modules/module.cpp +++ b/morpheus/_lib/modules/module.cpp @@ -19,9 +19,11 @@ #include "morpheus/utilities/string_util.hpp" #include "morpheus/version.hpp" +#include #include #include #include // for arg, init, class_, module_, str_attr_accessor, PYBIND11_MODULE, pybind11 +#include #include #include @@ -39,11 +41,19 @@ PYBIND11_MODULE(modules, _module) )pbdoc"; - const std::vector MorpheusModuleVersion{ - morpheus_VERSION_MAJOR, morpheus_VERSION_MINOR, morpheus_VERSION_PATCH}; + // Get the MRC version that we are registering these modules for. Ideally, this would be able to get it directly + // from but that file isnt exported + std::vector mrc_version; - mrc::modules::ModelRegistryUtil::create_registered_module( - "DataLoader", "morpheus", MorpheusModuleVersion); + auto mrc_version_list = pybind11::module_::import("mrc").attr("__version__").attr("split")(".").cast(); + + for (const auto& l : mrc_version_list) + { + auto i = py::int_(py::reinterpret_borrow(l)); + mrc_version.push_back(i.cast()); + } + + mrc::modules::ModelRegistryUtil::create_registered_module("DataLoader", "morpheus", mrc_version); _module.attr("__version__") = MORPHEUS_CONCAT_STR(morpheus_VERSION_MAJOR << "." << morpheus_VERSION_MINOR << "." << morpheus_VERSION_PATCH); From 06bda2d0dd62379273e34a01a8199c50da2e7f5d Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Wed, 11 Oct 2023 23:35:09 +0000 Subject: [PATCH 4/4] IWYU fixes --- morpheus/_lib/modules/module.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/morpheus/_lib/modules/module.cpp b/morpheus/_lib/modules/module.cpp index b315b321d8..33e0de09d3 100644 --- a/morpheus/_lib/modules/module.cpp +++ b/morpheus/_lib/modules/module.cpp @@ -19,12 +19,13 @@ #include "morpheus/utilities/string_util.hpp" #include "morpheus/version.hpp" -#include #include #include +#include // for object_api::operator(), object::cast #include // for arg, init, class_, module_, str_attr_accessor, PYBIND11_MODULE, pybind11 #include +#include // for array #include #include