From cc4f695e9e758d5ce4f9718a20fe65809aa11467 Mon Sep 17 00:00:00 2001
From: Yuchen Zhang <yuchenz@nvidia.com>
Date: Thu, 9 May 2024 11:03:26 -0700
Subject: [PATCH] did not break before modifying module.cpp

---
 .../include/morpheus/messages/control.hpp     | 10 ++---
 .../include/morpheus/utilities/json_types.hpp | 14 ++++---
 morpheus/_lib/src/messages/control.cpp        | 26 ++++++-------
 morpheus/_lib/src/messages/meta.cpp           | 10 +++--
 morpheus/_lib/src/utilities/json_types.cpp    |  7 ++++
 .../tests/messages/test_control_message.cpp   | 10 ++---
 .../_lib/tests/messages/test_message_meta.cpp | 37 ++++++++-----------
 7 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/morpheus/_lib/include/morpheus/messages/control.hpp b/morpheus/_lib/include/morpheus/messages/control.hpp
index 7a952d7146..2565bf4874 100644
--- a/morpheus/_lib/include/morpheus/messages/control.hpp
+++ b/morpheus/_lib/include/morpheus/messages/control.hpp
@@ -17,13 +17,11 @@
 
 #pragma once
 
-#include "morpheus/export.h"           // for exporting symbols
-#include "morpheus/messages/meta.hpp"  // for MessageMeta
-#include "morpheus/utilities/json_types.hpp"
+#include "morpheus/export.h"                  // for MORPHEUS_EXPORT
+#include "morpheus/messages/meta.hpp"         // for MessageMeta
+#include "morpheus/utilities/json_types.hpp"  // for json_t
 
-#include <nlohmann/json.hpp>   // for json, basic_json
-#include <pybind11/pytypes.h>  // for object, dict, list, none
-#include <pymrc/types.hpp>
+#include <pybind11/pytypes.h>  // for object, dict, list
 
 #include <chrono>    // for system_clock, time_point
 #include <map>       // for map
diff --git a/morpheus/_lib/include/morpheus/utilities/json_types.hpp b/morpheus/_lib/include/morpheus/utilities/json_types.hpp
index ccdf6ca250..7dd4fd4516 100644
--- a/morpheus/_lib/include/morpheus/utilities/json_types.hpp
+++ b/morpheus/_lib/include/morpheus/utilities/json_types.hpp
@@ -17,13 +17,17 @@
 
 #pragma once
 
-#include "morpheus/export.h"
+#include "morpheus/export.h"  // for MORPHEUS_EXPORT
 
-#include <nlohmann/json.hpp>
-#include <pymrc/types.hpp>
+#include <nlohmann/adl_serializer.hpp>  // for adl_serializer
+#include <nlohmann/json.hpp>            // for basic_json
+#include <pybind11/pytypes.h>           // for object
+#include <pymrc/types.hpp>              // for PyHolder
 
