Silence warnings and patch suggested changes

mc · mc · commit 232324adab70 · 2020-04-02T19:16:50.000-07:00
diff --git a/tensorflow/BUILD b/tensorflow/BUILD
@@ -111,7 +111,9 @@ config_setting(
 
 config_setting(
     name = "emscripten",
-    values = {"crosstool_top": "//external:android/emscripten"},
+    values = {
+        "cpu": "js",
+    },
     visibility = ["//visibility:public"],
 )
 
diff --git a/tensorflow/c/tf_tensor.cc b/tensorflow/c/tf_tensor.cc
@@ -114,7 +114,7 @@ TF_Tensor* TF_NewTensor(TF_DataType dtype, const int64_t* dims, int num_dims,
   if (elem_size > 0 && len < (elem_size * ret.NumElements())) {
     return nullptr;
   }
-  return new TF_Tensor{std::make_unique<tensorflow::TensorInterface>(ret)};
+  return new TF_Tensor{absl::make_unique<tensorflow::TensorInterface>(ret)};
 }
 
 TF_Tensor* TF_TensorMaybeMove(TF_Tensor* t) {
@@ -317,7 +317,7 @@ TF_Tensor* TF_TensorFromTensor(const tensorflow::Tensor& src, Status* status) {
     if (!tensor.CopyFrom(src, src.shape())) {
       return nullptr;
     }
-    return new TF_Tensor{std::make_unique<tensorflow::TensorInterface>(tensor)};
+    return new TF_Tensor{absl::make_unique<tensorflow::TensorInterface>(tensor)};
   }
   // DT_STRING tensors require a copying since TF_Tensor.buffer expects a flatly
   // encoded sequence of strings.
diff --git a/tensorflow/core/lib/monitoring/percentile_sampler.cc b/tensorflow/core/lib/monitoring/percentile_sampler.cc
@@ -29,7 +29,8 @@ namespace monitoring {
 void PercentileSamplerCell::Add(double sample) {
   uint64 nstime = EnvTime::NowNanos();
   mutex_lock l(mu_);
-  samples_[next_position_] = {nstime, sample};
+  samples_[next_position_].nstime = nstime;
+  samples_[next_position_].value = sample;
   ++next_position_;
   if (TF_PREDICT_FALSE(next_position_ >= samples_.size())) {
     next_position_ = 0;
@@ -72,7 +73,9 @@ Percentiles PercentileSamplerCell::value() const {
       size_t index = std::min<size_t>(
           static_cast<size_t>(percentile * pct_samples.num_samples / 100.0),
           pct_samples.num_samples - 1);
-      PercentilePoint pct = {percentile, samples[index].value};
+      PercentilePoint pct;
+      pct.percentile = percentile;
+      pct.value = samples[index].value;
       pct_samples.points.push_back(pct);
     }
   }
diff --git a/tensorflow/lite/build_def.bzl b/tensorflow/lite/build_def.bzl
@@ -12,6 +12,8 @@ def tflite_copts():
     """Defines compile time flags."""
     copts = [
         "-DFARMHASH_NO_CXX_STRING",
+        "-Wno-deprecated-declarations",
+        "-Wno-unused-function",
     ] + select({
         clean_dep("//tensorflow:android_arm"): [
             "-mfpu=neon",
diff --git a/tensorflow/lite/delegates/nnapi/BUILD b/tensorflow/lite/delegates/nnapi/BUILD
@@ -26,6 +26,9 @@ cc_library(
         "nnapi_delegate.h",
         "nnapi_delegate_kernel.h",
     ],
+    copts = [
+        "-Wno-unused-private-field",
+    ],
     deps = [
         "//tensorflow/lite:allocation",
         "//tensorflow/lite:kernel_api",
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
@@ -144,11 +144,11 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
 
     tf_http_archive(
         name = "XNNPACK",
-        sha256 = "8f29d32a35d5e12aa5f02d0ef9018c80f2c985cd1837493fdfa670d84dfe2e2b",
-        strip_prefix = "XNNPACK-1498d1d4d0430480dfe5c4538049b4f789d29134",
+        sha256 = "190e61e50af3497bb46b8d936bd2d2d551a9aeedb02ff66388918408a54e216a",
+        strip_prefix = "XNNPACK-b18783570f0643560be641b193367d3906955141",
         urls = [
-            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/google/XNNPACK/archive/1498d1d4d0430480dfe5c4538049b4f789d29134.zip",
-            "https://github.com/google/XNNPACK/archive/1498d1d4d0430480dfe5c4538049b4f789d29134.zip",
+            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/google/XNNPACK/archive/b18783570f0643560be641b193367d3906955141.zip",
+            "https://github.com/google/XNNPACK/archive/b18783570f0643560be641b193367d3906955141.zip",
         ],
     )
 
@@ -927,10 +927,11 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
     # https://github.com/bazelbuild/rules_apple/releases
     tf_http_archive(
         name = "build_bazel_rules_apple",
-        sha256 = "a045a436b642c70fb0c10ca84ff0fd2dcbd59cc89100d597a61e8374afafb366",
+        sha256 = "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e",
+        strip_prefix = "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3",
         urls = [
-            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/bazelbuild/rules_apple/releases/download/0.18.0/rules_apple.0.18.0.tar.gz",
-            "https://github.com/bazelbuild/rules_apple/releases/download/0.18.0/rules_apple.0.18.0.tar.gz",
+            "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz",
+            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz",
         ],
     )
 
diff --git a/third_party/cpuinfo/BUILD.bazel b/third_party/cpuinfo/BUILD.bazel
@@ -42,7 +42,6 @@ ARM_SRCS = [
 # Platform-specific sources and headers
 LINUX_SRCS = [
     "src/linux/cpulist.c",
-    "src/linux/current.c",
     "src/linux/multiline.c",
     "src/linux/processors.c",
     "src/linux/smallfile.c",
diff --git a/third_party/cpuinfo/workspace.bzl b/third_party/cpuinfo/workspace.bzl
@@ -2,14 +2,20 @@
 
 load("//third_party:repo.bzl", "third_party_http_archive")
 
+# Sanitize a dependency so that it works correctly from code that includes
+# TensorFlow as a submodule.
+def clean_dep(dep):
+    return str(Label(dep))
+
 def repo():
     third_party_http_archive(
         name = "cpuinfo",
-        strip_prefix = "cpuinfo-e39a5790059b6b8274ed91f7b5b5b13641dff267",
-        sha256 = "e5caa8b7c58f1623eed88f4d5147e3753ff19cde821526bc9aa551b004f751fe",
+        strip_prefix = "cpuinfo-d6c0f915ee737f961915c9d17f1679b6777af207",
+        sha256 = "146fc61c3cf63d7d88db963876929a4d373f621fb65568b895efa0857f467770",
         urls = [
-            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/pytorch/cpuinfo/archive/e39a5790059b6b8274ed91f7b5b5b13641dff267.tar.gz",
-            "https://github.com/pytorch/cpuinfo/archive/e39a5790059b6b8274ed91f7b5b5b13641dff267.tar.gz",
+            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/pytorch/cpuinfo/archive/d6c0f915ee737f961915c9d17f1679b6777af207.tar.gz",
+            "https://github.com/pytorch/cpuinfo/archive/d6c0f915ee737f961915c9d17f1679b6777af207.tar.gz",
         ],
         build_file = "//third_party/cpuinfo:BUILD.bazel",
+        patch_file = clean_dep("//third_party/cpuinfo:cpuinfo.patch"),
     )

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,9 @@ config_setting(`
`111`	`111`
`112`	`112`	`config_setting(`
`113`	`113`	`name = "emscripten",`
`114`		`- values = {"crosstool_top": "//external:android/emscripten"},`
	`114`	`+ values = {`
	`115`	`+ "cpu": "js",`
	`116`	`+ },`
`115`	`117`	`visibility = ["//visibility:public"],`
`116`	`118`	`)`
`117`	`119`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ TF_Tensor* TF_NewTensor(TF_DataType dtype, const int64_t* dims, int num_dims,`
`114`	`114`	`if (elem_size > 0 && len < (elem_size * ret.NumElements())) {`
`115`	`115`	`return nullptr;`
`116`	`116`	`}`
`117`		`- return new TF_Tensor{std::make_unique<tensorflow::TensorInterface>(ret)};`
	`117`	`+ return new TF_Tensor{absl::make_unique<tensorflow::TensorInterface>(ret)};`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`TF_Tensor* TF_TensorMaybeMove(TF_Tensor* t) {`
`@@ -317,7 +317,7 @@ TF_Tensor* TF_TensorFromTensor(const tensorflow::Tensor& src, Status* status) {`
`317`	`317`	`if (!tensor.CopyFrom(src, src.shape())) {`
`318`	`318`	`return nullptr;`
`319`	`319`	`}`
`320`		`- return new TF_Tensor{std::make_unique<tensorflow::TensorInterface>(tensor)};`
	`320`	`+ return new TF_Tensor{absl::make_unique<tensorflow::TensorInterface>(tensor)};`
`321`	`321`	`}`
`322`	`322`	`// DT_STRING tensors require a copying since TF_Tensor.buffer expects a flatly`
`323`	`323`	`// encoded sequence of strings.`