Skip to content

Commit 7b46839

Browse files
committed
Revert "Check"
This reverts commit dddaf1b.
1 parent 1fd76a8 commit 7b46839

File tree

4 files changed

+0
-16
lines changed

4 files changed

+0
-16
lines changed

src/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,6 @@ cc_library(
701701
"@mediapipe//mediapipe/calculators/tensor:image_to_tensor_calculator",
702702
"@mediapipe//mediapipe/modules/holistic_landmark:holistic_landmark_cpu",
703703
"libovmsmediapipe_utils",
704-
"@mediapipe//mediapipe/framework:thread_pool_executor",
705704
"@mediapipe//mediapipe/calculators/geti/inference:inference_calculators",
706705
"@mediapipe//mediapipe/calculators/geti/utils:utils",
707706
"@mediapipe//mediapipe/calculators/geti/utils:emptylabel_calculators",

src/mediapipe_internal/mediapipegraphdefinition.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,6 @@ MediapipeGraphDefinition::MediapipeGraphDefinition(const std::string name,
191191
reporter(std::make_unique<MediapipeServableMetricReporter>(metricConfig, registry, name)) {
192192
mgconfig = config;
193193
passKfsRequestFlag = false;
194-
if (!sharedThreadPool) {
195-
SPDLOG_ERROR("Created shared Thread Pool XXX");
196-
sharedThreadPool = std::make_shared<mediapipe::ThreadPoolExecutor>(std::thread::hardware_concurrency()); // TODO FIXME should be in MP factory
197-
}
198194
}
199195

200196
Status MediapipeGraphDefinition::createInputsInfo() {
@@ -478,5 +474,4 @@ Status MediapipeGraphDefinition::initializeNodes() {
478474
}
479475
return StatusCode::OK;
480476
}
481-
std::shared_ptr<mediapipe::ThreadPoolExecutor> sharedThreadPool; // TODO FIXME should be in MP factory
482477
} // namespace ovms

src/mediapipe_internal/mediapipegraphdefinition.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "mediapipe/framework/calculator_graph.h"
3838
#include "mediapipe/framework/port/parse_text_proto.h"
3939
#include "mediapipe/framework/port/status.h"
40-
#include "mediapipe/framework/thread_pool_executor.h"
4140
#pragma GCC diagnostic pop
4241
#pragma warning(pop)
4342

@@ -58,7 +57,6 @@ class GenAiServable;
5857
using PythonNodeResourcesMap = std::unordered_map<std::string, std::shared_ptr<PythonNodeResources>>;
5958
using GenAiServableMap = std::unordered_map<std::string, std::shared_ptr<GenAiServable>>;
6059

61-
extern std::shared_ptr<mediapipe::ThreadPoolExecutor> sharedThreadPool;
6260
class MediapipeGraphDefinition {
6361
friend MediapipeGraphDefinitionUnloadGuard;
6462

src/mediapipe_internal/mediapipegraphexecutor.hpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <vector>
2525

2626
#include "../execution_context.hpp"
27-
#include "../logging.hpp"
2827
#include "../model_metric_reporter.hpp"
2928
#include "../profiler.hpp"
3029
#include "../status.hpp"
@@ -110,9 +109,6 @@ class MediapipeGraphExecutor {
110109
MetricCounterGuard failedRequestsGuard(this->mediapipeServableMetricReporter->getRequestsMetric(executionContext, false));
111110
MetricGaugeGuard currentGraphsGuard(this->mediapipeServableMetricReporter->currentGraphs.get());
112111
::mediapipe::CalculatorGraph graph;
113-
SPDLOG_ERROR("SetExecutor XXX");
114-
std::ignore = graph.SetExecutor("", sharedThreadPool); // TODO FIXME
115-
SPDLOG_ERROR("Start unary KServe request mediapipe graph: {} initializationXXXbegin", this->name);
116112
MP_RETURN_ON_FAIL(graph.Initialize(this->config), std::string("failed initialization of MediaPipe graph: ") + this->name, StatusCode::MEDIAPIPE_GRAPH_INITIALIZATION_ERROR);
117113
enum : unsigned int {
118114
PROCESS,
@@ -141,9 +137,7 @@ class MediapipeGraphExecutor {
141137
inputSidePackets[PYTHON_SESSION_SIDE_PACKET_TAG] = mediapipe::MakePacket<PythonNodeResourcesMap>(this->pythonNodeResourcesMap).At(STARTING_TIMESTAMP);
142138
inputSidePackets[LLM_SESSION_SIDE_PACKET_TAG] = mediapipe::MakePacket<GenAiServableMap>(this->llmNodeResourcesMap).At(STARTING_TIMESTAMP);
143139
#endif
144-
SPDLOG_ERROR("Start unary KServe request mediapipe graph: {} startRunXXXbegin", this->name);
145140
MP_RETURN_ON_FAIL(graph.StartRun(inputSidePackets), std::string("start MediaPipe graph: ") + this->name, StatusCode::MEDIAPIPE_GRAPH_START_ERROR);
146-
SPDLOG_ERROR("Start unary KServe request mediapipe graph: {} startRunXXXend", this->name);
147141

148142
::mediapipe::Packet packet;
149143
std::set<std::string> outputPollersWithReceivedPacket;
@@ -238,9 +232,7 @@ class MediapipeGraphExecutor {
238232
{
239233
OVMS_PROFILE_SCOPE("Mediapipe graph initialization");
240234
// Init
241-
SPDLOG_DEBUG("Start unary KServe request mediapipe graph: {} initializationXXX", this->name);
242235
MP_RETURN_ON_FAIL(graph.Initialize(this->config), "graph initialization", StatusCode::MEDIAPIPE_GRAPH_INITIALIZATION_ERROR);
243-
SPDLOG_DEBUG("Start unary KServe request mediapipe graph: {} initializationXXX ended", this->name);
244236
}
245237
enum : unsigned int {
246238
PROCESS,

0 commit comments

Comments
 (0)