-// namespace py = pybind11;
-// using namespace py::literals;
+#include <cstdint>  // for int64_t, uint64_t, uint8_t
+#include <map>      // for map
+#include <string>   // for allocator, string
+#include <vector>   // for vector
 
 namespace morpheus::utilities {
 /**
diff --git a/morpheus/_lib/src/messages/control.cpp b/morpheus/_lib/src/messages/control.cpp
index 6705eb681f..237aaa8220 100644
--- a/morpheus/_lib/src/messages/control.cpp
+++ b/morpheus/_lib/src/messages/control.cpp
@@ -17,19 +17,19 @@
 
 #include "morpheus/messages/control.hpp"
 
-#include "morpheus/messages/meta.hpp"
-
-#include <glog/logging.h>
-#include <pybind11/chrono.h>  // IWYU pragma: keep
-#include <pybind11/pybind11.h>
-#include <pybind11/pytypes.h>
-#include <pymrc/utils.hpp>
-
-#include <optional>
-#include <ostream>
-#include <regex>
-#include <stdexcept>
-#include <utility>
+#include "morpheus/messages/meta.hpp"  // for MessageMeta, MessageMetaInterfaceProxy
+
+#include <glog/logging.h>       // for COMPACT_GOOGLE_LOG_INFO, LogMessage, VLOG
+#include <nlohmann/json.hpp>    // for basic_json, json_ref, iter_impl, operator<<
+#include <pybind11/pybind11.h>  // for cast, object::cast
+#include <pybind11/pytypes.h>   // for object, none, dict, isinstance, list, str, value_error, generic_item
+#include <pymrc/utils.hpp>      // for cast_from_pyobject
+
+#include <optional>   // for optional, nullopt
+#include <ostream>    // for basic_ostream, operator<<
+#include <regex>      // for regex_search, regex
+#include <stdexcept>  // for runtime_error
+#include <utility>    // for pair
 
 namespace py = pybind11;
 using namespace py::literals;
diff --git a/morpheus/_lib/src/messages/meta.cpp b/morpheus/_lib/src/messages/meta.cpp
index df52b8c605..b141a0e6f0 100644
--- a/morpheus/_lib/src/messages/meta.cpp
+++ b/morpheus/_lib/src/messages/meta.cpp
@@ -30,7 +30,8 @@
 #include <cudf/concatenate.hpp>
 #include <cudf/copying.hpp>
 #include <cudf/io/types.hpp>
-#include <cudf/types.hpp>  // for type_id, data_type, size_type
+#include <cudf/table/table_view.hpp>  // for table_view
+#include <cudf/types.hpp>             // for type_id, data_type, size_type
 #include <glog/logging.h>
 #include <mrc/cuda/common.hpp>  // for __check_cuda_errors, MRC_CHECK_CUDA
 #include <pybind11/gil.h>
@@ -43,9 +44,10 @@
 #include <cstdint>  // for uint8_t
 #include <memory>
 #include <optional>
-#include <ostream>    // for operator<< needed by glog
-#include <stdexcept>  // for runtime_error
-#include <tuple>      // for make_tuple, tuple
+#include <ostream>        // for operator<< needed by glog
+#include <stdexcept>      // for runtime_error
+#include <tuple>          // for make_tuple, tuple
+#include <unordered_map>  // for unordered_map
 #include <utility>
 // We're already including pybind11.h and don't need to include cast.
 // For some reason IWYU also thinks we need array for the `isinsance` call.
diff --git a/morpheus/_lib/src/utilities/json_types.cpp b/morpheus/_lib/src/utilities/json_types.cpp
index 38a81b50e0..db790df6ee 100644
--- a/morpheus/_lib/src/utilities/json_types.cpp
+++ b/morpheus/_lib/src/utilities/json_types.cpp
@@ -17,6 +17,13 @@
 
 #include "morpheus/utilities/json_types.hpp"
 
+#include <pybind11/pybind11.h>  // for cast, handle::cast, object::cast, pybind11
+
+#include <cstdint>    // for uint64_t
+#include <stdexcept>  // for runtime_error
+#include <typeinfo>   // for type_info
+#include <utility>    // for move
+
 namespace py = pybind11;
 
 namespace {
diff --git a/morpheus/_lib/tests/messages/test_control_message.cpp b/morpheus/_lib/tests/messages/test_control_message.cpp
index 540d287d2a..642660fcdc 100644
--- a/morpheus/_lib/tests/messages/test_control_message.cpp
+++ b/morpheus/_lib/tests/messages/test_control_message.cpp
@@ -21,12 +21,12 @@
 #include "morpheus/messages/control.hpp"               // for ControlMessage
 #include "morpheus/messages/memory/tensor_memory.hpp"  // for TensorMemory
 #include "morpheus/messages/meta.hpp"                  // for MessageMeta
+#include "morpheus/utilities/json_types.hpp"           // for PythonByteContainer
 
-#include <gtest/gtest.h>      // for Message, TestPartResult, AssertionResult, TestInfo
-#include <nlohmann/json.hpp>  // for basic_json, json_ref, json
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>  // IWYU pragma: keep
-#include <pymrc/utilities/json_values.hpp>
+#include <gtest/gtest.h>       // for Message, TestPartResult, AssertionResult, TestInfo
+#include <nlohmann/json.hpp>   // for basic_json, json_ref, json
+#include <pybind11/pytypes.h>  // for literals, pybind11
+#include <pybind11/stl.h>      // IWYU pragma: keep
 
 #include <algorithm>  // for find
 #include <chrono>     // for system_clock
diff --git a/morpheus/_lib/tests/messages/test_message_meta.cpp b/morpheus/_lib/tests/messages/test_message_meta.cpp
index ec78b41427..7214571f32 100644
--- a/morpheus/_lib/tests/messages/test_message_meta.cpp
+++ b/morpheus/_lib/tests/messages/test_message_meta.cpp
@@ -15,31 +15,26 @@
  * limitations under the License.
  */
 
-#include "../test_utils/common.hpp"  // IWYU pragma: associated
-#include "../test_utils/tensor_utils.hpp"
-#include "test_messages.hpp"
+#include "../test_utils/common.hpp"
+#include "../test_utils/tensor_utils.hpp"  // for assert_eq_device_to_host
+#include "test_messages.hpp"               // for TestMessages
 
-#include "morpheus/io/deserializers.hpp"  // for load_table_from_file, prepare_df_index
-#include "morpheus/messages/control.hpp"
-#include "morpheus/messages/meta.hpp"  // for MessageMeta and SlicedMessageMeta
-#include "morpheus/objects/dtype.hpp"
-#include "morpheus/objects/rmm_tensor.hpp"
+#include "morpheus/io/deserializers.hpp"    // for load_table_from_file
+#include "morpheus/messages/meta.hpp"       // for MessageMeta
+#include "morpheus/objects/dtype.hpp"       // for DType
 #include "morpheus/objects/table_info.hpp"  // for TableInfo
-#include "morpheus/objects/tensor.hpp"
-#include "morpheus/stages/preallocate.hpp"
-#include "morpheus/utilities/cudf_util.hpp"  // for CudfHelper
+#include "morpheus/objects/tensor.hpp"      // for Tensor
+#include "morpheus/types.hpp"               // for RangeType
 
-#include <gtest/gtest.h>
-#include <mrc/cuda/common.hpp>
-#include <pybind11/gil.h>       // for gil_scoped_release, gil_scoped_acquire
-#include <pybind11/pybind11.h>  // IWYU pragma: keep
-#include <rmm/cuda_stream_view.hpp>
-#include <rmm/device_buffer.hpp>
+#include <gtest/gtest.h>             // for TestInfo, TEST_F
+#include <pybind11/gil.h>            // for gil_scoped_release
+#include <rmm/cuda_stream_view.hpp>  // for cuda_stream_per_thread
+#include <rmm/device_buffer.hpp>     // for device_buffer
 
-#include <cstdint>
-#include <filesystem>  // for std::filesystem::path
-#include <memory>      // for shared_ptr
-#include <utility>     // for move
+#include <cstdint>     // for int64_t
+#include <filesystem>  // for operator/, path
+#include <memory>      // for allocator, __shared_ptr_access, shared_ptr, make_shared
+#include <vector>      // for vector
 
 using namespace morpheus;
 using namespace morpheus::test;