Project import generated by Copybara.

GitOrigin-RevId: d8caa66de45839696f5bd0786ad3bfbcb9cff632
This commit is contained in:
MediaPipe Team
2020-12-09 22:43:33 -05:00
committed by chuoling
parent f15da632de
commit 2b58cceec9
750 changed files with 22901 additions and 9478 deletions
+5 -13
View File
@@ -1,22 +1,14 @@
diff --git a/bazel/ceres.bzl b/bazel/ceres.bzl
index d90e5a3..32a3fef 100644
index ce170b2..bb5aa82 100644
--- a/bazel/ceres.bzl
+++ b/bazel/ceres.bzl
@@ -180,7 +180,6 @@ def ceres_library(name,
]),
copts = [
"-I" + internal,
- "-Wno-sign-compare",
] + schur_eliminator_copts,
# These include directories and defines are propagated to other targets
@@ -202,7 +201,7 @@ def ceres_library(name,
@@ -204,7 +204,7 @@ def ceres_library(name,
],
visibility = ["//visibility:public"],
deps = [
- "@com_github_eigen_eigen//:eigen",
- "@com_gitlab_libeigen_eigen//:eigen",
- "@com_github_google_glog//:glog",
+ "@eigen_archive//:eigen",
+ "@eigen_archive//:eigen", # from TensorFlow
+ "@com_github_glog_glog//:glog",
],
)
)
@@ -0,0 +1,45 @@
https://github.com/google/glog/pull/342
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d63f62d1..aa0dd4a8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -26,6 +26,7 @@ Abhishek Dasgupta <[email protected]>
Abhishek Parmar <[email protected]>
Andrew Schwartzmeyer <[email protected]>
Andy Ying <[email protected]>
+Bret McKee <[email protected]>
Brian Silverman <[email protected]>
Fumitoshi Ukai <[email protected]>
Guillaume Dumont <[email protected]>
diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
index 9968b96d..f6dccb29 100644
--- a/src/glog/logging.h.in
+++ b/src/glog/logging.h.in
@@ -649,6 +649,10 @@ void MakeCheckOpValueString(std::ostream* os, const signed char& v);
template <> GOOGLE_GLOG_DLL_DECL
void MakeCheckOpValueString(std::ostream* os, const unsigned char& v);
+// Provide printable value for nullptr_t
+template <> GOOGLE_GLOG_DLL_DECL
+void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v);
+
// Build the error message string. Specify no inlining for code size.
template <typename T1, typename T2>
std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext)
diff --git a/src/logging.cc b/src/logging.cc
index 0c86cf62..256655e5 100644
--- a/src/logging.cc
+++ b/src/logging.cc
@@ -2163,6 +2163,11 @@ void MakeCheckOpValueString(std::ostream* os, const unsigned char& v) {
}
}
+template <>
+void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v) {
+ (*os) << "nullptr";
+}
+
void InitGoogleLogging(const char* argv0) {
glog_internal_namespace_::InitGoogleLoggingUtilities(argv0);
}
+14 -1
View File
@@ -34,4 +34,17 @@ index ba50783765..5de5ea01f0 100644
-#include <gmock/gmock-generated-matchers.h>
#include <gmock/gmock-matchers.h>
#include <gmock/gmock-more-matchers.h>
#endif
#include <gmock/gmock.h>
diff --git a/tensorflow/lite/delegates/gpu/cl/serialization.fbs b/tensorflow/lite/delegates/gpu/cl/serialization.fbs
index 67bd587162e..2a3c6bd30dc 100644
--- a/tensorflow/lite/delegates/gpu/cl/serialization.fbs
+++ b/tensorflow/lite/delegates/gpu/cl/serialization.fbs
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-include "tensorflow/lite/delegates/gpu/common/task/serialization_base.fbs";
+include "../common/task/serialization_base.fbs";
namespace tflite.gpu.cl.data;
+24
View File
@@ -0,0 +1,24 @@
diff --git a/tensorflow/lite/delegates/gpu/BUILD b/tensorflow/lite/delegates/gpu/BUILD
index 069230ebcf6..3924d7cced7 100644
--- a/tensorflow/lite/delegates/gpu/BUILD
+++ b/tensorflow/lite/delegates/gpu/BUILD
@@ -83,6 +83,7 @@ objc_library(
hdrs = ["metal_delegate.h"],
module_name = "TensorFlowLiteCMetal",
sdk_frameworks = ["Metal"],
+ copts = ["-std=c++17"],
deps = [
"//tensorflow/lite:kernel_api",
"//tensorflow/lite:minimal_logging",
diff --git a/tensorflow/lite/delegates/gpu/metal/BUILD b/tensorflow/lite/delegates/gpu/metal/BUILD
index 6dcde34a62f..1adfc28aad9 100644
--- a/tensorflow/lite/delegates/gpu/metal/BUILD
+++ b/tensorflow/lite/delegates/gpu/metal/BUILD
@@ -17,6 +17,7 @@ package(
DEFAULT_COPTS = [
"-Wno-shorten-64-to-32",
+ "-std=c++17",
]
cc_library(