Merge branch 'master' into ios-image-searcher-api-impl

priankakariat · priankakariat · commit 82cb0dbf0cc0 · 2022-10-17T11:03:15.000+05:30
diff --git a/tensorflow_lite_support/ios/task/text/nlclassifier/BUILD b/tensorflow_lite_support/ios/task/text/nlclassifier/BUILD
@@ -1,9 +1,10 @@
-load("//tools/build_defs/swift:swift_library.bzl", "swift_library")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 load("@org_tensorflow//tensorflow/lite/ios:ios.bzl", "TFL_DEFAULT_TAGS", "TFL_DISABLED_SANITIZER_TAGS", "TFL_MINIMUM_OS_VERSION")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@org_tensorflow//tensorflow/lite:special_rules.bzl", "tflite_ios_lab_runner")
 
 package(
+    default_visibility = ["//tensorflow_lite_support:internal"],
     licenses = ["notice"],  # Apache 2.0
 )
 
diff --git a/tensorflow_lite_support/ios/task/text/qa/BUILD b/tensorflow_lite_support/ios/task/text/qa/BUILD
@@ -1,9 +1,10 @@
-load("//tools/build_defs/swift:swift_library.bzl", "swift_library")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 load("@org_tensorflow//tensorflow/lite/ios:ios.bzl", "TFL_DEFAULT_TAGS", "TFL_DISABLED_SANITIZER_TAGS", "TFL_MINIMUM_OS_VERSION")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@org_tensorflow//tensorflow/lite:special_rules.bzl", "tflite_ios_lab_runner")
 
 package(
+    default_visibility = ["//tensorflow_lite_support:internal"],
     licenses = ["notice"],  # Apache 2.0
 )
 
diff --git a/tensorflow_lite_support/ios/test/task/audio/audio_classifier/BUILD b/tensorflow_lite_support/ios/test/task/audio/audio_classifier/BUILD
@@ -1,7 +1,7 @@
 load("@org_tensorflow//tensorflow/lite/ios:ios.bzl", "TFL_DEFAULT_TAGS", "TFL_DISABLED_SANITIZER_TAGS", "TFL_MINIMUM_OS_VERSION")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@org_tensorflow//tensorflow/lite:special_rules.bzl", "tflite_ios_lab_runner")
-load("//tools/build_defs/swift:swift_library.bzl", "swift_library")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
 package(
     default_visibility = ["//visibility:private"],
diff --git a/tensorflow_lite_support/ios/test/task/audio/core/TFLRingBufferTests.m b/tensorflow_lite_support/ios/test/task/audio/core/TFLRingBufferTests.m
@@ -50,7 +50,7 @@ - (void)testLoadSucceedsWithFullLengthBuffer {
   float expectedData[] = {1.0f, 2.0f, 3.0f, 4.0f, 5.0f};
 
   for (int i = 0; i < inDataLength; i++) {
-    XCTAssertEqual(outBuffer.data[i], inData[i]);
+    XCTAssertEqual(outBuffer.data[i], expectedData[i]);
   }
 }
 
@@ -241,7 +241,6 @@ - (void)testLoadFailsWithIndexOutofBounds {
                                      size:initialDataSize
                                     error:nil]);
 
-  NSInteger totalInSize = 4;
   float inArray[] = {6.0f, 7.0f, 8.0f, 9.0f};
 
   NSInteger offset = 2;
