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

Switch to Cast where possible and reduce usage of operator[](port).

Browse Source 
PiperOrigin-RevId: 496527250
This commit is contained in:
MediaPipe Team 2022-12-19 17:16:04 -08:00 committed by Copybara-Service
parent 6842f2c7c6
commit f5f2fee0b9
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mediapipe/framework/api2/builder_test.cc
View File

@ -55,16 +55,16 @@ TEST(BuilderTest, BuildGraph) {
TEST(BuilderTest, CopyableSource) { TEST(BuilderTest, CopyableSource) {
Graph graph; Graph graph;
Source<int> a = graph[Input<int>("A")]; Source<int> a = graph.In("A").Cast<int>();
a.SetName("a"); a.SetName("a");
Source<int> b = graph[Input<int>("B")]; Source<int> b = graph.In("B").Cast<int>();
b.SetName("b"); b.SetName("b");
SideSource<float> side_a = graph[SideInput<float>("SIDE_A")]; SideSource<float> side_a = graph.SideIn("SIDE_A").Cast<float>();
side_a.SetName("side_a"); side_a.SetName("side_a");
SideSource<float> side_b = graph[SideInput<float>("SIDE_B")]; SideSource<float> side_b = graph.SideIn("SIDE_B").Cast<float>();
side_b.SetName("side_b"); side_b.SetName("side_b");
Destination<int> out = graph[Output<int>("OUT")]; Destination<int> out = graph.Out("OUT").Cast<int>();
SideDestination<float> side_out = graph[SideOutput<float>("SIDE_OUT")]; SideDestination<float> side_out = graph.SideOut("SIDE_OUT").Cast<float>();
Source<int> input = a; Source<int> input = a;
input = b; input = b;
@ -89,28 +89,28 @@ TEST(BuilderTest, CopyableSource) {
TEST(BuilderTest, BuildGraphWithFunctions) { TEST(BuilderTest, BuildGraphWithFunctions) {
Graph graph; Graph graph;
Source<int> base = graph[Input<int>("IN")]; Source<int> base = graph.In("IN").Cast<int>();
base.SetName("base"); base.SetName("base");
SideSource<float> side = graph[SideInput<float>("SIDE")]; SideSource<float> side = graph.SideIn("SIDE").Cast<float>();
side.SetName("side"); side.SetName("side");
auto foo_fn = [](Source<int> base, SideSource<float> side, Graph& graph) { auto foo_fn = [](Source<int> base, SideSource<float> side, Graph& graph) {
auto& foo = graph.AddNode("Foo"); auto& foo = graph.AddNode("Foo");
base >> foo[Input<int>("BASE")]; base >> foo.In("BASE");
side >> foo[SideInput<float>("SIDE")]; side >> foo.SideIn("SIDE");
return foo[Output<double>("OUT")]; return foo.Out("OUT")[0].Cast<double>();
}; };
Source<double> foo_out = foo_fn(base, side, graph); Source<double> foo_out = foo_fn(base, side, graph);
auto bar_fn = [](Source<double> in, Graph& graph) { auto bar_fn = [](Source<double> in, Graph& graph) {
auto& bar = graph.AddNode("Bar"); auto& bar = graph.AddNode("Bar");
in >> bar[Input<double>("IN")]; in >> bar.In("IN");
return bar[Output<double>("OUT")]; return bar.Out("OUT")[0].Cast<double>();
}; };
Source<double> bar_out = bar_fn(foo_out, graph); Source<double> bar_out = bar_fn(foo_out, graph);
bar_out.SetName("out"); bar_out.SetName("out");
bar_out >> graph[Output<double>("OUT")]; bar_out >> graph.Out("OUT");
CalculatorGraphConfig expected = CalculatorGraphConfig expected =
mediapipe::ParseTextProtoOrDie<CalculatorGraphConfig>(R"pb( mediapipe::ParseTextProtoOrDie<CalculatorGraphConfig>(R"pb(
@ -229,10 +229,10 @@ TEST(BuilderTest, TypedByPorts) {
auto& foo = graph.AddNode<test::Foo>(); auto& foo = graph.AddNode<test::Foo>();
auto& adder = graph.AddNode<FloatAdder>(); auto& adder = graph.AddNode<FloatAdder>();
graph[FooBar1::kIn].SetName("base") >> foo[Foo::kBase]; graph.In(FooBar1::kIn).SetName("base") >> foo[Foo::kBase];
foo[Foo::kOut] >> adder[FloatAdder::kIn][0]; foo[Foo::kOut] >> adder[FloatAdder::kIn][0];
foo[Foo::kOut] >> adder[FloatAdder::kIn][1]; foo[Foo::kOut] >> adder[FloatAdder::kIn][1];
adder[FloatAdder::kOut].SetName("out") >> graph[FooBar1::kOut]; adder[FloatAdder::kOut].SetName("out") >> graph.Out(FooBar1::kOut);
CalculatorGraphConfig expected = CalculatorGraphConfig expected =
mediapipe::ParseTextProtoOrDie<CalculatorGraphConfig>(R"pb( mediapipe::ParseTextProtoOrDie<CalculatorGraphConfig>(R"pb(
@ -380,8 +380,8 @@ class AnyAndSameTypeCalculator : public NodeIntf {
TEST(BuilderTest, AnyAndSameTypeHandledProperly) { TEST(BuilderTest, AnyAndSameTypeHandledProperly) {
Graph graph; Graph graph;
Source<AnyType> any_input = graph[Input<AnyType>{"GRAPH_ANY_INPUT"}]; Source<AnyType> any_input = graph.In("GRAPH_ANY_INPUT");
Source<int> int_input = graph[Input<int>{"GRAPH_INT_INPUT"}]; Source<int> int_input = graph.In("GRAPH_INT_INPUT").Cast<int>();
auto& node = graph.AddNode("AnyAndSameTypeCalculator"); auto& node = graph.AddNode("AnyAndSameTypeCalculator");
any_input >> node[AnyAndSameTypeCalculator::kAnyTypeInput]; any_input >> node[AnyAndSameTypeCalculator::kAnyTypeInput];