From a10efed57962f2b41c44a7da270e6ebeefc8a6de Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Wed, 18 Oct 2023 22:51:49 -0600 Subject: [PATCH] IWYU fixes --- cpp/mrc/include/mrc/coroutines/scheduler.hpp | 6 ++---- cpp/mrc/include/mrc/coroutines/task_container.hpp | 3 +-- .../src/internal/codable/decodable_storage_view.cpp | 1 - cpp/mrc/src/internal/codable/storage_view.cpp | 1 - .../control_plane/client/connections_manager.cpp | 1 - .../internal/control_plane/client/state_manager.cpp | 1 + .../control_plane/server/connection_manager.cpp | 1 - cpp/mrc/src/internal/memory/device_resources.cpp | 4 ---- cpp/mrc/src/internal/memory/host_resources.cpp | 3 --- cpp/mrc/src/internal/network/network_resources.cpp | 1 - cpp/mrc/src/internal/pipeline/controller.cpp | 2 -- cpp/mrc/src/internal/pubsub/publisher_service.cpp | 2 -- cpp/mrc/src/internal/pubsub/subscriber_service.cpp | 2 +- cpp/mrc/src/internal/runnable/fiber_engine.cpp | 2 -- cpp/mrc/src/internal/runnable/fiber_engines.cpp | 1 - cpp/mrc/src/internal/runnable/runnable_resources.cpp | 1 - cpp/mrc/src/internal/runnable/thread_engine.cpp | 1 - cpp/mrc/src/internal/runnable/thread_engines.cpp | 1 - cpp/mrc/src/internal/segment/builder_definition.cpp | 2 +- .../src/internal/system/host_partition_provider.cpp | 2 +- cpp/mrc/src/internal/system/partition_provider.cpp | 1 + cpp/mrc/src/internal/system/threading_resources.cpp | 3 ++- cpp/mrc/src/internal/ucx/receive_manager.cpp | 1 - cpp/mrc/src/internal/ucx/ucx_resources.cpp | 1 - cpp/mrc/src/public/core/thread.cpp | 1 - cpp/mrc/src/public/coroutines/scheduler.cpp | 2 ++ cpp/mrc/src/public/coroutines/task_container.cpp | 4 +++- cpp/mrc/src/public/coroutines/thread_pool.cpp | 1 - cpp/mrc/src/public/modules/sample_modules.cpp | 2 -- cpp/mrc/src/tests/nodes/common_nodes.cpp | 2 -- cpp/mrc/src/tests/nodes/common_nodes.hpp | 1 - cpp/mrc/src/tests/pipelines/multi_segment.cpp | 5 ++--- cpp/mrc/src/tests/segments/common_segments.cpp | 1 - cpp/mrc/src/tests/test_grpc.cpp | 5 ----- cpp/mrc/src/tests/test_memory.cpp | 2 -- cpp/mrc/src/tests/test_network.cpp | 5 +---- cpp/mrc/src/tests/test_next.cpp | 5 ++--- cpp/mrc/src/tests/test_remote_descriptor.cpp | 1 - cpp/mrc/src/tests/test_resources.cpp | 1 - cpp/mrc/src/tests/test_runnable.cpp | 2 -- cpp/mrc/src/tests/test_ucx.cpp | 1 - cpp/mrc/tests/benchmarking/test_benchmarking.hpp | 2 -- cpp/mrc/tests/benchmarking/test_stat_gather.hpp | 2 -- cpp/mrc/tests/coroutines/test_async_generator.cpp | 2 -- cpp/mrc/tests/coroutines/test_event.cpp | 1 - cpp/mrc/tests/coroutines/test_latch.cpp | 1 - cpp/mrc/tests/coroutines/test_ring_buffer.cpp | 1 - cpp/mrc/tests/coroutines/test_task.cpp | 2 -- cpp/mrc/tests/coroutines/test_task_container.cpp | 11 ----------- cpp/mrc/tests/logging/test_logging.cpp | 2 -- cpp/mrc/tests/modules/dynamic_module.cpp | 2 +- cpp/mrc/tests/modules/test_mirror_tap_module.cpp | 4 +--- .../tests/modules/test_mirror_tap_orchestrator.cpp | 5 ++--- cpp/mrc/tests/modules/test_module_util.cpp | 4 +--- cpp/mrc/tests/test_channel.cpp | 2 -- cpp/mrc/tests/test_executor.cpp | 4 ++-- cpp/mrc/tests/test_node.cpp | 1 - cpp/mrc/tests/test_pipeline.cpp | 5 ++--- cpp/mrc/tests/test_segment.cpp | 3 --- cpp/mrc/tests/test_thread.cpp | 1 - 60 files changed, 29 insertions(+), 111 deletions(-) diff --git a/cpp/mrc/include/mrc/coroutines/scheduler.hpp b/cpp/mrc/include/mrc/coroutines/scheduler.hpp index c6588e164..25d5f2f1b 100644 --- a/cpp/mrc/include/mrc/coroutines/scheduler.hpp +++ b/cpp/mrc/include/mrc/coroutines/scheduler.hpp @@ -17,19 +17,17 @@ #pragma once -#include "mrc/core/bitmap.hpp" #include "mrc/coroutines/task.hpp" #include "mrc/coroutines/task_container.hpp" #include -#include +#include #include #include +#include namespace mrc::coroutines { -class TaskContainer; - /** * @brief Scheduler base class * diff --git a/cpp/mrc/include/mrc/coroutines/task_container.hpp b/cpp/mrc/include/mrc/coroutines/task_container.hpp index 5c5bf322b..8886257dc 100644 --- a/cpp/mrc/include/mrc/coroutines/task_container.hpp +++ b/cpp/mrc/include/mrc/coroutines/task_container.hpp @@ -38,12 +38,11 @@ #pragma once -#include "mrc/coroutines/concepts/executor.hpp" #include "mrc/coroutines/task.hpp" #include +#include #include -#include #include #include #include diff --git a/cpp/mrc/src/internal/codable/decodable_storage_view.cpp b/cpp/mrc/src/internal/codable/decodable_storage_view.cpp index a4db24dac..5d29c7128 100644 --- a/cpp/mrc/src/internal/codable/decodable_storage_view.cpp +++ b/cpp/mrc/src/internal/codable/decodable_storage_view.cpp @@ -37,7 +37,6 @@ #include #include #include -#include namespace mrc::codable { diff --git a/cpp/mrc/src/internal/codable/storage_view.cpp b/cpp/mrc/src/internal/codable/storage_view.cpp index 3ae474ad7..834af06e1 100644 --- a/cpp/mrc/src/internal/codable/storage_view.cpp +++ b/cpp/mrc/src/internal/codable/storage_view.cpp @@ -19,7 +19,6 @@ #include -#include #include namespace mrc::codable { diff --git a/cpp/mrc/src/internal/control_plane/client/connections_manager.cpp b/cpp/mrc/src/internal/control_plane/client/connections_manager.cpp index 76cc2477e..1cb40b953 100644 --- a/cpp/mrc/src/internal/control_plane/client/connections_manager.cpp +++ b/cpp/mrc/src/internal/control_plane/client/connections_manager.cpp @@ -31,7 +31,6 @@ #include #include -#include #include #include #include diff --git a/cpp/mrc/src/internal/control_plane/client/state_manager.cpp b/cpp/mrc/src/internal/control_plane/client/state_manager.cpp index 1970e3574..e21fc6519 100644 --- a/cpp/mrc/src/internal/control_plane/client/state_manager.cpp +++ b/cpp/mrc/src/internal/control_plane/client/state_manager.cpp @@ -22,6 +22,7 @@ #include "mrc/core/error.hpp" #include "mrc/edge/edge_builder.hpp" +#include "mrc/edge/edge_writable.hpp" #include "mrc/node/rx_sink.hpp" #include "mrc/protos/architect.pb.h" #include "mrc/runnable/launch_control.hpp" diff --git a/cpp/mrc/src/internal/control_plane/server/connection_manager.cpp b/cpp/mrc/src/internal/control_plane/server/connection_manager.cpp index 617c3b4c6..2098f283b 100644 --- a/cpp/mrc/src/internal/control_plane/server/connection_manager.cpp +++ b/cpp/mrc/src/internal/control_plane/server/connection_manager.cpp @@ -27,7 +27,6 @@ #include #include -#include #include #include diff --git a/cpp/mrc/src/internal/memory/device_resources.cpp b/cpp/mrc/src/internal/memory/device_resources.cpp index 907eb1a4a..9ec0f5b04 100644 --- a/cpp/mrc/src/internal/memory/device_resources.cpp +++ b/cpp/mrc/src/internal/memory/device_resources.cpp @@ -35,16 +35,12 @@ #include "mrc/types.hpp" #include "mrc/utils/bytes_to_string.hpp" -#include #include -#include -#include #include #include #include #include -#include namespace mrc::memory { diff --git a/cpp/mrc/src/internal/memory/host_resources.cpp b/cpp/mrc/src/internal/memory/host_resources.cpp index c98c78618..42acfd32b 100644 --- a/cpp/mrc/src/internal/memory/host_resources.cpp +++ b/cpp/mrc/src/internal/memory/host_resources.cpp @@ -35,13 +35,10 @@ #include "mrc/types.hpp" #include "mrc/utils/bytes_to_string.hpp" -#include #include -#include #include #include -#include #include #include #include diff --git a/cpp/mrc/src/internal/network/network_resources.cpp b/cpp/mrc/src/internal/network/network_resources.cpp index b28a0d14f..ea078bee5 100644 --- a/cpp/mrc/src/internal/network/network_resources.cpp +++ b/cpp/mrc/src/internal/network/network_resources.cpp @@ -27,7 +27,6 @@ #include "mrc/core/task_queue.hpp" #include "mrc/types.hpp" -#include #include #include diff --git a/cpp/mrc/src/internal/pipeline/controller.cpp b/cpp/mrc/src/internal/pipeline/controller.cpp index 93946abbe..459817351 100644 --- a/cpp/mrc/src/internal/pipeline/controller.cpp +++ b/cpp/mrc/src/internal/pipeline/controller.cpp @@ -31,12 +31,10 @@ #include #include #include -#include #include #include #include #include -#include namespace mrc::pipeline { diff --git a/cpp/mrc/src/internal/pubsub/publisher_service.cpp b/cpp/mrc/src/internal/pubsub/publisher_service.cpp index 2ea517e44..5175e5315 100644 --- a/cpp/mrc/src/internal/pubsub/publisher_service.cpp +++ b/cpp/mrc/src/internal/pubsub/publisher_service.cpp @@ -39,10 +39,8 @@ #include #include -#include #include #include -#include namespace mrc::pubsub { diff --git a/cpp/mrc/src/internal/pubsub/subscriber_service.cpp b/cpp/mrc/src/internal/pubsub/subscriber_service.cpp index c53dac546..fba47135b 100644 --- a/cpp/mrc/src/internal/pubsub/subscriber_service.cpp +++ b/cpp/mrc/src/internal/pubsub/subscriber_service.cpp @@ -27,6 +27,7 @@ #include "internal/runtime/partition.hpp" #include "mrc/edge/edge_builder.hpp" +#include "mrc/edge/edge_writable.hpp" #include "mrc/node/operators/router.hpp" #include "mrc/node/rx_sink.hpp" #include "mrc/protos/codable.pb.h" @@ -41,7 +42,6 @@ #include #include #include -#include namespace mrc::pubsub { diff --git a/cpp/mrc/src/internal/runnable/fiber_engine.cpp b/cpp/mrc/src/internal/runnable/fiber_engine.cpp index 10dc1eb51..f208d5791 100644 --- a/cpp/mrc/src/internal/runnable/fiber_engine.cpp +++ b/cpp/mrc/src/internal/runnable/fiber_engine.cpp @@ -21,8 +21,6 @@ #include "mrc/runnable/types.hpp" #include "mrc/types.hpp" -#include - #include namespace mrc::runnable { diff --git a/cpp/mrc/src/internal/runnable/fiber_engines.cpp b/cpp/mrc/src/internal/runnable/fiber_engines.cpp index 87dfa5556..ed720803c 100644 --- a/cpp/mrc/src/internal/runnable/fiber_engines.cpp +++ b/cpp/mrc/src/internal/runnable/fiber_engines.cpp @@ -27,7 +27,6 @@ #include #include -#include #include namespace mrc::runnable { diff --git a/cpp/mrc/src/internal/runnable/runnable_resources.cpp b/cpp/mrc/src/internal/runnable/runnable_resources.cpp index 4fa98f1ce..9930c7778 100644 --- a/cpp/mrc/src/internal/runnable/runnable_resources.cpp +++ b/cpp/mrc/src/internal/runnable/runnable_resources.cpp @@ -27,7 +27,6 @@ #include "mrc/runnable/types.hpp" #include "mrc/types.hpp" -#include #include #include diff --git a/cpp/mrc/src/internal/runnable/thread_engine.cpp b/cpp/mrc/src/internal/runnable/thread_engine.cpp index fb18c3b60..b22edd730 100644 --- a/cpp/mrc/src/internal/runnable/thread_engine.cpp +++ b/cpp/mrc/src/internal/runnable/thread_engine.cpp @@ -24,7 +24,6 @@ #include "mrc/runnable/types.hpp" #include "mrc/types.hpp" -#include #include #include diff --git a/cpp/mrc/src/internal/runnable/thread_engines.cpp b/cpp/mrc/src/internal/runnable/thread_engines.cpp index 23f9c430a..92ea1a65e 100644 --- a/cpp/mrc/src/internal/runnable/thread_engines.cpp +++ b/cpp/mrc/src/internal/runnable/thread_engines.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include namespace mrc::runnable { diff --git a/cpp/mrc/src/internal/segment/builder_definition.cpp b/cpp/mrc/src/internal/segment/builder_definition.cpp index e631c3f1e..b11614328 100644 --- a/cpp/mrc/src/internal/segment/builder_definition.cpp +++ b/cpp/mrc/src/internal/segment/builder_definition.cpp @@ -28,9 +28,9 @@ #include "mrc/modules/properties/persistent.hpp" // IWYU pragma: keep #include "mrc/modules/segment_modules.hpp" #include "mrc/node/port_registry.hpp" +#include "mrc/runnable/launchable.hpp" #include "mrc/segment/egress_port.hpp" // IWYU pragma: keep #include "mrc/segment/ingress_port.hpp" // IWYU pragma: keep -#include "mrc/segment/initializers.hpp" #include "mrc/segment/object.hpp" #include "mrc/types.hpp" diff --git a/cpp/mrc/src/internal/system/host_partition_provider.cpp b/cpp/mrc/src/internal/system/host_partition_provider.cpp index 953833435..42a579547 100644 --- a/cpp/mrc/src/internal/system/host_partition_provider.cpp +++ b/cpp/mrc/src/internal/system/host_partition_provider.cpp @@ -17,6 +17,7 @@ #include "internal/system/host_partition_provider.hpp" +#include "internal/system/host_partition.hpp" #include "internal/system/partitions.hpp" #include "internal/system/system.hpp" @@ -25,7 +26,6 @@ #include namespace mrc::system { -class HostPartition; HostPartitionProvider::HostPartitionProvider(const SystemProvider& _system, std::size_t _host_partition_id) : SystemProvider(_system), diff --git a/cpp/mrc/src/internal/system/partition_provider.cpp b/cpp/mrc/src/internal/system/partition_provider.cpp index 33feb2c77..7597da9cc 100644 --- a/cpp/mrc/src/internal/system/partition_provider.cpp +++ b/cpp/mrc/src/internal/system/partition_provider.cpp @@ -17,6 +17,7 @@ #include "internal/system/partition_provider.hpp" +#include "internal/system/partition.hpp" #include "internal/system/partitions.hpp" #include "internal/system/system.hpp" diff --git a/cpp/mrc/src/internal/system/threading_resources.cpp b/cpp/mrc/src/internal/system/threading_resources.cpp index 27001092a..1e0f8c16b 100644 --- a/cpp/mrc/src/internal/system/threading_resources.cpp +++ b/cpp/mrc/src/internal/system/threading_resources.cpp @@ -19,9 +19,10 @@ #include "internal/system/fiber_manager.hpp" +#include "mrc/types.hpp" + #include -#include #include namespace mrc::system { diff --git a/cpp/mrc/src/internal/ucx/receive_manager.cpp b/cpp/mrc/src/internal/ucx/receive_manager.cpp index 2796bf84e..70cda928a 100644 --- a/cpp/mrc/src/internal/ucx/receive_manager.cpp +++ b/cpp/mrc/src/internal/ucx/receive_manager.cpp @@ -23,7 +23,6 @@ #include "mrc/types.hpp" #include -#include #include #include // for launch, launch::post #include // for ucp_tag_probe_nb, ucp_tag_recv_info diff --git a/cpp/mrc/src/internal/ucx/ucx_resources.cpp b/cpp/mrc/src/internal/ucx/ucx_resources.cpp index 458dd9814..1ce368662 100644 --- a/cpp/mrc/src/internal/ucx/ucx_resources.cpp +++ b/cpp/mrc/src/internal/ucx/ucx_resources.cpp @@ -30,7 +30,6 @@ #include "mrc/cuda/common.hpp" #include "mrc/types.hpp" -#include #include #include diff --git a/cpp/mrc/src/public/core/thread.cpp b/cpp/mrc/src/public/core/thread.cpp index 0553a8fe0..f81ecb38d 100644 --- a/cpp/mrc/src/public/core/thread.cpp +++ b/cpp/mrc/src/public/core/thread.cpp @@ -20,7 +20,6 @@ #include "mrc/coroutines/thread_pool.hpp" #include -#include #include #include #include diff --git a/cpp/mrc/src/public/coroutines/scheduler.cpp b/cpp/mrc/src/public/coroutines/scheduler.cpp index 907b4c1c3..5d108d24d 100644 --- a/cpp/mrc/src/public/coroutines/scheduler.cpp +++ b/cpp/mrc/src/public/coroutines/scheduler.cpp @@ -19,7 +19,9 @@ #include +#include #include +#include namespace mrc::coroutines { diff --git a/cpp/mrc/src/public/coroutines/task_container.cpp b/cpp/mrc/src/public/coroutines/task_container.cpp index c25f6f074..64536eb56 100644 --- a/cpp/mrc/src/public/coroutines/task_container.cpp +++ b/cpp/mrc/src/public/coroutines/task_container.cpp @@ -21,8 +21,10 @@ #include +#include +#include #include -#include +#include #include namespace mrc::coroutines { diff --git a/cpp/mrc/src/public/coroutines/thread_pool.cpp b/cpp/mrc/src/public/coroutines/thread_pool.cpp index e2724409e..805a64d2a 100644 --- a/cpp/mrc/src/public/coroutines/thread_pool.cpp +++ b/cpp/mrc/src/public/coroutines/thread_pool.cpp @@ -39,7 +39,6 @@ #include "mrc/coroutines/thread_pool.hpp" #include -#include #include #include diff --git a/cpp/mrc/src/public/modules/sample_modules.cpp b/cpp/mrc/src/public/modules/sample_modules.cpp index fe850615c..405dcfe3c 100644 --- a/cpp/mrc/src/public/modules/sample_modules.cpp +++ b/cpp/mrc/src/public/modules/sample_modules.cpp @@ -26,10 +26,8 @@ #include -#include #include #include -#include namespace mrc::modules { diff --git a/cpp/mrc/src/tests/nodes/common_nodes.cpp b/cpp/mrc/src/tests/nodes/common_nodes.cpp index f7432f670..1c7acd824 100644 --- a/cpp/mrc/src/tests/nodes/common_nodes.cpp +++ b/cpp/mrc/src/tests/nodes/common_nodes.cpp @@ -28,13 +28,11 @@ #include #include -#include #include #include #include #include #include -#include using namespace mrc; using namespace mrc::memory::literals; diff --git a/cpp/mrc/src/tests/nodes/common_nodes.hpp b/cpp/mrc/src/tests/nodes/common_nodes.hpp index aa1ff13d2..bb19235e3 100644 --- a/cpp/mrc/src/tests/nodes/common_nodes.hpp +++ b/cpp/mrc/src/tests/nodes/common_nodes.hpp @@ -30,7 +30,6 @@ #include #include #include -#include namespace test::nodes { diff --git a/cpp/mrc/src/tests/pipelines/multi_segment.cpp b/cpp/mrc/src/tests/pipelines/multi_segment.cpp index 5157ef5d6..05dabd28c 100644 --- a/cpp/mrc/src/tests/pipelines/multi_segment.cpp +++ b/cpp/mrc/src/tests/pipelines/multi_segment.cpp @@ -18,7 +18,9 @@ #include "common_pipelines.hpp" #include "mrc/node/rx_sink.hpp" +#include "mrc/node/rx_sink_base.hpp" #include "mrc/node/rx_source.hpp" +#include "mrc/node/rx_source_base.hpp" #include "mrc/pipeline/pipeline.hpp" #include "mrc/segment/builder.hpp" #include "mrc/segment/egress_ports.hpp" @@ -29,11 +31,8 @@ #include #include -#include #include #include -#include -#include using namespace mrc; diff --git a/cpp/mrc/src/tests/segments/common_segments.cpp b/cpp/mrc/src/tests/segments/common_segments.cpp index 9e0f6b61d..eb1d0126d 100644 --- a/cpp/mrc/src/tests/segments/common_segments.cpp +++ b/cpp/mrc/src/tests/segments/common_segments.cpp @@ -28,7 +28,6 @@ #include #include -#include using namespace mrc; diff --git a/cpp/mrc/src/tests/test_grpc.cpp b/cpp/mrc/src/tests/test_grpc.cpp index 68acc2913..95ef5801a 100644 --- a/cpp/mrc/src/tests/test_grpc.cpp +++ b/cpp/mrc/src/tests/test_grpc.cpp @@ -43,21 +43,16 @@ #include "mrc/runnable/runner.hpp" #include "mrc/types.hpp" -#include #include #include #include #include #include -#include -#include #include #include -#include #include #include -#include // Avoid forward declaring template specialization base classes // IWYU pragma: no_forward_declare grpc::ServerAsyncReaderWriter diff --git a/cpp/mrc/src/tests/test_memory.cpp b/cpp/mrc/src/tests/test_memory.cpp index 2544827d3..65059071d 100644 --- a/cpp/mrc/src/tests/test_memory.cpp +++ b/cpp/mrc/src/tests/test_memory.cpp @@ -38,11 +38,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include diff --git a/cpp/mrc/src/tests/test_network.cpp b/cpp/mrc/src/tests/test_network.cpp index 1a14cebf4..509649eed 100644 --- a/cpp/mrc/src/tests/test_network.cpp +++ b/cpp/mrc/src/tests/test_network.cpp @@ -38,6 +38,7 @@ #include "internal/ucx/registration_cache.hpp" #include "mrc/edge/edge_builder.hpp" +#include "mrc/edge/edge_writable.hpp" #include "mrc/memory/adaptors.hpp" #include "mrc/memory/buffer.hpp" #include "mrc/memory/literals.hpp" @@ -62,15 +63,11 @@ #include #include #include -#include #include #include #include -#include -#include #include #include -#include using namespace mrc; using namespace mrc::memory::literals; diff --git a/cpp/mrc/src/tests/test_next.cpp b/cpp/mrc/src/tests/test_next.cpp index da54e0a3f..1886664f7 100644 --- a/cpp/mrc/src/tests/test_next.cpp +++ b/cpp/mrc/src/tests/test_next.cpp @@ -25,6 +25,7 @@ #include "mrc/channel/ingress.hpp" #include "mrc/data/reusable_pool.hpp" #include "mrc/edge/edge_builder.hpp" +#include "mrc/edge/edge_writable.hpp" #include "mrc/node/generic_node.hpp" #include "mrc/node/generic_sink.hpp" #include "mrc/node/generic_source.hpp" @@ -64,12 +65,10 @@ #include #include #include -#include #include #include #include #include -#include using namespace mrc; @@ -573,7 +572,7 @@ TEST_F(TestNext, RxWithReusableOnNextAndOnError) }); static_assert(rxcpp::detail::is_on_next_of>::value, " "); - static_assert(rxcpp::detail::is_on_next_of>::value, " "); + static_assert(rxcpp::detail::is_on_next_of>::value, " "); auto observer = rxcpp::make_observer_dynamic( [](data_t&& int_ptr) { diff --git a/cpp/mrc/src/tests/test_remote_descriptor.cpp b/cpp/mrc/src/tests/test_remote_descriptor.cpp index df4468897..33c85a440 100644 --- a/cpp/mrc/src/tests/test_remote_descriptor.cpp +++ b/cpp/mrc/src/tests/test_remote_descriptor.cpp @@ -39,7 +39,6 @@ #include "mrc/runtime/remote_descriptor_handle.hpp" #include "mrc/types.hpp" -#include #include #include diff --git a/cpp/mrc/src/tests/test_resources.cpp b/cpp/mrc/src/tests/test_resources.cpp index b6b4c953f..6f1abebd0 100644 --- a/cpp/mrc/src/tests/test_resources.cpp +++ b/cpp/mrc/src/tests/test_resources.cpp @@ -28,7 +28,6 @@ #include "mrc/options/placement.hpp" #include "mrc/types.hpp" -#include #include #include diff --git a/cpp/mrc/src/tests/test_runnable.cpp b/cpp/mrc/src/tests/test_runnable.cpp index c5bc0a048..6c303d8a2 100644 --- a/cpp/mrc/src/tests/test_runnable.cpp +++ b/cpp/mrc/src/tests/test_runnable.cpp @@ -47,14 +47,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include using namespace mrc; diff --git a/cpp/mrc/src/tests/test_ucx.cpp b/cpp/mrc/src/tests/test_ucx.cpp index a80321017..8f65b6f34 100644 --- a/cpp/mrc/src/tests/test_ucx.cpp +++ b/cpp/mrc/src/tests/test_ucx.cpp @@ -39,7 +39,6 @@ #include #include #include -#include using namespace mrc; using namespace ucx; diff --git a/cpp/mrc/tests/benchmarking/test_benchmarking.hpp b/cpp/mrc/tests/benchmarking/test_benchmarking.hpp index 99de4e475..c9f7e368d 100644 --- a/cpp/mrc/tests/benchmarking/test_benchmarking.hpp +++ b/cpp/mrc/tests/benchmarking/test_benchmarking.hpp @@ -31,13 +31,11 @@ #include #include -#include #include #include #include #include #include -#include namespace mrc { diff --git a/cpp/mrc/tests/benchmarking/test_stat_gather.hpp b/cpp/mrc/tests/benchmarking/test_stat_gather.hpp index 746be4356..0af0df8ca 100644 --- a/cpp/mrc/tests/benchmarking/test_stat_gather.hpp +++ b/cpp/mrc/tests/benchmarking/test_stat_gather.hpp @@ -29,14 +29,12 @@ #include #include -#include #include #include #include #include #include #include -#include namespace mrc { class TestSegmentResources; diff --git a/cpp/mrc/tests/coroutines/test_async_generator.cpp b/cpp/mrc/tests/coroutines/test_async_generator.cpp index 5e35c06cf..81626a28c 100644 --- a/cpp/mrc/tests/coroutines/test_async_generator.cpp +++ b/cpp/mrc/tests/coroutines/test_async_generator.cpp @@ -22,8 +22,6 @@ #include #include -#include -#include using namespace mrc; diff --git a/cpp/mrc/tests/coroutines/test_event.cpp b/cpp/mrc/tests/coroutines/test_event.cpp index 68689637d..61326e0b3 100644 --- a/cpp/mrc/tests/coroutines/test_event.cpp +++ b/cpp/mrc/tests/coroutines/test_event.cpp @@ -48,7 +48,6 @@ #include #include #include -#include #include using namespace mrc; diff --git a/cpp/mrc/tests/coroutines/test_latch.cpp b/cpp/mrc/tests/coroutines/test_latch.cpp index 1136bf76e..5be3b31e7 100644 --- a/cpp/mrc/tests/coroutines/test_latch.cpp +++ b/cpp/mrc/tests/coroutines/test_latch.cpp @@ -44,7 +44,6 @@ #include #include -#include using namespace mrc; diff --git a/cpp/mrc/tests/coroutines/test_ring_buffer.cpp b/cpp/mrc/tests/coroutines/test_ring_buffer.cpp index fb9afa1c4..a5b0163a2 100644 --- a/cpp/mrc/tests/coroutines/test_ring_buffer.cpp +++ b/cpp/mrc/tests/coroutines/test_ring_buffer.cpp @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include diff --git a/cpp/mrc/tests/coroutines/test_task.cpp b/cpp/mrc/tests/coroutines/test_task.cpp index ffc40a3ef..60cbfafa5 100644 --- a/cpp/mrc/tests/coroutines/test_task.cpp +++ b/cpp/mrc/tests/coroutines/test_task.cpp @@ -49,9 +49,7 @@ #include #include #include -#include #include -#include using namespace mrc; diff --git a/cpp/mrc/tests/coroutines/test_task_container.cpp b/cpp/mrc/tests/coroutines/test_task_container.cpp index 2cd1fdf90..1e43a1f86 100644 --- a/cpp/mrc/tests/coroutines/test_task_container.cpp +++ b/cpp/mrc/tests/coroutines/test_task_container.cpp @@ -15,19 +15,8 @@ * limitations under the License. */ -#include "mrc/coroutines/task.hpp" -#include "mrc/coroutines/task_container.hpp" - -using namespace mrc; -using namespace mrc::coroutines; - #include -#include -#include - -using namespace mrc; - class TestCoroTaskContainer : public ::testing::Test {}; diff --git a/cpp/mrc/tests/logging/test_logging.cpp b/cpp/mrc/tests/logging/test_logging.cpp index f72cb113c..0d26a82bb 100644 --- a/cpp/mrc/tests/logging/test_logging.cpp +++ b/cpp/mrc/tests/logging/test_logging.cpp @@ -21,8 +21,6 @@ #include -#include - namespace mrc { TEST_CLASS(Logging); diff --git a/cpp/mrc/tests/modules/dynamic_module.cpp b/cpp/mrc/tests/modules/dynamic_module.cpp index 3db4e08cd..9538ed825 100644 --- a/cpp/mrc/tests/modules/dynamic_module.cpp +++ b/cpp/mrc/tests/modules/dynamic_module.cpp @@ -19,13 +19,13 @@ #include "mrc/modules/segment_modules.hpp" #include "mrc/node/rx_source.hpp" #include "mrc/segment/builder.hpp" +#include "mrc/segment/object.hpp" #include "mrc/utils/type_utils.hpp" #include "mrc/version.hpp" #include #include -#include #include #include #include diff --git a/cpp/mrc/tests/modules/test_mirror_tap_module.cpp b/cpp/mrc/tests/modules/test_mirror_tap_module.cpp index 7f68a354b..165382a94 100644 --- a/cpp/mrc/tests/modules/test_mirror_tap_module.cpp +++ b/cpp/mrc/tests/modules/test_mirror_tap_module.cpp @@ -20,10 +20,10 @@ #include "mrc/cuda/device_guard.hpp" #include "mrc/experimental/modules/mirror_tap/mirror_tap.hpp" #include "mrc/modules/properties/persistent.hpp" -#include "mrc/node/operators/broadcast.hpp" #include "mrc/node/rx_node.hpp" #include "mrc/node/rx_sink.hpp" #include "mrc/node/rx_source.hpp" +#include "mrc/node/rx_source_base.hpp" #include "mrc/options/options.hpp" #include "mrc/options/topology.hpp" #include "mrc/pipeline/executor.hpp" @@ -38,11 +38,9 @@ #include #include -#include #include #include #include -#include using namespace mrc; diff --git a/cpp/mrc/tests/modules/test_mirror_tap_orchestrator.cpp b/cpp/mrc/tests/modules/test_mirror_tap_orchestrator.cpp index ceeba44e2..2de1cf98c 100644 --- a/cpp/mrc/tests/modules/test_mirror_tap_orchestrator.cpp +++ b/cpp/mrc/tests/modules/test_mirror_tap_orchestrator.cpp @@ -20,9 +20,10 @@ #include "mrc/cuda/device_guard.hpp" #include "mrc/experimental/modules/mirror_tap/mirror_tap_orchestrator.hpp" #include "mrc/modules/properties/persistent.hpp" -#include "mrc/node/operators/broadcast.hpp" #include "mrc/node/rx_sink.hpp" +#include "mrc/node/rx_sink_base.hpp" #include "mrc/node/rx_source.hpp" +#include "mrc/node/rx_source_base.hpp" #include "mrc/options/options.hpp" #include "mrc/options/topology.hpp" #include "mrc/pipeline/executor.hpp" @@ -37,12 +38,10 @@ #include #include -#include #include #include #include #include -#include using namespace mrc; diff --git a/cpp/mrc/tests/modules/test_module_util.cpp b/cpp/mrc/tests/modules/test_module_util.cpp index 989ec4ed1..f064df81a 100644 --- a/cpp/mrc/tests/modules/test_module_util.cpp +++ b/cpp/mrc/tests/modules/test_module_util.cpp @@ -20,13 +20,11 @@ #include "mrc/modules/module_registry_util.hpp" #include "mrc/modules/properties/persistent.hpp" #include "mrc/modules/sample_modules.hpp" -#include "mrc/node/rx_source.hpp" #include "mrc/version.hpp" #include +#include -#include -#include #include #include #include diff --git a/cpp/mrc/tests/test_channel.cpp b/cpp/mrc/tests/test_channel.cpp index 6d796dba6..1a5f8ef2e 100644 --- a/cpp/mrc/tests/test_channel.cpp +++ b/cpp/mrc/tests/test_channel.cpp @@ -27,7 +27,6 @@ #include #include -#include #include // for sleep_for #include // for duration, system_clock, milliseconds, time_point @@ -35,7 +34,6 @@ #include // for uint64_t #include // for ref, reference_wrapper #include -#include #include // IWYU thinks algorithm is needed for: auto channel = std::make_shared>(2); // IWYU pragma: no_include diff --git a/cpp/mrc/tests/test_executor.cpp b/cpp/mrc/tests/test_executor.cpp index e8da2fe0b..989dfe2f1 100644 --- a/cpp/mrc/tests/test_executor.cpp +++ b/cpp/mrc/tests/test_executor.cpp @@ -17,7 +17,9 @@ #include "mrc/node/rx_node.hpp" #include "mrc/node/rx_sink.hpp" +#include "mrc/node/rx_sink_base.hpp" #include "mrc/node/rx_source.hpp" +#include "mrc/node/rx_source_base.hpp" #include "mrc/options/engine_groups.hpp" #include "mrc/options/options.hpp" #include "mrc/options/topology.hpp" @@ -41,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -49,7 +50,6 @@ #include #include #include -#include namespace mrc { diff --git a/cpp/mrc/tests/test_node.cpp b/cpp/mrc/tests/test_node.cpp index 428c41d2c..8305fc79d 100644 --- a/cpp/mrc/tests/test_node.cpp +++ b/cpp/mrc/tests/test_node.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/cpp/mrc/tests/test_pipeline.cpp b/cpp/mrc/tests/test_pipeline.cpp index c34731302..6d1bc4499 100644 --- a/cpp/mrc/tests/test_pipeline.cpp +++ b/cpp/mrc/tests/test_pipeline.cpp @@ -16,7 +16,9 @@ */ #include "mrc/node/rx_sink.hpp" +#include "mrc/node/rx_sink_base.hpp" #include "mrc/node/rx_source.hpp" +#include "mrc/node/rx_source_base.hpp" #include "mrc/options/options.hpp" #include "mrc/options/topology.hpp" #include "mrc/pipeline/executor.hpp" @@ -33,12 +35,9 @@ #include #include -#include #include #include -#include #include -#include namespace mrc { diff --git a/cpp/mrc/tests/test_segment.cpp b/cpp/mrc/tests/test_segment.cpp index be1bbc29c..bd3b09d78 100644 --- a/cpp/mrc/tests/test_segment.cpp +++ b/cpp/mrc/tests/test_segment.cpp @@ -23,7 +23,6 @@ #include "mrc/node/rx_node.hpp" #include "mrc/node/rx_sink.hpp" #include "mrc/node/rx_source.hpp" -#include "mrc/node/rx_source_base.hpp" #include "mrc/options/options.hpp" #include "mrc/options/topology.hpp" #include "mrc/pipeline/executor.hpp" @@ -40,9 +39,7 @@ #include #include -#include #include -#include #include #include #include diff --git a/cpp/mrc/tests/test_thread.cpp b/cpp/mrc/tests/test_thread.cpp index c19753734..88785379f 100644 --- a/cpp/mrc/tests/test_thread.cpp +++ b/cpp/mrc/tests/test_thread.cpp @@ -25,7 +25,6 @@ #include #include -#include using namespace mrc;