Project import generated by Copybara.

GitOrigin-RevId: 6a704ded0bf489614797082e7e7cda1068477ef5

mediapipe/calculators/tensor/inference_calculator.cc

@@ -41,7 +41,6 @@ class InferenceCalculatorSelectorImpl
         (options.has_delegate() && options.delegate().has_gpu());
     if (should_use_gpu) {
       impls.emplace_back("Metal");
-      impls.emplace_back("MlDriftWebGl");
       impls.emplace_back("Gl");
     }
     impls.emplace_back("Cpu");

mediapipe/calculators/tensor/inference_calculator.h

@@ -118,10 +118,6 @@ struct InferenceCalculatorGl : public InferenceCalculator {
   static constexpr char kCalculatorName[] = "InferenceCalculatorGl";
 };
 
-struct InferenceCalculatorMlDriftWebGl : public InferenceCalculator {
-  static constexpr char kCalculatorName[] = "InferenceCalculatorMlDriftWebGl";
-};
-
 struct InferenceCalculatorMetal : public InferenceCalculator {
   static constexpr char kCalculatorName[] = "InferenceCalculatorMetal";
 };

mediapipe/calculators/tensor/inference_calculator_face_detection_test.cc

@@ -57,11 +57,7 @@ const std::vector<Param>& GetParams() {
     // Metal is not available on the iOS simulator.
     p.push_back({"Metal", "Metal"});
     p.back().delegate.mutable_gpu();
-#endif  // TARGET_IPHONE_SIMULATOR
-#if __EMSCRIPTEN__
-    p.push_back({"MlDriftWebGl", "MlDriftWebGl"});
-    p.back().delegate.mutable_gpu();
-#endif                // __EMSCRIPTEN__
+#endif                // TARGET_IPHONE_SIMULATOR
 #if __ANDROID__ && 0  // Disabled for now since emulator can't go GLESv3
     p.push_back({"Gl", "Gl"});
     p.back().delegate.mutable_gpu();
@@ -78,18 +74,6 @@ const std::vector<Param>& GetParams() {
 
 class InferenceCalculatorTest : public testing::TestWithParam<Param> {
  protected:
-#if __EMSCRIPTEN__
-  // TODO: fix Tensor locking.
-  // The MlDrift backend currently fails in debug mode without this,
-  // because of Tensor locking issues. I am adding this temporarily since
-  // the calculator is already being used and it's better to have test
-  // coverage for it. Also, the issue doesn't apply to our Emscripten
-  // build in practice since it's single-threaded.
-  void SetUp(void) override {
-    absl::SetMutexDeadlockDetectionMode(absl::OnDeadlockCycle::kIgnore);
-  }
-#endif  // __EMSCRIPTEN__
-
   void SetDelegateForParam(mediapipe::CalculatorGraphConfig_Node* node) {
     *node->mutable_options()
          ->MutableExtension(mediapipe::InferenceCalculatorOptions::ext)

mediapipe/calculators/tensor/tensor_converter_calculator_test.cc

@@ -84,7 +84,7 @@ TEST_F(TensorConverterCalculatorTest, RandomMatrixColMajor) {
 
     // Run the calculator and verify that one output is generated.
     CalculatorGraphConfig graph_config =
-        mediapipe::ParseTextProtoOrDie<CalculatorGraphConfig>(R"(
+        mediapipe::ParseTextProtoOrDie<CalculatorGraphConfig>(R"pb(
           input_stream: "matrix"
           node {
             calculator: "TensorConverterCalculator"
@@ -96,7 +96,7 @@ TEST_F(TensorConverterCalculatorTest, RandomMatrixColMajor) {
               }
             }
           }
-        )");
+        )pb");
     std::vector<Packet> output_packets;
     tool::AddVectorSink("tensor", &graph_config, &output_packets);
 
@@ -146,7 +146,7 @@ TEST_F(TensorConverterCalculatorTest, RandomMatrixRowMajor) {
 
     // Run the calculator and verify that one output is generated.
     CalculatorGraphConfig graph_config =
-        mediapipe::ParseTextProtoOrDie<CalculatorGraphConfig>(R"(
+        mediapipe::ParseTextProtoOrDie<CalculatorGraphConfig>(R"pb(
           input_stream: "matrix"
           node {
             calculator: "TensorConverterCalculator"
@@ -158,7 +158,7 @@ TEST_F(TensorConverterCalculatorTest, RandomMatrixRowMajor) {
               }
             }
           }
-        )");
+        )pb");
     std::vector<Packet> output_packets;
     tool::AddVectorSink("tensor", &graph_config, &output_packets);
 
@@ -205,7 +205,7 @@ TEST_F(TensorConverterCalculatorTest, CustomDivAndSub) {
   CalculatorGraph graph;
   // Run the calculator and verify that one output is generated.
   CalculatorGraphConfig graph_config =
-      mediapipe::ParseTextProtoOrDie<CalculatorGraphConfig>(R"(
+      mediapipe::ParseTextProtoOrDie<CalculatorGraphConfig>(R"pb(
         input_stream: "input_image"
         node {
           calculator: "TensorConverterCalculator"
@@ -220,7 +220,7 @@ TEST_F(TensorConverterCalculatorTest, CustomDivAndSub) {
             }
           }
         }
-      )");
+      )pb");
   std::vector<Packet> output_packets;
   tool::AddVectorSink("tensor", &graph_config, &output_packets);
 

mediapipe/calculators/tensor/tensors_to_classification_calculator_test.cc

@@ -56,14 +56,14 @@ class TensorsToClassificationCalculatorTest : public ::testing::Test {
 };
 
 TEST_F(TensorsToClassificationCalculatorTest, CorrectOutput) {
-  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"(
+  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"pb(
     calculator: "TensorsToClassificationCalculator"
     input_stream: "TENSORS:tensors"
     output_stream: "CLASSIFICATIONS:classifications"
     options {
       [mediapipe.TensorsToClassificationCalculatorOptions.ext] {}
     }
-  )"));
+  )pb"));
 
   BuildGraph(&runner, {0, 0.5, 1});
   MP_ASSERT_OK(runner.Run());
@@ -85,7 +85,7 @@ TEST_F(TensorsToClassificationCalculatorTest, CorrectOutput) {
 }
 
 TEST_F(TensorsToClassificationCalculatorTest, CorrectOutputWithLabelMapPath) {
-  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"(
+  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"pb(
     calculator: "TensorsToClassificationCalculator"
     input_stream: "TENSORS:tensors"
     output_stream: "CLASSIFICATIONS:classifications"
@@ -94,7 +94,7 @@ TEST_F(TensorsToClassificationCalculatorTest, CorrectOutputWithLabelMapPath) {
         label_map_path: "mediapipe/calculators/tensor/testdata/labelmap.txt"
       }
     }
-  )"));
+  )pb"));
 
   BuildGraph(&runner, {0, 0.5, 1});
   MP_ASSERT_OK(runner.Run());
@@ -117,7 +117,7 @@ TEST_F(TensorsToClassificationCalculatorTest, CorrectOutputWithLabelMapPath) {
 
 TEST_F(TensorsToClassificationCalculatorTest,
        CorrectOutputWithLabelMinScoreThreshold) {
-  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"(
+  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"pb(
     calculator: "TensorsToClassificationCalculator"
     input_stream: "TENSORS:tensors"
     output_stream: "CLASSIFICATIONS:classifications"
@@ -126,7 +126,7 @@ TEST_F(TensorsToClassificationCalculatorTest,
         min_score_threshold: 0.6
       }
     }
-  )"));
+  )pb"));
 
   BuildGraph(&runner, {0, 0.5, 1});
   MP_ASSERT_OK(runner.Run());
