Project import generated by Copybara.

GitOrigin-RevId: f9a66589eaf652bb93f8e37ed9e4da26e59ef214
google-ai-edge · Oct 19, 2020 · c828392 · c828392
1 parent cccf624
commit c828392
Show file tree

Hide file tree

Showing 68 changed files with 892 additions and 489 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -54,7 +54,7 @@ RUN pip3 install tf_slim
 RUN ln -s /usr/bin/python3 /usr/bin/python
 
 # Install bazel
-ARG BAZEL_VERSION=3.0.0
+ARG BAZEL_VERSION=3.4.1
 RUN mkdir /bazel && \
     wget --no-check-certificate -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/b\
 azel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \

diff --git a/WORKSPACE b/WORKSPACE
@@ -10,7 +10,7 @@ http_archive(
     sha256 = "1dde365491125a3db70731e25658dfdd3bc5dbdfd11b840b3e987ecf043c7ca0",
 )
 load("@bazel_skylib//lib:versions.bzl", "versions")
-versions.check(minimum_bazel_version = "2.0.0")
+versions.check(minimum_bazel_version = "3.4.0")
 
 
 # ABSL cpp library lts_2020_02_25
@@ -324,8 +324,9 @@ maven_install(
         "androidx.lifecycle:lifecycle-common:2.2.0",
         "androidx.annotation:annotation:aar:1.1.0",
         "androidx.appcompat:appcompat:aar:1.1.0-rc01",
-        "androidx.camera:camera-core:aar:1.0.0-alpha06",
-        "androidx.camera:camera-camera2:aar:1.0.0-alpha06",
+        "androidx.camera:camera-core:1.0.0-beta10",
+        "androidx.camera:camera-camera2:1.0.0-beta10",
+        "androidx.camera:camera-lifecycle:1.0.0-beta10",
         "androidx.constraintlayout:constraintlayout:aar:1.1.3",
         "androidx.core:core:aar:1.1.0-rc03",
         "androidx.legacy:legacy-support-v4:aar:1.0.0",
@@ -337,6 +338,7 @@ maven_install(
         "com.google.flogger:flogger-system-backend:0.3.1",
         "com.google.flogger:flogger:0.3.1",
         "com.google.guava:guava:27.0.1-android",
+        "com.google.guava:listenablefuture:1.0",
         "junit:junit:4.12",
         "org.hamcrest:hamcrest-library:1.3",
     ],

diff --git a/docs/getting_started/hello_world_android.md b/docs/getting_started/hello_world_android.md
@@ -446,8 +446,8 @@ visible so that we can start seeing frames from the `previewFrameTexture`.
 However, before starting the camera, we need to decide which camera we want to
 use. [`CameraXPreviewHelper`] inherits from [`CameraHelper`] which provides two
 options, `FRONT` and `BACK`. We can pass in the decision from the `BUILD` file
-as metadata such that no code change is required to build a another version of
-the app using a different camera.
+as metadata such that no code change is required to build another version of the
+app using a different camera.
 
 Assuming we want to use `BACK` camera to perform edge detection on a live scene
 that we view from the camera, add the metadata into `AndroidManifest.xml`:

diff --git a/docs/getting_started/install.md b/docs/getting_started/install.md
@@ -42,16 +42,16 @@ apps, see these [instructions](./building_examples.md#ios).
 
     Follow the official
     [Bazel documentation](https://docs.bazel.build/versions/master/install-ubuntu.html)
-    to install Bazel 2.0 or higher.
+    to install Bazel 3.4 or higher.
 
     For Nvidia Jetson and Raspberry Pi devices with ARM Ubuntu, Bazel needs to
     be built from source.
 
     ```bash
-    # For Bazel 3.0.0
-    wget https://github.com/bazelbuild/bazel/releases/download/3.0.0/bazel-3.0.0-dist.zip
+    # For Bazel 3.4.0
+    wget https://github.com/bazelbuild/bazel/releases/download/3.4.0/bazel-3.4.0-dist.zip
     sudo apt-get install build-essential openjdk-8-jdk python zip unzip
-    unzip bazel-3.0.0-dist.zip
+    unzip bazel-3.4.0-dist.zip
     env EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" bash ./compile.sh
     sudo cp output/bazel /usr/local/bin/
     ```
@@ -221,7 +221,7 @@ build issues.
 
     Follow the official
     [Bazel documentation](https://docs.bazel.build/versions/master/install-redhat.html)
-    to install Bazel 2.0 or higher.
+    to install Bazel 3.4 or higher.
 
 3.  Install OpenCV.
 
@@ -356,7 +356,7 @@ build issues.
 
     Option 2. Follow the official
     [Bazel documentation](https://docs.bazel.build/versions/master/install-os-x.html#install-with-installer-mac-os-x)
-    to install Bazel 2.0 or higher.
+    to install Bazel 3.4 or higher.
 
 4.  Install OpenCV and FFmpeg.
 
@@ -427,7 +427,6 @@ build issues.
         linkstatic = 1,
         visibility = ["//visibility:public"],
     )
-
     ```
 
 5.  Make sure that Python 3 and the Python "six" library are installed.
@@ -506,7 +505,7 @@ next section.
 
     Follow the official
     [Bazel documentation](https://docs.bazel.build/versions/master/install-windows.html)
-    to install Bazel 2.0 or higher.
+    to install Bazel 3.4 or higher.
 
 6.  Set Bazel variables.
 
@@ -567,7 +566,6 @@ next section.
     # I20200514 20:43:12.279618  1200 hello_world.cc:56] Hello World!
     # I20200514 20:43:12.279618  1200 hello_world.cc:56] Hello World!
     # I20200514 20:43:12.280613  1200 hello_world.cc:56] Hello World!
-
     ```
 
 If you run into a build error, please read
@@ -607,14 +605,14 @@ cameras. Alternatively, you use a video file as input.
 
     ```bash
     username@DESKTOP-TMVLBJ1:~$ curl -sLO --retry 5 --retry-max-time 10 \
-    https://storage.googleapis.com/bazel/3.0.0/release/bazel-3.0.0-installer-linux-x86_64.sh && \
-    sudo mkdir -p /usr/local/bazel/3.0.0 && \
-    chmod 755 bazel-3.0.0-installer-linux-x86_64.sh && \
-    sudo ./bazel-3.0.0-installer-linux-x86_64.sh --prefix=/usr/local/bazel/3.0.0 && \
-    source /usr/local/bazel/3.0.0/lib/bazel/bin/bazel-complete.bash
-
-    username@DESKTOP-TMVLBJ1:~$ /usr/local/bazel/3.0.0/lib/bazel/bin/bazel version && \
-    alias bazel='/usr/local/bazel/3.0.0/lib/bazel/bin/bazel'
+    https://storage.googleapis.com/bazel/3.4.0/release/bazel-3.4.0-installer-linux-x86_64.sh && \
+    sudo mkdir -p /usr/local/bazel/3.4.0 && \
+    chmod 755 bazel-3.4.0-installer-linux-x86_64.sh && \
+    sudo ./bazel-3.4.0-installer-linux-x86_64.sh --prefix=/usr/local/bazel/3.4.0 && \
+    source /usr/local/bazel/3.4.0/lib/bazel/bin/bazel-complete.bash
+
+    username@DESKTOP-TMVLBJ1:~$ /usr/local/bazel/3.4.0/lib/bazel/bin/bazel version && \
+    alias bazel='/usr/local/bazel/3.4.0/lib/bazel/bin/bazel'
     ```
 
 6.  Checkout MediaPipe repository.

diff --git a/docs/tools/tracing_and_profiling.md b/docs/tools/tracing_and_profiling.md
@@ -26,9 +26,10 @@ To enable tracing and profiling of a mediapipe graph:
    1. The profiling library must be linked to the framework.
    2. Tracing and profiling must be enabled in the graph configuration.
 
-The profiling library is linked to the framework by default.  If needed,
-the profiling library can be omitted from the framework using the bazel
-command line option: `--define MEDIAPIPE_PROFILING=0`.
+The profiling library is linked to the framework by default for Desktop.
+If needed, it can be omitted from the framework using the bazel command line
+option: `--define MEDIAPIPE_PROFILING=0`.  For other platforms, you can use the
+bazel command line option `--define MEDIAPIPE_PROFILING=1` to link it.
 
 To enable tracing and profiling, the `CalculatorGraphConfig` (in
 [calculator.proto](https://github.com/google/mediapipe/tree/master/mediapipe/framework/calculator.proto))
@@ -38,6 +39,7 @@ is a simple setup that turns on tracing and keeps 100 seconds of timing events:
 ```
 profiler_config {
   trace_enabled: true
+  enable_profiler: true
   trace_log_interval_count: 200
 }
 ```
@@ -147,6 +149,7 @@ we record ten intervals of half a second each. This can be overridden by adding
     ```bash
     profiler_config {
       trace_enabled: true
+      enable_profiler: true
       trace_log_path: "/sdcard/profiles/"
     }
     ```

diff --git a/mediapipe/calculators/core/BUILD b/mediapipe/calculators/core/BUILD
@@ -225,6 +225,15 @@ cc_library(
     name = "concatenate_vector_calculator",
     srcs = ["concatenate_vector_calculator.cc"],
     hdrs = ["concatenate_vector_calculator.h"],
+    copts = select({
+        # Needed for "//mediapipe/framework/formats:tensor" compatibility on Apple
+        # platforms for Metal pulled in via the tensor.h header.
+        "//mediapipe:apple": [
+            "-x objective-c++",
+            "-fobjc-arc",  # enable reference-counting
+        ],
+        "//conditions:default": [],
+    }),
     visibility = ["//visibility:public"],
     deps = [
         ":concatenate_vector_calculator_cc_proto",

diff --git a/mediapipe/calculators/core/gate_calculator.cc b/mediapipe/calculators/core/gate_calculator.cc
@@ -59,30 +59,16 @@ std::string ToString(GateState state) {
 // ALLOW or DISALLOW can also be specified as an input side packet. The rules
 // for evaluation remain the same as above.
 //
-// If side_input_has_precedence isn't set in the calculator option,
 // ALLOW/DISALLOW inputs must be specified either using input stream or
-// via input side packet but not both. Otherwise, both input stream and input
-// side packet can be specified and the calculator will take one signal over the
-// other based on the value of the side_input_has_precedence field.
+// via input side packet but not both.
 //
 // Intended to be used with the default input stream handler, which synchronizes
 // all data input streams with the ALLOW/DISALLOW control input stream.
 //
-// Example configs:
+// Example config:
 // node {
 //   calculator: "GateCalculator"
-//   input_stream: "input_stream0"
-//   input_stream: "input_stream1"
-//   input_stream: "input_streamN"
 //   input_side_packet: "ALLOW:allow" or "DISALLOW:disallow"
-//   output_stream: "STATE_CHANGE:state_change"
-//   output_stream: "output_stream0"
-//   output_stream: "output_stream1"
-//   output_stream: "output_streamN"
-// }
-//
-// node {
-//   calculator: "GateCalculator"
 //   input_stream: "input_stream0"
 //   input_stream: "input_stream1"
 //   input_stream: "input_streamN"
@@ -92,25 +78,6 @@ std::string ToString(GateState state) {
 //   output_stream: "output_stream1"
 //   output_stream: "output_streamN"
 // }
-//
-// With side_input_has_precedence:
-// node {
-//   calculator: "GateCalculator"
-//   input_stream: "input_stream0"
-//   input_stream: "input_stream1"
-//   input_stream: "input_streamN"
-//   input_stream: "ALLOW:allow_stream" or "DISALLOW:disallow_stream"
-//   input_side_packet: "ALLOW:allow_packet" or "DISALLOW:disallow_packet"
-//   output_stream: "STATE_CHANGE:state_change"
-//   output_stream: "output_stream0"
-//   output_stream: "output_stream1"
-//   output_stream: "output_streamN"
-//   options: {
-//     [mediapipe.GateCalculatorOptions.ext] {
-//       side_input_has_precedence: true or false
-//     }
-//   }
-// }
 class GateCalculator : public CalculatorBase {
  public:
   GateCalculator() {}
@@ -121,15 +88,9 @@ class GateCalculator : public CalculatorBase {
                                  cc->InputSidePackets().HasTag("DISALLOW");
     bool input_via_stream =
         cc->Inputs().HasTag("ALLOW") || cc->Inputs().HasTag("DISALLOW");
-    const auto& options = cc->Options<::mediapipe::GateCalculatorOptions>();
-    if (options.has_side_input_has_precedence()) {
-      RET_CHECK(input_via_side_packet && input_via_stream);
-    } else {
-      // Only one of input_side_packet or input_stream may specify
-      // ALLOW/DISALLOW input when side_input_has_precedence is not set
-      // in the options.
-      RET_CHECK(input_via_side_packet ^ input_via_stream);
-    }
+    // Only one of input_side_packet or input_stream may specify ALLOW/DISALLOW
+    // input.
+    RET_CHECK(input_via_side_packet ^ input_via_stream);
 
     if (input_via_side_packet) {
       RET_CHECK(cc->InputSidePackets().HasTag("ALLOW") ^
@@ -140,8 +101,7 @@ class GateCalculator : public CalculatorBase {
       } else {
         cc->InputSidePackets().Tag("DISALLOW").Set<bool>();
       }
-    }
-    if (input_via_stream) {
+    } else {
       RET_CHECK(cc->Inputs().HasTag("ALLOW") ^ cc->Inputs().HasTag("DISALLOW"));
 
       if (cc->Inputs().HasTag("ALLOW")) {
@@ -174,13 +134,19 @@ class GateCalculator : public CalculatorBase {
   }
 
   ::mediapipe::Status Open(CalculatorContext* cc) final {
-    bool use_side_packet_for_allow_disallow = false;
+    const auto& options = cc->Options<::mediapipe::GateCalculatorOptions>();
+    use_calculator_option_for_allow_disallow_ =
+        options.has_allowance_override();
+    if (use_calculator_option_for_allow_disallow_) {
+      allow_by_calculator_option_ = options.allowance_override();
+    }
+
     if (cc->InputSidePackets().HasTag("ALLOW")) {
-      use_side_packet_for_allow_disallow = true;
+      use_side_packet_for_allow_disallow_ = true;
       allow_by_side_packet_decision_ =
           cc->InputSidePackets().Tag("ALLOW").Get<bool>();
     } else if (cc->InputSidePackets().HasTag("DISALLOW")) {
-      use_side_packet_for_allow_disallow = true;
+      use_side_packet_for_allow_disallow_ = true;
       allow_by_side_packet_decision_ =
           !cc->InputSidePackets().Tag("DISALLOW").Get<bool>();
     }
@@ -190,33 +156,28 @@ class GateCalculator : public CalculatorBase {
     last_gate_state_ = GATE_UNINITIALIZED;
     RET_CHECK_OK(CopyInputHeadersToOutputs(cc->Inputs(), &cc->Outputs()));
 
-    const auto& options = cc->Options<::mediapipe::GateCalculatorOptions>();
     empty_packets_as_allow_ = options.empty_packets_as_allow();
-    if (!options.has_side_input_has_precedence()) {
-      side_input_has_precedence_ = use_side_packet_for_allow_disallow;
-    } else {
-      side_input_has_precedence_ = options.side_input_has_precedence();
-    }
-
     return ::mediapipe::OkStatus();
   }
 
   ::mediapipe::Status Process(CalculatorContext* cc) final {
-    bool allow_by_stream = empty_packets_as_allow_;
-    if (cc->Inputs().HasTag("ALLOW") && !cc->Inputs().Tag("ALLOW").IsEmpty()) {
-      allow_by_stream = cc->Inputs().Tag("ALLOW").Get<bool>();
-    }
-    if (cc->Inputs().HasTag("DISALLOW") &&
-        !cc->Inputs().Tag("DISALLOW").IsEmpty()) {
-      allow_by_stream = !cc->Inputs().Tag("DISALLOW").Get<bool>();
-    }
-    const bool allow_by_side_packet =
-        allow_by_side_packet_decision_ || empty_packets_as_allow_;
-    bool allow = false;
-    if (side_input_has_precedence_) {
-      allow = allow_by_side_packet;
-    } else {
-      allow = allow_by_stream;
+    // The allow/disallow signal in the calculator option has the highest
+    // priority. If it's not set, use the stream/side packet signal.
+    bool allow = allow_by_calculator_option_;
+    if (!use_calculator_option_for_allow_disallow_) {
+      allow = empty_packets_as_allow_;
+      if (use_side_packet_for_allow_disallow_) {
+        allow = allow_by_side_packet_decision_;
+      } else {
+        if (cc->Inputs().HasTag("ALLOW") &&
+            !cc->Inputs().Tag("ALLOW").IsEmpty()) {
+          allow = cc->Inputs().Tag("ALLOW").Get<bool>();
+        }
+        if (cc->Inputs().HasTag("DISALLOW") &&
+            !cc->Inputs().Tag("DISALLOW").IsEmpty()) {
+          allow = !cc->Inputs().Tag("DISALLOW").Get<bool>();
+        }
+      }
     }
     const GateState new_gate_state = allow ? GATE_ALLOW : GATE_DISALLOW;
 
@@ -251,9 +212,11 @@ class GateCalculator : public CalculatorBase {
  private:
   GateState last_gate_state_ = GATE_UNINITIALIZED;
   int num_data_streams_;
+  bool empty_packets_as_allow_ = false;
+  bool use_side_packet_for_allow_disallow_ = false;
   bool allow_by_side_packet_decision_ = false;
-  bool empty_packets_as_allow_;
-  bool side_input_has_precedence_;
+  bool use_calculator_option_for_allow_disallow_ = false;
+  bool allow_by_calculator_option_ = false;
 };
 REGISTER_CALCULATOR(GateCalculator);
 

diff --git a/mediapipe/calculators/core/gate_calculator.proto b/mediapipe/calculators/core/gate_calculator.proto
@@ -28,11 +28,8 @@ message GateCalculatorOptions {
   // this option to true inverts that, allowing the data packets to go through.
   optional bool empty_packets_as_allow = 1;
 
-  // Input side packet and input stream are allowed to coexist only if this
-  // field is set. When it's set to true, the input side packet has higher
-  // precedence and the input stream signal will be ignored. When it's set to
-  // false, the input stream signal always overrides the input side packet
-  // signal.
-  //
-  optional bool side_input_has_precedence = 2;
+  // If set, the calculator will always allow (if set to yes) or disallow (if
+  // set to no) the input streams to pass through, and ignore the ALLOW or
+  // DISALLOW input stream or side input packets.
+  optional bool allowance_override = 2;
 }