update tensorflow serving to version 2.1.0

update workspace deps and patches

update version strings

minor readme updates

Author: emacski

Diff for: README.md

@@ -8,16 +8,29 @@ a linux amd64 (x86_64) host.
 
 **Upstream Project:** [tensorflow/serving](https://github.com/tensorflow/serving)
 
+**Usage Documentation:** [TensorFlow Serving with Docker](https://www.tensorflow.org/tfx/serving/docker)
+
 This project is basically a giant build wrapper around [tensorflow/serving](https://github.com/tensorflow/serving)
 with the intention of making it easy to cross-build CPU optimized model server
-docker images targeting common linux arm platforms. Additonally, a set of built
-images is also maintained for some of the most popular linux arm platforms on
+docker images targeting common linux arm platforms. Additonally, a set of docker
+images is produced for some of the most popular linux arm platforms and hosted on
 Docker Hub.
 
 ## The Docker Images
 
 **Hosted on Docker Hub:** [emacski/tensorflow-serving](https://hub.docker.com/r/emacski/tensorflow-serving)
 
+### Quick Start
+
+On many consumer / developer 64-bit and 32-bit arm platforms you can simply:
+```sh
+docker pull emacski/tensorflow-serving:latest
+# or
+docker pull emacski/tensorflow-serving:2.1.0
+```
+
+Refer to [TensorFlow Serving with Docker](https://www.tensorflow.org/tfx/serving/docker) for usage.
+
 ### Images
 
 `emacski/tensorflow-serving:[Tag]`
@@ -33,7 +46,7 @@ Docker Hub.
 Example
 ```bash
 # on beaglebone black
-docker pull emacski/tensorflow-serving:2.0.0-linux_arm_armv7-a_neon_vfpv3
+docker pull emacski/tensorflow-serving:2.1.0-linux_arm_armv7-a_neon_vfpv3
 ```
 
 ### Aliases
@@ -52,7 +65,7 @@ docker pull emacski/tensorflow-serving:2.0.0-linux_arm_armv7-a_neon_vfpv3
 Example
 ```bash
 # on Raspberry PI 3 B+
-docker pull emacski/tensorflow-serving:2.0.0-linux_arm64
+docker pull emacski/tensorflow-serving:2.1.0-linux_arm64
 # or
 docker pull emacski/tensorflow-serving:latest-linux_arm64
 ```
@@ -86,14 +99,14 @@ docker pull emacski/tensorflow-serving
 Example
 ```sh
 # on Raspberry PI 3 B+
-docker pull emacski/tensorflow-serving:2.0.0
-# the actual image used is emacski/tensorflow-serving:2.0.0-linux_arm64
-# itself actually being emacski/tensorflow-serving:2.0.0-linux_arm64_armv8-a
+docker pull emacski/tensorflow-serving:2.1.0
+# the actual image used is emacski/tensorflow-serving:2.1.0-linux_arm64
+# itself actually being emacski/tensorflow-serving:2.1.0-linux_arm64_armv8-a
 ```
 
 ### Debug Images
 
-As of version 2.0.0, debug images are also built and published to docker hub.
+As of version 2.1.0, debug images are also built and published to docker hub.
 These images are identical to the non-debug images with the addition of busybox
 utils. The utils are located at `/busybox/bin` which is also included in the
 image `PATH` env variable.
@@ -104,9 +117,9 @@ suffix (if one is required) in the image tag.
 Examples
 ```sh
 # multi-arch
-docker pull emacski/tensorflow-serving:2.0.0-debug
+docker pull emacski/tensorflow-serving:2.1.0-debug
 # specific image
-docker pull emacski/tensorflow-serving:2.0.0-debug-linux_arm64_armv8-a
+docker pull emacski/tensorflow-serving:2.1.0-debug-linux_arm64_armv8-a
 # specific alias
 docker pull emacski/tensorflow-serving:latest-debug-linux_arm64
 ```

Diff for: WORKSPACE

@@ -20,7 +20,7 @@ register_toolchains(
 )
 
 # hack: tf depends on this specific toolchain target name to be used
-# as crosstool for one its config settings when building for arm
+# as crosstool for one of its config_settings when building for arm
 load("//tools/cpp:cc_repo_config.bzl", "cc_repo_config")
 
 cc_repo_config(name = "local_config_arm_compiler")
@@ -42,9 +42,9 @@ http_archive(
 # https://github.com/bazelbuild/rules_docker
 http_archive(
     name = "io_bazel_rules_docker",
-    sha256 = "df13123c44b4a4ff2c2f337b906763879d94871d16411bf82dcfeba892b58607",
-    strip_prefix = "rules_docker-0.13.0",
-    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.13.0/rules_docker-v0.13.0.tar.gz"],
+    sha256 = "dc97fccceacd4c6be14e800b2a00693d5e8d07f69ee187babfd04a80a9f8e250",
+    strip_prefix = "rules_docker-0.14.1",
+    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.14.1/rules_docker-v0.14.1.tar.gz"],
 )
 
 load("@io_bazel_rules_docker//repositories:repositories.bzl", container_repos = "repositories")
@@ -57,22 +57,25 @@ container_deps()
 
 # tensorflow/tensorflow and deps
 
+# tensorflow 2.1.0
 # https://github.com/tensorflow/tensorflow
 http_archive(
     name = "org_tensorflow",
     patches = [
+        # use canonical cpu value
         "//third_party/tensorflow:BUILD.patch",
+        # arm (32-bit) datatype sizes
         "//third_party/tensorflow:curl.BUILD.patch",
         "//third_party/tensorflow:hwloc.BUILD.bazel.patch",
     ],
-    sha256 = "b38de3408a4190246f2814dd7388cec72807b736fbcef5087e3b86a3f179bb0f",
-    strip_prefix = "tensorflow-64c3d382cadf7bbe8e7e99884bede8284ff67f56",
+    sha256 = "1f4b09e6bff7f847bb1034699076055e50e87534d76008af8295ed71195b2b36",
+    strip_prefix = "tensorflow-e5bf8de410005de06a7ff5393fafdf832ef1d4ad",
     urls = [
-        "https://github.com/tensorflow/tensorflow/archive/64c3d382cadf7bbe8e7e99884bede8284ff67f56.tar.gz",
+        "https://github.com/tensorflow/tensorflow/archive/e5bf8de410005de06a7ff5393fafdf832ef1d4ad.tar.gz",
     ],
 )
 
-# see tensorflow/serving/WORKSPACE
+# see tensorflow/serving/WORKSPACE and tensorflow/tensorflow/WORKSPACE
 http_archive(
     name = "io_bazel_rules_closure",
     sha256 = "5b00383d08dd71f28503736db0500b6fb4dda47489ff5fc6bed42557c07c6ba9",
@@ -82,18 +85,25 @@ http_archive(
     ],
 )
 
-# requires c++ includes for non-c++ compile action, so this patch
+# see tensorflow/serving/WORKSPACE and tensorflow/tensorflow/WORKSPACE
+http_archive(
+    name = "bazel_skylib",
+    sha256 = "1dde365491125a3db70731e25658dfdd3bc5dbdfd11b840b3e987ecf043c7ca0",
+    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel-skylib.0.9.0.tar.gz"],
+)
+
+# patch: requires c++ includes for non-c++ compile action, so this patch
 # disables default libc++ includes as the toolchain sets includes manually.
 http_archive(
     name = "nsync",
     patches = [
         "//third_party/tensorflow:nsync.BUILD.patch",
     ],
-    sha256 = "704be7f58afa47b99476bbac7aafd1a9db4357cef519db361716f13538547ffd",
-    strip_prefix = "nsync-1.20.2",
+    sha256 = "caf32e6b3d478b78cff6c2ba009c3400f8251f646804bcb65465666a9cea93c4",
+    strip_prefix = "nsync-1.22.0",
     urls = [
-        "https://storage.googleapis.com/mirror.tensorflow.org/github.com/google/nsync/archive/1.20.2.tar.gz",
-        "https://github.com/google/nsync/archive/1.20.2.tar.gz",
+        "https://storage.googleapis.com/mirror.tensorflow.org/github.com/google/nsync/archive/1.22.0.tar.gz",
+        "https://github.com/google/nsync/archive/1.22.0.tar.gz",
     ],
 )
 
@@ -113,14 +123,10 @@ http_archive(
 # https://github.com/tensorflow/serving
 http_archive(
     name = "tf_serving",
-    patches = [
-        "//third_party/serving:apis.BUILD.patch",
-        "//third_party/serving:oss.BUILD.patch",
-    ],
-    sha256 = "52e2dfed08c185d0fb9da9454063dac053f0889118b38e818b74631ea1b06ebe",
-    strip_prefix = "serving-2.0.0",
+    sha256 = "19338a59af96f0056088010fe04416ca09b0e8a9424ef742c392aa93c3b6b4de",
+    strip_prefix = "serving-2.1.0",
     urls = [
-        "https://github.com/tensorflow/serving/archive/2.0.0.tar.gz",
+        "https://github.com/tensorflow/serving/archive/2.1.0.tar.gz",
     ],
 )
 

Diff for: tensorflow_model_server/main.cc

@@ -204,7 +204,7 @@ int main(int argc, char** argv) {
   }
 
   if (display_version) {
-    std::cout << "TensorFlow ModelServer: 2.0.0" << "\n"
+    std::cout << "TensorFlow ModelServer: 2.1.0" << "\n"
               << "TensorFlow Library: " << TF_Version() << "\n"
               << "TFS_ARM Rev: 1 (" << cBUILD_SCM_REV_STAMP << ")\n";
     return 0;

Diff for: third_party/serving/BUILD

@@ -12,13 +12,10 @@ build:common_arm --define=tensorflow_mkldnn_contraction_kernel=0
 
 build:linux_amd64 --define=CURL_OS=x86_64-linux-gnu
 build:linux_amd64 --define=CURL_SIZEOF_LONG=8
-build:linux_amd64 --define=HWLOC_SIZEOF_UNSIGNED_LONG=8
 
 build:linux_arm64 --define=CURL_OS=aarch64-linux-gnu
 build:linux_arm64 --define=CURL_SIZEOF_LONG=8
-build:linux_arm64 --define=HWLOC_SIZEOF_UNSIGNED_LONG=8
 
 build:linux_arm --copt=-Wno-narrowing
 build:linux_arm --define=CURL_OS=arm-linux-gnueabihf
 build:linux_arm --define=CURL_SIZEOF_LONG=4
-build:linux_arm --define=HWLOC_SIZEOF_UNSIGNED_LONG=4

Diff for: third_party/serving/apis.BUILD.patch

@@ -1,6 +1,6 @@
---- tensorflow/BUILD	2020-01-06 12:50:31.290658479 -0800
-+++ BUILD.new	2020-01-06 12:51:03.351222470 -0800
-@@ -112,7 +112,7 @@
+--- tensorflow/BUILD	2020-01-14 21:22:22.111062733 -0800
++++ BUILD.new	2020-01-14 21:22:55.755332837 -0800
+@@ -141,7 +141,7 @@
      name = "raspberry_pi_armeabi",
      values = {
          "crosstool_top": "@local_config_arm_compiler//:toolchain",

Diff for: third_party/serving/oss.BUILD.patch

@@ -1,13 +1,5 @@
 --- third_party/curl.BUILD	2019-10-18 14:46:08.200439000 -0700
 +++ curl.BUILD.new	2019-10-18 14:52:09.320557509 -0700
-@@ -280,7 +280,6 @@
-             "-DCURL_DISABLE_NTLM",  # turning it off in configure is not enough
-             "-DHAVE_LIBZ",
-             "-DHAVE_ZLIB_H",
--            "-Wno-string-plus-int",
-         ],
-     }) + select({
-         "@org_tensorflow//tensorflow:macos": [
 @@ -505,7 +504,7 @@
          "#  define HAVE_RAND_STATUS 1",
          "#  define HAVE_SSL_GET_SHUTDOWN 1",

Diff for: third_party/tensorflow/.bazelrc

@@ -35,7 +35,7 @@ fi
 
 # project vars
 
-echo "UPSTREAM_TFS_VERSION 2.0.0"
+echo "UPSTREAM_TFS_VERSION 2.1.0"
 echo "PROJECT_REGISTRY_PREFIX $PROJECT_REGISTRY_PREFIX"
 echo "PROJECT_GIT_BRANCH $PROJECT_GIT_BRANCH"
 echo "PROJECT_GIT_COMMIT $PROJECT_GIT_COMMIT"