@@ -144,14 +144,14 @@ TEST_F(TensorsToClassificationCalculatorTest,
 }
 
 TEST_F(TensorsToClassificationCalculatorTest, CorrectOutputWithTopK) {
-  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"(
+  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"pb(
     calculator: "TensorsToClassificationCalculator"
     input_stream: "TENSORS:tensors"
     output_stream: "CLASSIFICATIONS:classifications"
     options {
       [mediapipe.TensorsToClassificationCalculatorOptions.ext] { top_k: 2 }
     }
-  )"));
+  )pb"));
 
   BuildGraph(&runner, {0, 0.5, 1});
   MP_ASSERT_OK(runner.Run());

mediapipe/calculators/tensor/tensors_to_floats_calculator_test.cc

@@ -57,11 +57,11 @@ class TensorsToFloatsCalculatorTest : public ::testing::Test {
 };
 
 TEST_F(TensorsToFloatsCalculatorTest, SingleValue) {
-  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"(
+  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"pb(
     calculator: "TensorsToFloatsCalculator"
     input_stream: "TENSORS:tensors"
     output_stream: "FLOAT:float"
-  )"));
+  )pb"));
 
   const float single_value = 0.5;
   BuildGraph(&runner, {single_value});
@@ -76,11 +76,11 @@ TEST_F(TensorsToFloatsCalculatorTest, SingleValue) {
 }
 
 TEST_F(TensorsToFloatsCalculatorTest, SingleValueAsVector) {
-  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"(
+  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"pb(
     calculator: "TensorsToFloatsCalculator"
     input_stream: "TENSORS:tensors"
     output_stream: "FLOATS:floats"
-  )"));
+  )pb"));
 
   const float single_value = 0.5;
   BuildGraph(&runner, {single_value});
@@ -95,11 +95,11 @@ TEST_F(TensorsToFloatsCalculatorTest, SingleValueAsVector) {
 }
 
 TEST_F(TensorsToFloatsCalculatorTest, FloatVector) {
-  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"(
+  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"pb(
     calculator: "TensorsToFloatsCalculator"
     input_stream: "TENSORS:tensors"
     output_stream: "FLOATS:floats"
-  )"));
+  )pb"));
 
   const std::vector<float> input_values = {0.f, 0.5f, 1.0f};
   BuildGraph(&runner, input_values);
@@ -116,14 +116,14 @@ TEST_F(TensorsToFloatsCalculatorTest, FloatVector) {
 }
 
 TEST_F(TensorsToFloatsCalculatorTest, FloatVectorWithSigmoid) {
-  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"(
+  mediapipe::CalculatorRunner runner(ParseTextProtoOrDie<Node>(R"pb(
     calculator: "TensorsToFloatsCalculator"
     input_stream: "TENSORS:tensors"
     output_stream: "FLOATS:floats"
     options {
       [mediapipe.TensorsToFloatsCalculatorOptions.ext] { activation: SIGMOID }
     }
-  )"));
+  )pb"));
 
   const std::vector<float> input_values = {-1.f, 0.f, 1.0f};
   const std::vector<float> expected_output_with_sigmoid = {0.269f, 0.5f,