diff --git a/tensorflow_lite_support/ios/test/task/audio/core/audio_record/TFLAudioRecordTests.m b/tensorflow_lite_support/ios/test/task/audio/core/audio_record/TFLAudioRecordTests.m
@@ -189,9 +189,7 @@ - (void)testReadFailsWithoutLoad {
   XCTAssertNotNil(audioRecord);
 
   NSError *error = nil;
-  TFLFloatBuffer *floatBuffer = [audioRecord readAtOffset:0
-                                                 withSize:audioRecord.bufferSize
-                                                    error:&error];
+  [audioRecord readAtOffset:0 withSize:audioRecord.bufferSize error:&error];
 
   VerifyError(error, @"org.tensorflow.lite.audio.record",
               TFLAudioRecordErrorCodeWaitingForNewMicInputError,
diff --git a/tensorflow_lite_support/ios/test/task/audio/core/audio_tensor/TFLAudioTensorTests.m b/tensorflow_lite_support/ios/test/task/audio/core/audio_tensor/TFLAudioTensorTests.m
@@ -209,7 +209,7 @@ - (void)testLoadBufferSucceeds {
   float expectedData[] = {1.0f, 2.0f, 3.0f, 4.0f, 5.0f};
 
   for (int i = 0; i < sampleCount; i++) {
-    XCTAssertEqual(outBuffer.data[i], inData[i]);
+    XCTAssertEqual(outBuffer.data[i], expectedData[i]);
   }
 }
 
diff --git a/tensorflow_lite_support/ios/test/task/vision/image_classifier/BUILD b/tensorflow_lite_support/ios/test/task/vision/image_classifier/BUILD
@@ -1,4 +1,4 @@
-load("//tools/build_defs/swift:swift_library.bzl", "swift_library")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 load("@org_tensorflow//tensorflow/lite/ios:ios.bzl", "TFL_DEFAULT_TAGS", "TFL_DISABLED_SANITIZER_TAGS")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@org_tensorflow//tensorflow/lite:special_rules.bzl", "tflite_ios_lab_runner")
diff --git a/tensorflow_lite_support/ios/test/task/vision/image_classifier/TFLImageClassifierTests.m b/tensorflow_lite_support/ios/test/task/vision/image_classifier/TFLImageClassifierTests.m
@@ -103,8 +103,8 @@ - (void)testInferenceWithBoundingBox {
   XCTAssertTrue(classificationResults.classifications.count > 0);
   XCTAssertTrue(classificationResults.classifications[0].categories.count > 0);
 
-  TFLCategory *category = classificationResults.classifications[0].categories[0];
   // TODO: match the label and score as image_classifier_test.cc
+  // TFLCategory *__unused category = classificationResults.classifications[0].categories[0];
   // XCTAssertTrue([category.label isEqual:@"soccer ball"]);
   // XCTAssertEqualWithAccuracy(category.score, 0.256512, 0.001);
 }
diff --git a/tensorflow_lite_support/ios/test/task/vision/image_segmenter/BUILD b/tensorflow_lite_support/ios/test/task/vision/image_segmenter/BUILD
@@ -1,4 +1,4 @@
-load("//tools/build_defs/swift:swift_library.bzl", "swift_library")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 load("@org_tensorflow//tensorflow/lite/ios:ios.bzl", "TFL_DEFAULT_TAGS", "TFL_DISABLED_SANITIZER_TAGS", "TFL_MINIMUM_OS_VERSION")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@org_tensorflow//tensorflow/lite:special_rules.bzl", "tflite_ios_lab_runner")
diff --git a/tensorflow_lite_support/ios/test/task/vision/object_detector/BUILD b/tensorflow_lite_support/ios/test/task/vision/object_detector/BUILD
@@ -1,4 +1,4 @@
-load("//tools/build_defs/swift:swift_library.bzl", "swift_library")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 load("@org_tensorflow//tensorflow/lite/ios:ios.bzl", "TFL_DEFAULT_TAGS", "TFL_DISABLED_SANITIZER_TAGS", "TFL_MINIMUM_OS_VERSION")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@org_tensorflow//tensorflow/lite:special_rules.bzl", "tflite_ios_lab_runner")
diff --git a/tensorflow_lite_support/ios/text/tokenizers/BUILD b/tensorflow_lite_support/ios/text/tokenizers/BUILD
@@ -1,9 +1,10 @@
-load("//tools/build_defs/swift:swift_library.bzl", "swift_library")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 load("@org_tensorflow//tensorflow/lite/ios:ios.bzl", "TFL_DEFAULT_TAGS", "TFL_DISABLED_SANITIZER_TAGS", "TFL_MINIMUM_OS_VERSION")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@org_tensorflow//tensorflow/lite:special_rules.bzl", "tflite_ios_lab_runner")
 
 package(
+    default_visibility = ["//tensorflow_lite_support:internal"],
     licenses = ["notice"],  # Apache 2.0
 )
 
diff --git a/tensorflow_lite_support/python/task/BUILD b/tensorflow_lite_support/python/task/BUILD
@@ -1,6 +1,3 @@
 package(
-    default_visibility = [
-        "//tensorflow_lite_support:internal",
-    ],
     licenses = ["notice"],  # Apache 2.0
 )
diff --git a/tensorflow_lite_support/tools/pip_package/BUILD b/tensorflow_lite_support/tools/pip_package/BUILD
@@ -1,8 +1,6 @@
 # Description:
 #  Tools for building the TensorFlow pip package.
 
-load("@local_config_syslibs//:build_defs.bzl", "if_not_system_lib")
-
 package(default_visibility = ["//visibility:private"])
 
 COMMON_PIP_DEPS = [
@@ -47,16 +45,7 @@ filegroup(
     data = [
         "//:LICENSE",
         "@org_tensorflow//:LICENSE",
-    ] + if_not_system_lib(
-        "absl_py",
-        [
-            "@absl_py//absl:LICENSE",
-            "@absl_py//absl/logging:LICENSE",
-            "@absl_py//absl/flags:LICENSE",
-            "@absl_py//absl/testing:LICENSE",
-            "@absl_py//absl/third_party/unittest3_backport:LICENSE",
-        ],
-    ),
+    ],
 )
 
 sh_binary(
diff --git a/tensorflow_lite_support/tools/pip_package/rpi/build_arm_pip_package.sh b/tensorflow_lite_support/tools/pip_package/rpi/build_arm_pip_package.sh
@@ -18,7 +18,17 @@ set -ex
 
 NIGHTLY_FLAG=$1
 
-bazel build -c opt --config=elinux_armhf --define darwinn_portable=1 --linkopt=-L/usr/lib/arm-linux-gnueabihf tensorflow_lite_support/tools/pip_package:build_pip_package
+bazel build -c opt --config=elinux_armhf --define=tflite_with_ruy=true \
+    --copt=-march=armv7-a --copt=-mfpu=neon-vfpv4 --copt=-fno-tree-pre \
+    --cxxopt=-fpermissive --define tensorflow_mkldnn_contraction_kernel=0 \
+    --define=raspberry_pi_with_neon=true --define=tflite_with_xnnpack=false \
+    --define darwinn_portable=1 --linkopt=-L/usr/lib/arm-linux-gnueabihf \
+    tensorflow_lite_support/tools/pip_package:build_pip_package
 EXTRA_PKG_NAME_FLAG="--plat-name=manylinux2014-armv7l" ./bazel-bin/tensorflow_lite_support/tools/pip_package/build_pip_package --dst wheels ${NIGHTLY_FLAG}
-bazel build -c opt --config=elinux_aarch64 --define darwinn_portable=1 --linkopt=-L/usr/lib/aarch64-linux-gnu tensorflow_lite_support/tools/pip_package:build_pip_package
+
+bazel build -c opt --define=tflite_with_ruy=true --config=elinux_aarch64 \
+    --define tensorflow_mkldnn_contraction_kernel=0 \
+    --define darwinn_portable=1 \
+    --linkopt=-L/usr/lib/aarch64-linux-gnu \
+    tensorflow_lite_support/tools/pip_package:build_pip_package
 EXTRA_PKG_NAME_FLAG="--plat-name=manylinux2014-aarch64" ./bazel-bin/tensorflow_lite_support/tools/pip_package/build_pip_package --dst wheels ${NIGHTLY_FLAG}
diff --git a/tensorflow_lite_support/tools/pip_package/setup.py b/tensorflow_lite_support/tools/pip_package/setup.py
@@ -50,7 +50,7 @@
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '0.4.0'
+_VERSION = '0.4.2'
 
 SETUP_PACKAGES = [
     'pybind11 >= 2.6.0',
diff --git a/third_party/tensorflow/version.bzl b/third_party/tensorflow/version.bzl
@@ -2,6 +2,6 @@
 Configures the TF version used by the TFLite Support library.
 """
 
-# TF on 2022-08-31.
-TENSORFLOW_COMMIT = "41bdbd39e756f0a2d4e6c11fe0d2f197fe58b10e"
-TENSORFLOW_SHA256 = "f64c6e15f941eac171fac1eb900d915288b6852a5aaecba122bfa1f50d739e1b"
+# TensorFlow from Oct 13, 2022
+TENSORFLOW_COMMIT = "e019f47ff1d47bb06125e755246bdfb0cd0ca9d7"
+TENSORFLOW_SHA256 = "8101b50103f3c16aaaa4f6930867f8ae0573ed7ce837bf42837faed973e48d0c"
diff --git a/workspace1.bzl b/workspace1.bzl
@@ -40,10 +40,10 @@ def tflite_support_workspace1():
 
     http_archive(
         name = "tf_toolchains",
-        sha256 = "d72b2e52baf0592f5b94347b128ef75422fc22f63dfcf2d5fd46bc732cab052b",
-        strip_prefix = "toolchains-1.3.0",
+        sha256 = "d550e6260b7bd8a7f2c2e3a20ba3c4b6c519985f5a164a1bf3601dd96852a05b",
+        strip_prefix = "toolchains-1.4.6",
         urls = [
-            "http://mirror.tensorflow.org/github.com/tensorflow/toolchains/archive/v1.3.0.tar.gz",
-            "https://github.com/tensorflow/toolchains/archive/v1.3.0.tar.gz",
+            "http://mirror.tensorflow.org/github.com/tensorflow/toolchains/archive/v1.4.6.tar.gz",
+            "https://github.com/tensorflow/toolchains/archive/v1.4.6.tar.gz",
         ],
     )
diff --git a/workspace9.bzl b/workspace9.bzl
@@ -97,19 +97,22 @@ def tflite_support_workspace9():
     # https://github.com/bazelbuild/rules_apple/releases
     http_archive(
         name = "build_bazel_rules_apple",
-        sha256 = "a5f00fd89eff67291f6cd3efdc8fad30f4727e6ebb90718f3f05bbf3c3dd5ed7",
-        urls = [
-            "https://github.com/bazelbuild/rules_apple/releases/download/0.33.0/rules_apple.0.33.0.tar.gz",
-        ],
+        sha256 = "36072d4f3614d309d6a703da0dfe48684ec4c65a89611aeb9590b45af7a3e592",
+        urls = ["https://github.com/bazelbuild/rules_apple/releases/download/1.0.1/rules_apple.1.0.1.tar.gz"],
     )
 
     # https://github.com/bazelbuild/rules_swift/releases
     http_archive(
         name = "build_bazel_rules_swift",
-        sha256 = "8a49da750560b185804a4bc95c82d3f9cc4c2caf788960b0e21945759155fdd9",
-        urls = [
-            "https://github.com/bazelbuild/rules_swift/releases/download/0.25.0/rules_swift.0.25.0.tar.gz",
-        ],
+        sha256 = "12057b7aa904467284eee640de5e33853e51d8e31aae50b3fb25d2823d51c6b8",
+        urls = ["https://github.com/bazelbuild/rules_swift/releases/download/1.0.0/rules_swift.1.0.0.tar.gz"],
+    )
+
+    # https://github.com/bazelbuild/apple_support/releases
+    http_archive(
+        name = "build_bazel_apple_support",
+        sha256 = "ce1042cf936540eaa7b49c4549d7cd9b6b1492acbb6e765840a67a34b8e17a97",
+        urls = ["https://github.com/bazelbuild/apple_support/releases/download/1.1.0/apple_support.1.1.0.tar.gz"],
     )
 
     http_archive(
@@ -130,11 +133,11 @@ def tflite_support_workspace9():
     third_party_http_archive(
         name = "pybind11",
         urls = [
-            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/pybind/pybind11/archive/v2.7.1.tar.gz",
-            "https://github.com/pybind/pybind11/archive/v2.7.1.tar.gz",
+            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/pybind/pybind11/archive/v2.10.0.tar.gz",
+            "https://github.com/pybind/pybind11/archive/v2.10.0.tar.gz",
         ],
-        sha256 = "616d1c42e4cf14fa27b2a4ff759d7d7b33006fdc5ad8fd603bb2c22622f27020",
-        strip_prefix = "pybind11-2.7.1",
+        sha256 = "eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec",
+        strip_prefix = "pybind11-2.10.0",
         build_file = "@pybind11_bazel//:pybind11.BUILD",
     )
 
@@ -163,22 +166,21 @@ def tflite_support_workspace9():
 
     http_archive(
         name = "absl_py",
-        sha256 = "603febc9b95a8f2979a7bdb77d2f5e4d9b30d4e0d59579f88eba67d4e4cc5462",
-        strip_prefix = "abseil-py-pypi-v0.9.0",
+        sha256 = "a7c51b2a0aa6357a9cbb2d9437e8cd787200531867dc02565218930b6a32166e",
+        strip_prefix = "abseil-py-1.0.0",
         urls = [
-            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/abseil/abseil-py/archive/pypi-v0.9.0.tar.gz",
-            "https://github.com/abseil/abseil-py/archive/pypi-v0.9.0.tar.gz",
+            "https://github.com/abseil/abseil-py/archive/refs/tags/v1.0.0.tar.gz",
         ],
     )
 
     http_archive(
         name = "six_archive",
         build_file = Label("//third_party:six.BUILD"),
-        sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73",
-        strip_prefix = "six-1.12.0",
+        sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
+        strip_prefix = "six-1.16.0",
         urls = [
-            "https://storage.googleapis.com/mirror.tensorflow.org/pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz",
-            "https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz",
+            "https://storage.googleapis.com/mirror.tensorflow.org/pypi.python.org/packages/source/s/six/six-1.16.0.tar.gz",
+            "https://pypi.python.org/packages/source/s/six/six-1.16.0.tar.gz",
         ],
     )
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ - (void)testLoadSucceedsWithFullLengthBuffer {`
`50`	`50`	`float expectedData[] = {1.0f, 2.0f, 3.0f, 4.0f, 5.0f};`
`51`	`51`
`52`	`52`	`for (int i = 0; i < inDataLength; i++) {`
`53`		`- XCTAssertEqual(outBuffer.data[i], inData[i]);`
	`53`	`+ XCTAssertEqual(outBuffer.data[i], expectedData[i]);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`@@ -241,7 +241,6 @@ - (void)testLoadFailsWithIndexOutofBounds {`
`241`	`241`	`size:initialDataSize`
`242`	`242`	`error:nil]);`
`243`	`243`
`244`		`- NSInteger totalInSize = 4;`
`245`	`244`	`float inArray[] = {6.0f, 7.0f, 8.0f, 9.0f};`
`246`	`245`
`247`	`246`	`NSInteger offset = 2;`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ - (void)testLoadBufferSucceeds {`
`209`	`209`	`float expectedData[] = {1.0f, 2.0f, 3.0f, 4.0f, 5.0f};`
`210`	`210`
`211`	`211`	`for (int i = 0; i < sampleCount; i++) {`
`212`		`- XCTAssertEqual(outBuffer.data[i], inData[i]);`
	`212`	`+ XCTAssertEqual(outBuffer.data[i], expectedData[i]);`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("//tools/build_defs/swift:swift_library.bzl", "swift_library")`
	`1`	`+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")`
`2`	`2`	`load("@org_tensorflow//tensorflow/lite/ios:ios.bzl", "TFL_DEFAULT_TAGS", "TFL_DISABLED_SANITIZER_TAGS")`
`3`	`3`	`load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")`
`4`	`4`	`load("@org_tensorflow//tensorflow/lite:special_rules.bzl", "tflite_ios_lab_runner")`
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ - (void)testInferenceWithBoundingBox {`
`103`	`103`	`XCTAssertTrue(classificationResults.classifications.count > 0);`
`104`	`104`	`XCTAssertTrue(classificationResults.classifications[0].categories.count > 0);`
`105`	`105`
`106`		`- TFLCategory *category = classificationResults.classifications[0].categories[0];`
`107`	`106`	`// TODO: match the label and score as image_classifier_test.cc`
	`107`	`+ // TFLCategory *__unused category = classificationResults.classifications[0].categories[0];`
`108`	`108`	`// XCTAssertTrue([category.label isEqual:@"soccer ball"]);`
`109`	`109`	`// XCTAssertEqualWithAccuracy(category.score, 0.256512, 0.001);`
`110`	`110`	`}`