IWYU fixes

nv-morpheus · Apr 8, 2024 · be7207d · be7207d
1 parent 85feb0e
commit be7207d
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 21 deletions.
diff --git a/examples/developer_guide/3_simple_cpp_stage/src/simple_cpp_stage/_lib/pass_thru.cpp b/examples/developer_guide/3_simple_cpp_stage/src/simple_cpp_stage/_lib/pass_thru.cpp
@@ -17,10 +17,13 @@
 
 #include "pass_thru.hpp"
 
+#include <morpheus/messages/multi.hpp>
+#include <pybind11/attr.h>
 #include <pybind11/pybind11.h>
 #include <pymrc/utils.hpp>  // for pymrc::import
 
 #include <exception>
+#include <utility>
 
 namespace morpheus_example {
 

diff --git a/examples/developer_guide/3_simple_cpp_stage/src/simple_cpp_stage/_lib/pass_thru.hpp b/examples/developer_guide/3_simple_cpp_stage/src/simple_cpp_stage/_lib/pass_thru.hpp
@@ -21,9 +21,14 @@
 #include <mrc/segment/builder.hpp>      // for Segment Builder
 #include <mrc/segment/object.hpp>       // for Segment Object
 #include <pymrc/node.hpp>               // for PythonNode
+#include <rxcpp/rx.hpp>
 
 #include <memory>
 #include <string>
+#include <thread>
+
+// IWYU pragma: no_include "morpheus/objects/data_table.hpp"
+// IWYU pragma: no_include <boost/fiber/context.hpp>
 
 namespace morpheus_example {
 

diff --git a/...ples/developer_guide/4_rabbitmq_cpp_stage/src/rabbitmq_cpp_stage/_lib/rabbitmq_source.cpp b/...ples/developer_guide/4_rabbitmq_cpp_stage/src/rabbitmq_cpp_stage/_lib/rabbitmq_source.cpp
@@ -17,16 +17,23 @@
 
 #include "rabbitmq_source.hpp"
 
+#include <SimpleAmqpClient/BasicMessage.h>
+#include <SimpleAmqpClient/Channel.h>
+#include <SimpleAmqpClient/Envelope.h>
 #include <cudf/io/json.hpp>
-#include <cudf/table/table.hpp>
 #include <glog/logging.h>
-#include <pybind11/chrono.h>  // for timedelta->chrono conversions
+#include <morpheus/messages/meta.hpp>
+#include <pybind11/attr.h>
 #include <pybind11/pybind11.h>
+#include <pymrc/utils.hpp>
 
 #include <exception>
 #include <sstream>
 #include <thread>  // for std::this_thread::sleep_for
-#include <vector>
+#include <utility>
+
+// IWYU pragma: no_include <boost/smart_ptr/detail/operator_bool.hpp>
+// IWYU pragma: no_include <boost/smart_ptr/shared_ptr.hpp>
 
 namespace morpheus_rabbit {
 

diff --git a/...ples/developer_guide/4_rabbitmq_cpp_stage/src/rabbitmq_cpp_stage/_lib/rabbitmq_source.hpp b/...ples/developer_guide/4_rabbitmq_cpp_stage/src/rabbitmq_cpp_stage/_lib/rabbitmq_source.hpp
@@ -17,16 +17,22 @@
 
 #pragma once
 
-#include <SimpleAmqpClient/SimpleAmqpClient.h>  // for AmqpClient::Channel::ptr_t
-#include <cudf/io/types.hpp>                    // for cudf::io::table_with_metadata
-#include <morpheus/messages/meta.hpp>           // for MessageMeta
-#include <mrc/segment/builder.hpp>              // for Segment Builder
-#include <mrc/segment/object.hpp>               // for Segment Object
-#include <pymrc/node.hpp>                       // for mrc::pymrc::PythonSource
+#include <SimpleAmqpClient/Channel.h>
+#include <cudf/io/types.hpp>           // for cudf::io::table_with_metadata
+#include <morpheus/messages/meta.hpp>  // for MessageMeta
+#include <mrc/segment/builder.hpp>     // for Segment Builder
+#include <mrc/segment/object.hpp>      // for Segment Object
+#include <pymrc/node.hpp>              // for mrc::pymrc::PythonSource
+#include <rxcpp/rx.hpp>
 
 #include <chrono>  // for chrono::milliseconds
 #include <memory>  // for shared_ptr
 #include <string>
+#include <string_view>
+#include <thread>
+
+// IWYU pragma: no_include "morpheus/objects/data_table.hpp"
+// IWYU pragma: no_include <boost/fiber/context.hpp>
 
 namespace morpheus_rabbit {
 

diff --git a/morpheus/_lib/include/morpheus/io/data_loader_registry.hpp b/morpheus/_lib/include/morpheus/io/data_loader_registry.hpp
@@ -24,6 +24,7 @@
 #include <pybind11/pytypes.h>
 
 #include <functional>
+#include <memory>
 #include <string>
 
 namespace morpheus {

diff --git a/morpheus/_lib/include/morpheus/stages/preprocess_fil.hpp b/morpheus/_lib/include/morpheus/stages/preprocess_fil.hpp
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "rxcpp/operators/rx-map.hpp"
-
 #include "morpheus/messages/control.hpp"
 #include "morpheus/messages/multi.hpp"
 #include "morpheus/messages/multi_inference.hpp"

diff --git a/morpheus/_lib/include/morpheus/stages/preprocess_nlp.hpp b/morpheus/_lib/include/morpheus/stages/preprocess_nlp.hpp
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "rxcpp/operators/rx-map.hpp"  // for map
-
 #include "morpheus/messages/control.hpp"          // for ControlMessage
 #include "morpheus/messages/multi.hpp"            // for MultiMessage
 #include "morpheus/messages/multi_inference.hpp"  // for MultiInferenceMessage

diff --git a/morpheus/_lib/llm/src/py_llm_task_handler.cpp b/morpheus/_lib/llm/src/py_llm_task_handler.cpp
@@ -17,8 +17,8 @@
 
 #include "py_llm_task_handler.hpp"
 
-#include "morpheus/llm/llm_context.hpp"  // IWYU pragma: keep
-#include "morpheus/messages/control.hpp"
+#include "morpheus/llm/llm_context.hpp"   // IWYU pragma: keep
+#include "morpheus/messages/control.hpp"  // IWYU pragma: keep
 
 #include <mrc/coroutines/task.hpp>  // IWYU pragma: keep
 #include <pybind11/pybind11.h>

diff --git a/morpheus/_lib/src/io/data_loader_registry.cpp b/morpheus/_lib/src/io/data_loader_registry.cpp
@@ -24,10 +24,12 @@
 
 #include <glog/logging.h>
 #include <nlohmann/json.hpp>
+#include <pybind11/gil.h>  // for gil_scoped_acquire
 #include <pybind11/pybind11.h>
 #include <pymrc/utils.hpp>
 
 #include <iostream>
+#include <utility>  // for move
 
 namespace morpheus {
 template class FactoryRegistry<Loader>;

diff --git a/morpheus/_lib/src/modules/data_loader_module.cpp b/morpheus/_lib/src/modules/data_loader_module.cpp
@@ -17,8 +17,6 @@
 
 #include "morpheus/modules/data_loader_module.hpp"
 
-#include "rxcpp/operators/rx-map.hpp"
-
 #include "morpheus/io/data_loader_registry.hpp"
 #include "morpheus/messages/control.hpp"
 

diff --git a/morpheus/_lib/src/stages/add_scores_stage_base.cpp b/morpheus/_lib/src/stages/add_scores_stage_base.cpp
@@ -17,8 +17,6 @@
 
 #include "morpheus/stages/add_scores_stage_base.hpp"
 
-#include "rxcpp/operators/rx-map.hpp"  // for map
-
 #include "morpheus/messages/memory/tensor_memory.hpp"  // for TensorMemory
 #include "morpheus/messages/meta.hpp"
 #include "morpheus/messages/multi_response.hpp"  // for MultiResponseMessage

diff --git a/morpheus/_lib/src/stages/write_to_file.cpp b/morpheus/_lib/src/stages/write_to_file.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "morpheus/stages/write_to_file.hpp"  // IWYU pragma: accosiated
+#include "morpheus/stages/write_to_file.hpp"  // IWYU pragma: associated
 
 #include "mrc/segment/builder.hpp"
 #include "mrc/segment/object.hpp"

diff --git a/morpheus/_lib/tests/llm/test_llm_context.cpp b/morpheus/_lib/tests/llm/test_llm_context.cpp
@@ -22,9 +22,9 @@
 #include "morpheus/llm/llm_context.hpp"
 #include "morpheus/llm/llm_task.hpp"
 #include "morpheus/messages/control.hpp"
-#include "morpheus/types.hpp"
 
 #include <gtest/gtest.h>
+#include <mrc/channel/forward.hpp>
 #include <nlohmann/json.hpp>
 
 #include <memory>

diff --git a/morpheus/_lib/tests/llm/test_llm_engine.cpp b/morpheus/_lib/tests/llm/test_llm_engine.cpp
@@ -25,6 +25,7 @@
 #include "morpheus/types.hpp"
 
 #include <gtest/gtest.h>
+#include <mrc/channel/forward.hpp>
 #include <mrc/coroutines/event.hpp>
 #include <mrc/coroutines/sync_wait.hpp>
 #include <mrc/coroutines/task.hpp>

diff --git a/morpheus/_lib/tests/llm/test_llm_node.cpp b/morpheus/_lib/tests/llm/test_llm_node.cpp
@@ -26,6 +26,7 @@
 #include "morpheus/types.hpp"
 
 #include <gtest/gtest.h>
+#include <mrc/channel/forward.hpp>
 #include <mrc/coroutines/sync_wait.hpp>
 
 #include <coroutine>

diff --git a/morpheus/_lib/tests/llm/test_llm_node_runner.cpp b/morpheus/_lib/tests/llm/test_llm_node_runner.cpp
@@ -27,6 +27,7 @@
 #include "morpheus/types.hpp"
 
 #include <gtest/gtest.h>
+#include <mrc/channel/forward.hpp>
 #include <mrc/coroutines/sync_wait.hpp>
 #include <mrc/coroutines/when_all.hpp>
 

diff --git a/morpheus/_lib/tests/llm/test_llm_task_handler_runner.cpp b/morpheus/_lib/tests/llm/test_llm_task_handler_runner.cpp
@@ -27,6 +27,7 @@
 #include "morpheus/types.hpp"
 
 #include <gtest/gtest.h>
+#include <mrc/channel/forward.hpp>
 #include <mrc/coroutines/sync_wait.hpp>
 #include <mrc/coroutines/task.hpp>  // IWYU pragma: keep
 #include <nlohmann/json.hpp>