cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce FixGraphBackEdges utils function.

Browse Source 
PiperOrigin-RevId: 573925628
This commit is contained in:
MediaPipe Team 2023-10-16 14:11:04 -07:00 committed by Copybara-Service
parent a1e1b5d34c
commit 2e11444f5c
6 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mediapipe/tasks/cc/core/utils.cc
View File

@ -32,6 +32,7 @@ namespace core {
namespace {
constexpr char kFinishedTag[] = "FINISHED";
constexpr char kFlowLimiterCalculatorName[] = "FlowLimiterCalculator";
constexpr char kPreviousLoopbackCalculatorName[] = "PreviousLoopbackCalculator";
} // namespace
@ -89,6 +90,19 @@ CalculatorGraphConfig AddFlowLimiterCalculator(
return config;
}
void FixGraphBackEdges(::mediapipe::CalculatorGraphConfig& graph_config) {
// TODO remove when support is fixed.
// As mediapipe GraphBuilder currently doesn't support configuring
// InputStreamInfo, modifying the CalculatorGraphConfig proto directly.
for (int i = 0; i < graph_config.node_size(); ++i) {
if (graph_config.node(i).calculator() == kPreviousLoopbackCalculatorName) {
auto* info = graph_config.mutable_node(i)->add_input_stream_info();
info->set_tag_index("LOOP");
info->set_back_edge(true);
}
}
}
} // namespace core
} // namespace tasks
} // namespace mediapipe

4
mediapipe/tasks/cc/core/utils.h
View File

@ -84,6 +84,10 @@ static TensorType* FindTensorByName(
std::vector<std::string> input_stream_tags, std::string finished_stream_tag,
int max_in_flight = 1, int max_in_queue = 1);
// Fixs the graph config containing PreviousLoopbackCalculator where the edge
// forming a loop needs to be tagged as back edge.
void FixGraphBackEdges(::mediapipe::CalculatorGraphConfig& graph_config);
} // namespace core
} // namespace tasks
} // namespace mediapipe

12
mediapipe/tasks/cc/vision/face_landmarker/face_landmarker_graph.cc
View File

@ -393,18 +393,8 @@ class FaceLandmarkerGraph : public core::ModelTaskGraph {
graph[Output<std::vector<FaceGeometry>>(kFaceGeometryTag)];
}
// TODO remove when support is fixed.
// As mediapipe GraphBuilder currently doesn't support configuring
// InputStreamInfo, modifying the CalculatorGraphConfig proto directly.
CalculatorGraphConfig config = graph.GetConfig();
for (int i = 0; i < config.node_size(); ++i) {
if (config.node(i).calculator() == "PreviousLoopbackCalculator") {
auto* info = config.mutable_node(i)->add_input_stream_info();
info->set_tag_index(kLoopTag);
info->set_back_edge(true);
break;
}
}
core::FixGraphBackEdges(config);
return config;
}

12
mediapipe/tasks/cc/vision/hand_landmarker/hand_landmarker_graph.cc
View File

@ -254,18 +254,8 @@ class HandLandmarkerGraph : public core::ModelTaskGraph {
graph[Output<std::vector<Detection>>(kPalmDetectionsTag)];
hand_landmarker_outputs.image >> graph[Output<Image>(kImageTag)];
// TODO remove when support is fixed.
// As mediapipe GraphBuilder currently doesn't support configuring
// InputStreamInfo, modifying the CalculatorGraphConfig proto directly.
CalculatorGraphConfig config = graph.GetConfig();
for (int i = 0; i < config.node_size(); ++i) {
if (config.node(i).calculator() == kPreviousLoopbackCalculatorName) {
auto* info = config.mutable_node(i)->add_input_stream_info();
info->set_tag_index("LOOP");
info->set_back_edge(true);
break;
}
}
core::FixGraphBackEdges(config);
return config;
}

1
mediapipe/tasks/cc/vision/pose_landmarker/BUILD
View File

@ -138,6 +138,7 @@ cc_library(
"//mediapipe/tasks/cc/core:model_asset_bundle_resources",
"//mediapipe/tasks/cc/core:model_resources_cache",
"//mediapipe/tasks/cc/core:model_task_graph",
"//mediapipe/tasks/cc/core:utils",
"//mediapipe/tasks/cc/metadata/utils:zip_utils",
"//mediapipe/tasks/cc/vision/pose_detector:pose_detector_graph",
"//mediapipe/tasks/cc/vision/pose_detector/proto:pose_detector_graph_options_cc_proto",

14
mediapipe/tasks/cc/vision/pose_landmarker/pose_landmarker_graph.cc
View File

@ -31,6 +31,7 @@ limitations under the License.
#include "mediapipe/tasks/cc/core/model_asset_bundle_resources.h"
#include "mediapipe/tasks/cc/core/model_resources_cache.h"
#include "mediapipe/tasks/cc/core/model_task_graph.h"
#include "mediapipe/tasks/cc/core/utils.h"
#include "mediapipe/tasks/cc/metadata/utils/zip_utils.h"
#include "mediapipe/tasks/cc/vision/pose_detector/proto/pose_detector_graph_options.pb.h"
#include "mediapipe/tasks/cc/vision/pose_landmarker/proto/pose_landmarker_graph_options.pb.h"
@ -259,19 +260,8 @@ class PoseLandmarkerGraph : public core::ModelTaskGraph {
graph[Output<std::vector<Image>>(kSegmentationMaskTag)];
}
// TODO remove when support is fixed.
// As mediapipe GraphBuilder currently doesn't support configuring
// InputStreamInfo, modifying the CalculatorGraphConfig proto directly.
CalculatorGraphConfig config = graph.GetConfig();
for (int i = 0; i < config.node_size(); ++i) {
if (config.node(i).calculator() == "PreviousLoopbackCalculator") {
auto* info = config.mutable_node(i)->add_input_stream_info();
info->set_tag_index(kLoopTag);
info->set_back_edge(true);
break;
}
}
core::FixGraphBackEdges(config);
return config;
}