Project import generated by Copybara.

GitOrigin-RevId: ea8d45731f5a052f79745e35bfd8240d6ac568d2

README.md

@@ -102,6 +102,8 @@ run code search using
 
 ## Publications
 
+*   [MediaPipe Holistic - Simultaneous Face, Hand and Pose Prediction, on Device](https://ai.googleblog.com/2020/12/mediapipe-holistic-simultaneous-face.html)
+    in Google AI Blog
 *   [Background Features in Google Meet, Powered by Web ML](https://ai.googleblog.com/2020/10/background-features-in-google-meet.html)
     in Google AI Blog
 *   [MediaPipe 3D Face Transform](https://developers.googleblog.com/2020/09/mediapipe-3d-face-transform.html)

WORKSPACE

@@ -364,9 +364,9 @@ http_archive(
 )
 
 #Tensorflow repo should always go after the other external dependencies.
-# 2020-12-07
-_TENSORFLOW_GIT_COMMIT = "f556709f4df005ad57fd24d5eaa0d9380128d3ba"
-_TENSORFLOW_SHA256= "9e157d4723921b48a974f645f70d07c8fd3c363569a0ac6ee85fec114d6459ea"
+# 2020-12-09
+_TENSORFLOW_GIT_COMMIT = "0eadbb13cef1226b1bae17c941f7870734d97f8a"
+_TENSORFLOW_SHA256= "4ae06daa5b09c62f31b7bc1f781fd59053f286dd64355830d8c2ac601b795ef0"
 http_archive(
     name = "org_tensorflow",
     urls = [

build_desktop_examples.sh

@@ -94,7 +94,8 @@ for app in ${apps}; do
       else
         graph_name="${target_name}/${target_name}"
       fi
-      if [[ ${target_name} == "iris_tracking" ||
+      if [[ ${target_name} == "holistic_tracking" ||
+            ${target_name} == "iris_tracking" ||
             ${target_name} == "pose_tracking" ||
             ${target_name} == "upper_body_pose_tracking" ]]; then
         graph_suffix="cpu"

docs/getting_started/install.md

@@ -31,16 +31,16 @@ install --user six`.
     [Bazel documentation](https://docs.bazel.build/versions/master/install-ubuntu.html)
     to install Bazel 3.4 or higher.
 
-    For Nvidia Jetson and Raspberry Pi devices with ARM Ubuntu only, Bazel needs
+    For Nvidia Jetson and Raspberry Pi devices with aarch64 Linux, Bazel needs
     to be built from source:
 
     ```bash
-    # For Bazel 3.4.0
-    mkdir $HOME/bazel-3.4.0
-    cd $HOME/bazel-3.4.0
-    wget https://github.com/bazelbuild/bazel/releases/download/3.4.0/bazel-3.4.0-dist.zip
+    # For Bazel 3.4.1
+    mkdir $HOME/bazel-3.4.1
+    cd $HOME/bazel-3.4.1
+    wget https://github.com/bazelbuild/bazel/releases/download/3.4.1/bazel-3.4.1-dist.zip
     sudo apt-get install build-essential openjdk-8-jdk python zip unzip
-    unzip bazel-3.4.0-dist.zip
+    unzip bazel-3.4.1-dist.zip
     env EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" bash ./compile.sh
     sudo cp output/bazel /usr/local/bin/
     ```
@@ -338,14 +338,7 @@ build issues.
 
 2.  Install Bazel.
 
-    Option 1. Use package manager tool to install Bazel
-
-    ```bash
-    $ brew install bazel
-    # Run 'bazel version' to check version of bazel
-    ```
-
-    Option 2. Follow the official
+    Follow the official
     [Bazel documentation](https://docs.bazel.build/versions/master/install-os-x.html#install-with-installer-mac-os-x)
     to install Bazel 3.4 or higher.
 
@@ -604,14 +597,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.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'
+    https://storage.googleapis.com/bazel/3.4.1/release/bazel-3.4.1-installer-linux-x86_64.sh && \
+    sudo mkdir -p /usr/local/bazel/3.4.1 && \
+    chmod 755 bazel-3.4.1-installer-linux-x86_64.sh && \
+    sudo ./bazel-3.4.1-installer-linux-x86_64.sh --prefix=/usr/local/bazel/3.4.1 && \
+    source /usr/local/bazel/3.4.1/lib/bazel/bin/bazel-complete.bash
+
+    username@DESKTOP-TMVLBJ1:~$ /usr/local/bazel/3.4.1/lib/bazel/bin/bazel version && \
+    alias bazel='/usr/local/bazel/3.4.1/lib/bazel/bin/bazel'
     ```
 
 6.  Checkout MediaPipe repository.

docs/getting_started/python.md

@@ -70,6 +70,11 @@ Python package from source. Otherwise, we strongly encourage our users to simply
 run `pip install mediapipe` to use the ready-to-use solutions, more convenient
 and much faster.
 
+MediaPipe PyPI currently doesn't provide aarch64 Python wheel
+files. For building and using MediaPipe Python on aarch64 Linux systems such as
+Nvidia Jetson and Raspberry Pi, please read
+[here](https://github.com/jiuqiant/mediapipe-python-aarch64).
+
 1.  Make sure that Bazel and OpenCV are correctly installed and configured for
     MediaPipe. Please see [Installation](./install.md) for how to setup Bazel
     and OpenCV for MediaPipe on Linux and macOS.
@@ -82,12 +87,18 @@ and much faster.
     $ sudo apt install python3-dev
     $ sudo apt install python3-venv
     $ sudo apt install -y protobuf-compiler
+
+    # If you need to build opencv from source.
+    $ sudo apt install cmake
     ```
 
     macOS:
 
     ```bash
     $ brew install protobuf
+
+    # If you need to build opencv from source.
+    $ brew install cmake
     ```
 
     Windows:
@@ -118,3 +129,10 @@ and much faster.
     (mp_env)mediapipe$ python3 setup.py gen_protos
     (mp_env)mediapipe$ python3 setup.py install --link-opencv
     ```
+
+    or
+
+    ```bash
+    (mp_env)mediapipe$ python3 setup.py gen_protos
+    (mp_env)mediapipe$ python3 setup.py bdist_wheel
+    ```

docs/index.md

@@ -102,6 +102,8 @@ run code search using
 
 ## Publications
 
+*   [MediaPipe Holistic - Simultaneous Face, Hand and Pose Prediction, on Device](https://ai.googleblog.com/2020/12/mediapipe-holistic-simultaneous-face.html)
+    in Google AI Blog
 *   [Background Features in Google Meet, Powered by Web ML](https://ai.googleblog.com/2020/10/background-features-in-google-meet.html)
     in Google AI Blog
 *   [MediaPipe 3D Face Transform](https://developers.googleblog.com/2020/09/mediapipe-3d-face-transform.html)

docs/solutions/holistic.md

@@ -405,7 +405,7 @@ on how to build MediaPipe examples.
 ## Resources
 
 *   Google AI Blog:
-    [MediaPipe Holistic - Simultaneous Face, Hand and Pose Prediction on Device](https://ai.googleblog.com/2020/08/on-device-real-time-body-pose-tracking.html)
+    [MediaPipe Holistic - Simultaneous Face, Hand and Pose Prediction, on Device](https://ai.googleblog.com/2020/12/mediapipe-holistic-simultaneous-face.html)
 *   [Models and model cards](./models.md#holistic)
 
 [Colab]:https://mediapipe.page.link/holistic_py_colab

mediapipe/MediaPipe.tulsiproj/Configs/MediaPipe.tulsigen

@@ -2,33 +2,33 @@
   "additionalFilePaths" : [
     "/BUILD",
     "mediapipe/BUILD",
-    "mediapipe/objc/BUILD",
-    "mediapipe/framework/BUILD",
-    "mediapipe/gpu/BUILD",
-    "mediapipe/objc/testing/app/BUILD",
     "mediapipe/examples/ios/common/BUILD",
-    "mediapipe/examples/ios/helloworld/BUILD",
     "mediapipe/examples/ios/facedetectioncpu/BUILD",
     "mediapipe/examples/ios/facedetectiongpu/BUILD",
     "mediapipe/examples/ios/faceeffect/BUILD",
     "mediapipe/examples/ios/facemeshgpu/BUILD",
     "mediapipe/examples/ios/handdetectiongpu/BUILD",
     "mediapipe/examples/ios/handtrackinggpu/BUILD",
+    "mediapipe/examples/ios/helloworld/BUILD",
     "mediapipe/examples/ios/holistictrackinggpu/BUILD",
     "mediapipe/examples/ios/iristrackinggpu/BUILD",
     "mediapipe/examples/ios/objectdetectioncpu/BUILD",
     "mediapipe/examples/ios/objectdetectiongpu/BUILD",
     "mediapipe/examples/ios/posetrackinggpu/BUILD",
-    "mediapipe/examples/ios/upperbodyposetrackinggpu/BUILD"
+    "mediapipe/examples/ios/upperbodyposetrackinggpu/BUILD",
+    "mediapipe/framework/BUILD",
+    "mediapipe/gpu/BUILD",
+    "mediapipe/objc/BUILD",
+    "mediapipe/objc/testing/app/BUILD"
   ],
   "buildTargets" : [
-    "//mediapipe/examples/ios/helloworld:HelloWorldApp",
     "//mediapipe/examples/ios/facedetectioncpu:FaceDetectionCpuApp",
     "//mediapipe/examples/ios/facedetectiongpu:FaceDetectionGpuApp",
     "//mediapipe/examples/ios/faceeffect:FaceEffectApp",
     "//mediapipe/examples/ios/facemeshgpu:FaceMeshGpuApp",
     "//mediapipe/examples/ios/handdetectiongpu:HandDetectionGpuApp",
     "//mediapipe/examples/ios/handtrackinggpu:HandTrackingGpuApp",
+    "//mediapipe/examples/ios/helloworld:HelloWorldApp",
     "//mediapipe/examples/ios/holistictrackinggpu:HolisticTrackingGpuApp",
     "//mediapipe/examples/ios/iristrackinggpu:IrisTrackingGpuApp",
     "//mediapipe/examples/ios/objectdetectioncpu:ObjectDetectionCpuApp",
@@ -91,13 +91,13 @@
     "mediapipe/examples/ios",
     "mediapipe/examples/ios/common",
     "mediapipe/examples/ios/common/Base.lproj",
-    "mediapipe/examples/ios/helloworld",
     "mediapipe/examples/ios/facedetectioncpu",
     "mediapipe/examples/ios/facedetectiongpu",
     "mediapipe/examples/ios/faceeffect",
     "mediapipe/examples/ios/faceeffect/Base.lproj",
     "mediapipe/examples/ios/handdetectiongpu",
     "mediapipe/examples/ios/handtrackinggpu",
+    "mediapipe/examples/ios/helloworld",
     "mediapipe/examples/ios/holistictrackinggpu",
     "mediapipe/examples/ios/iristrackinggpu",
     "mediapipe/examples/ios/objectdetectioncpu",

mediapipe/MediaPipe.tulsiproj/project.tulsiconf

@@ -9,7 +9,6 @@
   "packages" : [
     "",
     "mediapipe",
-    "mediapipe/objc",
     "mediapipe/examples/ios",
     "mediapipe/examples/ios/facedetectioncpu",
     "mediapipe/examples/ios/facedetectiongpu",
@@ -22,7 +21,8 @@
     "mediapipe/examples/ios/objectdetectioncpu",
     "mediapipe/examples/ios/objectdetectiongpu",
     "mediapipe/examples/ios/posetrackinggpu",
-    "mediapipe/examples/ios/upperbodyposetrackinggpu"
+    "mediapipe/examples/ios/upperbodyposetrackinggpu",
+    "mediapipe/objc"
   ],
   "projectName" : "Mediapipe",
   "workspaceRoot" : "../.."

mediapipe/calculators/core/BUILD

@@ -146,6 +146,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:calculator_framework",
+        "//mediapipe/framework/api2:node",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:status",
     ],
@@ -286,6 +287,7 @@ cc_library(
     deps = [
         ":concatenate_vector_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
+        "//mediapipe/framework/api2:node",
         "//mediapipe/framework/formats:landmark_cc_proto",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
@@ -393,6 +395,7 @@ cc_library(
     ],
     deps = [
         "//mediapipe/framework:calculator_framework",
+        "//mediapipe/framework/api2:node",
         "//mediapipe/framework/port:status",
     ],
     alwayslink = 1,
@@ -406,7 +409,7 @@ cc_library(
     ],
     deps = [
         "//mediapipe/framework:calculator_framework",
-        "//mediapipe/framework:timestamp",
+        "//mediapipe/framework/api2:node",
         "//mediapipe/framework/formats:matrix",
         "//mediapipe/framework/port:status",
         "@eigen_archive//:eigen",
@@ -422,7 +425,7 @@ cc_library(
     ],
     deps = [
         "//mediapipe/framework:calculator_framework",
-        "//mediapipe/framework:timestamp",
+        "//mediapipe/framework/api2:node",
         "//mediapipe/framework/formats:matrix",
         "//mediapipe/framework/port:status",
         "@eigen_archive//:eigen",
@@ -438,6 +441,7 @@ cc_library(
     ],
     deps = [
         "//mediapipe/framework:calculator_framework",
+        "//mediapipe/framework/api2:node",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/stream_handler:mux_input_stream_handler",
     ],
@@ -606,6 +610,7 @@ cc_library(
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:packet",
         "//mediapipe/framework:timestamp",
+        "//mediapipe/framework/api2:node",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/stream_handler:immediate_input_stream_handler",
@@ -958,6 +963,7 @@ cc_library(
     deps = [
         ":sequence_shift_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
+        "//mediapipe/framework/api2:node",
         "//mediapipe/framework/port:status",
     ],
     alwayslink = 1,
@@ -1007,6 +1013,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:calculator_framework",
+        "//mediapipe/framework/api2:node",
         "//mediapipe/framework/formats:matrix",
         "//mediapipe/framework/port:integral_types",
         "//mediapipe/framework/port:logging",
@@ -1042,6 +1049,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:calculator_framework",
+        "//mediapipe/framework/api2:node",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
     ],

mediapipe/calculators/core/add_header_calculator.cc

@@ -12,11 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "mediapipe/framework/api2/node.h"
 #include "mediapipe/framework/calculator_framework.h"
 #include "mediapipe/framework/port/canonical_errors.h"
 #include "mediapipe/framework/port/logging.h"
 
 namespace mediapipe {
+namespace api2 {
 
 // Attach the header from a stream or side input to another stream.
 //
@@ -42,49 +44,40 @@ namespace mediapipe {
 //   output_stream: "audio_with_header"
 // }
 //
-class AddHeaderCalculator : public CalculatorBase {
+class AddHeaderCalculator : public Node {
  public:
-  static mediapipe::Status GetContract(CalculatorContract* cc) {
-    bool has_side_input = false;
-    bool has_header_stream = false;
-    if (cc->InputSidePackets().HasTag("HEADER")) {
-      cc->InputSidePackets().Tag("HEADER").SetAny();
-      has_side_input = true;
-    }
-    if (cc->Inputs().HasTag("HEADER")) {
-      cc->Inputs().Tag("HEADER").SetNone();
-      has_header_stream = true;
-    }
-    if (has_side_input == has_header_stream) {
+  static constexpr Input<NoneType>::Optional kHeader{"HEADER"};
+  static constexpr SideInput<AnyType>::Optional kHeaderSide{"HEADER"};
+  static constexpr Input<AnyType> kData{"DATA"};
+  static constexpr Output<SameType<kData>> kOut{""};
+
+  MEDIAPIPE_NODE_CONTRACT(kHeader, kHeaderSide, kData, kOut);
+
+  static mediapipe::Status UpdateContract(CalculatorContract* cc) {
+    if (kHeader(cc).IsConnected() == kHeaderSide(cc).IsConnected()) {
       return mediapipe::InvalidArgumentError(
           "Header must be provided via exactly one of side input and input "
           "stream");
     }
-    cc->Inputs().Tag("DATA").SetAny();
-    cc->Outputs().Index(0).SetSameAs(&cc->Inputs().Tag("DATA"));
     return mediapipe::OkStatus();
   }
 
   mediapipe::Status Open(CalculatorContext* cc) override {
-    Packet header;
-    if (cc->InputSidePackets().HasTag("HEADER")) {
-      header = cc->InputSidePackets().Tag("HEADER");
-    }
-    if (cc->Inputs().HasTag("HEADER")) {
-      header = cc->Inputs().Tag("HEADER").Header();
-    }
+    const PacketBase& header =
+        kHeader(cc).IsConnected() ? kHeader(cc).Header() : kHeaderSide(cc);
     if (!header.IsEmpty()) {
-      cc->Outputs().Index(0).SetHeader(header);
+      kOut(cc).SetHeader(header);
     }
-    cc->SetOffset(TimestampDiff(0));
     return mediapipe::OkStatus();
   }
 
   mediapipe::Status Process(CalculatorContext* cc) override {
-    cc->Outputs().Index(0).AddPacket(cc->Inputs().Tag("DATA").Value());
+    kOut(cc).Send(kData(cc).packet());
     return mediapipe::OkStatus();
   }
 };
 
-REGISTER_CALCULATOR(AddHeaderCalculator);
+MEDIAPIPE_REGISTER_NODE(AddHeaderCalculator);
+
+}  // namespace api2
 }  // namespace mediapipe