Project import generated by Copybara.

GitOrigin-RevId: 5aca6b3f07b67e09988a901f50f595ca5f566e67
This commit is contained in:
MediaPipe Team
2019-11-15 13:10:50 -08:00
committed by jqtang
parent d030c13931
commit 9437483827
116 changed files with 6284 additions and 391 deletions
+2
View File
@@ -14,6 +14,8 @@ cc_library(
srcs = glob(
[
"lib/x86_64-linux-gnu/libopencv_core.so",
"lib/x86_64-linux-gnu/libopencv_calib3d.so",
"lib/x86_64-linux-gnu/libopencv_features2d.so",
"lib/x86_64-linux-gnu/libopencv_highgui.so",
"lib/x86_64-linux-gnu/libopencv_imgcodecs.so",
"lib/x86_64-linux-gnu/libopencv_imgproc.so",
+2
View File
@@ -13,6 +13,8 @@ cc_library(
srcs = glob(
[
"local/opt/opencv@3/lib/libopencv_core.dylib",
"local/opt/opencv@3/lib/libopencv_calib3d.dylib",
"local/opt/opencv@3/lib/libopencv_features2d.dylib",
"local/opt/opencv@3/lib/libopencv_highgui.dylib",
"local/opt/opencv@3/lib/libopencv_imgcodecs.dylib",
"local/opt/opencv@3/lib/libopencv_imgproc.dylib",
@@ -1,25 +0,0 @@
commit c0863d0596ae6b769a29fa3fb72ff036444fd249 (HEAD -> py3)
Author: Camillo Lugaresi <[email protected]>
Date: Fri Aug 16 00:13:16 2019 -0700
Fix codesigningtool.py py3 compatibility.
In recent versions of plistlib, binary data entries are returned as instances of the built-in bytes class, and plistlib.Data is deprecated.
Since this script was expecting a plistlib.Data, it would fail with the error "AttributeError: 'bytes' object has no attribute 'data'".
This change makes it compatible with both new and old versions of plistlib.
diff --git a/tools/codesigningtool/codesigningtool.py b/tools/codesigningtool/codesigningtool.py
index 59f3841..40cdcf3 100644
--- a/tools/codesigningtool/codesigningtool.py
+++ b/tools/codesigningtool/codesigningtool.py
@@ -102,7 +102,9 @@ def _certificate_fingerprint(identity):
def _get_identities_from_provisioning_profile(mpf):
"""Iterates through all the identities in a provisioning profile, lazily."""
for identity in mpf["DeveloperCertificates"]:
- yield _certificate_fingerprint(identity.data)
+ if not _PY3:
+ identity = identity.data
+ yield _certificate_fingerprint(identity)
def _find_codesign_identities(identity=None):
@@ -1,22 +0,0 @@
commit 065c20bf79253257c87bd4614bb9a7fdef015cbb
Author: Camillo Lugaresi <[email protected]>
Date: Thu Aug 15 18:34:41 2019 -0700
Use python3 if available to run gen_git_source.py.
gen_git_source.py fails with an "ImportError: No module named builtins" on a default installation of Python 2 (at least, the one that comes with macOS). This can be worked around by installing the "future" package from pip. However, instead of requiring users to go through this extra step, we can simply run the script using Python 3 if it's installed. The script works on a default installation of Python 3, without requiring extra packages.
diff --git a/third_party/git/git_configure.bzl b/third_party/git/git_configure.bzl
index fc18fdb988..3ce64242af 100644
--- a/third_party/git/git_configure.bzl
+++ b/third_party/git/git_configure.bzl
@@ -18,6 +18,9 @@ def _get_python_bin(repository_ctx):
python_bin = repository_ctx.os.environ.get(_PYTHON_BIN_PATH)
if python_bin != None:
return python_bin
+ python_bin_path = repository_ctx.which("python3")
+ if python_bin_path != None:
+ return str(python_bin_path)
python_bin_path = repository_ctx.which("python")
if python_bin_path != None:
return str(python_bin_path)
@@ -1,24 +0,0 @@
commit f67fcbefce906cd419e4657f0d41e21019b71abd (HEAD -> formediapipe)
Author: Camillo Lugaresi <[email protected]>
Date: Fri Aug 16 12:24:58 2019 -0700
elementwise requires C++14
This file fails to compile when using C++11, which is the default. This can be worked around by passing --cxxopt='-std=c++14' as a global build option to Bazel, but it is more convenient for users if we just configure this cc_library to be built with C++14 by default.
The authors may also want to change it to be compatible with C++11, but that's out of scope for this change.
diff --git a/tensorflow/lite/delegates/gpu/metal/kernels/BUILD b/tensorflow/lite/delegates/gpu/metal/kernels/BUILD
index 17e59e70eb..4302a1f644 100644
--- a/tensorflow/lite/delegates/gpu/metal/kernels/BUILD
+++ b/tensorflow/lite/delegates/gpu/metal/kernels/BUILD
@@ -197,6 +197,9 @@ cc_library(
name = "elementwise",
srcs = ["elementwise.cc"],
hdrs = ["elementwise.h"],
+ copts = [
+ "-std=c++14",
+ ],
deps = [
"//tensorflow/lite/delegates/gpu/common:model",
"//tensorflow/lite/delegates/gpu/common:operations",