Skip to content

Commit

Permalink
did not break before modifying module.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
yczhang-nv committed May 9, 2024
1 parent 5e67913 commit cc4f695
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 54 deletions.
10 changes: 4 additions & 6 deletions morpheus/_lib/include/morpheus/messages/control.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 9 additions & 5 deletions morpheus/_lib/include/morpheus/utilities/json_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand Down
26 changes: 13 additions & 13 deletions morpheus/_lib/src/messages/control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 6 additions & 4 deletions morpheus/_lib/src/messages/meta.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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.
Expand Down
7 changes: 7 additions & 0 deletions morpheus/_lib/src/utilities/json_types.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions morpheus/_lib/tests/messages/test_control_message.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 16 additions & 21 deletions morpheus/_lib/tests/messages/test_message_meta.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit cc4f695

Please sign in to comment.