reorg files

nv-morpheus · Sep 25, 2024 · 52ccfbe · 52ccfbe
1 parent e1a95d3
commit 52ccfbe
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/python/morpheus/morpheus/_lib/cmake/libmorpheus.cmake b/python/morpheus/morpheus/_lib/cmake/libmorpheus.cmake
@@ -17,6 +17,7 @@ include(GenerateExportHeader)
 add_library(morpheus
 
  # Keep these sorted!
+ src/controllers/monitor_controller.cpp
  src/io/data_loader_registry.cpp
  src/io/data_loader.cpp
  src/io/deserializers.cpp
@@ -60,7 +61,6 @@ add_library(morpheus
  src/stages/inference_client_stage.cpp
  src/stages/kafka_source.cpp
  src/stages/monitor.cpp
- src/stages/monitor_controller.cpp
  src/stages/preprocess_fil.cpp
  src/stages/preprocess_nlp.cpp
  src/stages/serialize.cpp

diff --git a/...de/morpheus/stages/monitor_controller.hpp → ...rpheus/controllers/monitor_controller.hpp b/...de/morpheus/stages/monitor_controller.hpp → ...rpheus/controllers/monitor_controller.hpp
diff --git a/python/morpheus/morpheus/_lib/include/morpheus/stages/monitor.hpp b/python/morpheus/morpheus/_lib/include/morpheus/stages/monitor.hpp
@@ -18,7 +18,7 @@
 #pragma once
 
 #include "morpheus/export.h" // for MORPHEUS_EXPORT
-#include "morpheus/stages/monitor_controller.hpp" // for MonitorController
+#include "morpheus/controllers/monitor_controller.hpp" // for MonitorController
 
 #include <indicators/progress_bar.hpp>
 #include <mrc/segment/builder.hpp> // for Builder
@@ -50,9 +50,6 @@ class MORPHEUS_EXPORT MonitorStage : public mrc::pymrc::PythonNode<std::shared_p
  using typename base_t::subscribe_fn_t;
 
  MonitorStage(const std::string& description,
- float smoothing,
- const std::string& unit,
- bool delayed_start,
  std::optional<std::function<int(MessageT)>> determine_count_fn = std::nullopt);
 
  private:

diff --git a/...us/_lib/src/stages/monitor_controller.cpp → ...ib/src/controllers/monitor_controller.cpp b/...us/_lib/src/stages/monitor_controller.cpp → ...ib/src/controllers/monitor_controller.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "morpheus/stages/monitor_controller.hpp"
+#include "morpheus/controllers/monitor_controller.hpp"
 
 #include "indicators/setting.hpp"
 

diff --git a/python/morpheus/morpheus/_lib/src/stages/monitor.cpp b/python/morpheus/morpheus/_lib/src/stages/monitor.cpp
@@ -23,13 +23,10 @@ namespace morpheus {
 // ****************** MonitorStage ************************ //
 template <typename MessageT>
 MonitorStage<MessageT>::MonitorStage(const std::string& description,
- float smoothing,
- const std::string& unit,
- bool delayed_start,
  std::optional<std::function<int(MessageT)>> determine_count_fn) :
  base_t(base_t::op_factory_from_sub_fn(build_operator()))
 {
- m_monitor_controller = MonitorController<MessageT>(description, smoothing, unit, delayed_start, determine_count_fn);
+ m_monitor_controller = MonitorController<MessageT>(description, determine_count_fn);
 }
 
 template <typename MessageT>