update tensorflow serving to version 2.0.0

update main.cc and incorporate upstream changes

update project workspace dependencies

add debug docker image targets with busybox utils

update bazel to version 2.0.0

remove legacy gcc based cross build bazel toolchain

readme updates

Author: emacski

Diff for: .bazelrc

@@ -3,6 +3,8 @@ build --verbose_failures
 
 # enable proper toolchain resolution for cc rules
 build --incompatible_enable_cc_toolchain_resolution
+# jpeg transient dep is using nocopts
+build --noincompatible_disable_nocopts
 
 build --workspace_status_command=/proc/self/cwd/tools/wsc.sh
 
@@ -25,7 +27,6 @@ import %workspace%/third_party/tensorflow/.bazelrc
 build:linux_amd64 --platforms=//platforms:linux_amd64
 
 build:linux_amd64_avx_sse4.2 --config=linux_amd64
-build:linux_amd64_avx_sse4.2 --platform_suffix=-linux_amd64_avx_sse4.2
 build:linux_amd64_avx_sse4.2 --copt=-mavx
 build:linux_amd64_avx_sse4.2 --copt=-msse4.2
 
@@ -48,26 +49,21 @@ build:linux_arm64 --platforms=//platforms:linux_arm64
 build:linux_arm64 --copt=-march=armv8-a
 
 build:linux_arm64_armv8-a --config=linux_arm64
-build:linux_arm64_armv8-a --platform_suffix=-linux_arm64_armv8-a
 
 build:linux_arm64_armv8.2-a --config=linux_arm64
-build:linux_arm64_armv8.2-a --platform_suffix=-linux_arm64_armv8.2-a
 build:linux_arm64_armv8.2-a --copt=-march=armv8.2-a
 
 # linux_arm
 
 # linux_arm base config group. use this config when cross-building for
 # custom 32 bit arm targets (i.e. ones not defined here)
 build:linux_arm --config=common_arm
-build:linux_arm --cpu=armeabi
+build:linux_arm --cpu=arm
 build:linux_arm --platforms=//platforms:linux_arm
 build:linux_arm --copt=-march=armv7-a
-build:linux_arm --copt=-Wno-c++11-narrowing
 
 build:linux_arm_armv7-a_neon_vfpv4 --config=linux_arm
-build:linux_arm_armv7-a_neon_vfpv4 --platform_suffix=-linux_arm_armv7-a_neon_vfpv4
 build:linux_arm_armv7-a_neon_vfpv4 --copt=-mfpu=neon-vfpv4
 
 build:linux_arm_armv7-a_neon_vfpv3 --config=linux_arm
-build:linux_arm_armv7-a_neon_vfpv3 --platform_suffix=-linux_arm_armv7-a_neon_vfpv3
 build:linux_arm_armv7-a_neon_vfpv3 --copt=-mfpu=neon-vfpv3

Diff for: README.md

@@ -33,7 +33,7 @@ Docker Hub.
 Example
 ```bash
 # on beaglebone black
-docker pull emacski/tensorflow-serving:1.15.0-linux_arm_armv7-a_neon_vfpv3
+docker pull emacski/tensorflow-serving:2.0.0-linux_arm_armv7-a_neon_vfpv3
 ```
 
 ### Aliases
@@ -52,7 +52,7 @@ docker pull emacski/tensorflow-serving:1.15.0-linux_arm_armv7-a_neon_vfpv3
 Example
 ```bash
 # on Raspberry PI 3 B+
-docker pull emacski/tensorflow-serving:1.15.0-linux_arm64
+docker pull emacski/tensorflow-serving:2.0.0-linux_arm64
 # or
 docker pull emacski/tensorflow-serving:latest-linux_arm64
 ```
@@ -84,11 +84,40 @@ docker pull emacski/tensorflow-serving
 | <nobr>`emacski/tensorflow-serving:[Version]-linux_amd`</nobr> | `linux` | `amd64` |
 
 Example
-```bash
+```sh
 # on Raspberry PI 3 B+
-docker pull emacski/tensorflow-serving:1.15.0
-# the actual image used is emacski/tensorflow-serving:1.15.0-linux_arm64
-# itself actually being emacski/tensorflow-serving:1.15.0-linux_arm64_armv8-a
+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
+```
+
+### Debug Images
+
+As of version 2.0.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.
+
+For any image above, add `debug` after the `[Version]` and before the platform
+suffix (if one is required) in the image tag.
+
+Examples
+```sh
+# multi-arch
+docker pull emacski/tensorflow-serving:2.0.0-debug
+# specific image
+docker pull emacski/tensorflow-serving:2.0.0-debug-linux_arm64_armv8-a
+# specific alias
+docker pull emacski/tensorflow-serving:latest-debug-linux_arm64
+```
+
+```sh
+# start a new container with an interactive ash (busybox) shell
+docker run -ti --entrypoint /busybox/bin/sh emacski/tensorflow-serving:latest-debug-linux_arm64
+# with an interactive dash (system) shell
+docker run -ti --entrypoint sh emacski/tensorflow-serving:latest-debug-linux_arm64
+# start an interactive ash shell in a running debug container
+docker exec -ti my_running_container /busybox/bin/sh
 ```
 
 ## Building from Source
@@ -149,7 +178,7 @@ bazel run //tensorflow_model_server:linux_arm_armv7-a_neon_vfpv4 --config=linux_
 to be available on the host automatically.
 
 #### Build Project Binaries
-It's not recommended to use these binaries as standalne executables as they are built specifically to run in their respective containers.
+It's not recommended to use these binaries as standalone executables as they are built specifically to run in their respective containers.
 ```bash
 bazel build //tensorflow_model_server --config=linux_amd64_avx_sse4.2
 bazel build //tensorflow_model_server --config=linux_arm64_armv8-a

Diff for: WORKSPACE

@@ -42,9 +42,9 @@ http_archive(
 # https://github.com/bazelbuild/rules_docker
 http_archive(
     name = "io_bazel_rules_docker",
-    sha256 = "14ac30773fdb393ddec90e158c9ec7ebb3f8a4fd533ec2abbfd8789ad81a284b",
-    strip_prefix = "rules_docker-0.12.1",
-    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.12.1/rules_docker-v0.12.1.tar.gz"],
+    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"],
 )
 
 load("@io_bazel_rules_docker//repositories:repositories.bzl", container_repos = "repositories")
@@ -61,23 +61,24 @@ container_deps()
 http_archive(
     name = "org_tensorflow",
     patches = [
+        "//third_party/tensorflow:BUILD.patch",
         "//third_party/tensorflow:curl.BUILD.patch",
         "//third_party/tensorflow:hwloc.BUILD.bazel.patch",
     ],
-    sha256 = "750186951a699cb73d6b440c7cd06f4b2b80fd3ebb00cbe00f655c7da4ae243e",
-    strip_prefix = "tensorflow-590d6eef7e91a6a7392c8ffffb7b58f2e0c8bc6b",
+    sha256 = "b38de3408a4190246f2814dd7388cec72807b736fbcef5087e3b86a3f179bb0f",
+    strip_prefix = "tensorflow-64c3d382cadf7bbe8e7e99884bede8284ff67f56",
     urls = [
-        "https://github.com/tensorflow/tensorflow/archive/590d6eef7e91a6a7392c8ffffb7b58f2e0c8bc6b.tar.gz",
+        "https://github.com/tensorflow/tensorflow/archive/64c3d382cadf7bbe8e7e99884bede8284ff67f56.tar.gz",
     ],
 )
 
 # see tensorflow/serving/WORKSPACE
 http_archive(
     name = "io_bazel_rules_closure",
-    sha256 = "ddce3b3a3909f99b28b25071c40b7fec7e2e1d1d1a4b2e933f3082aa99517105",
-    strip_prefix = "rules_closure-316e6133888bfc39fb860a4f1a31cfcbae485aef",
+    sha256 = "5b00383d08dd71f28503736db0500b6fb4dda47489ff5fc6bed42557c07c6ba9",
+    strip_prefix = "rules_closure-308b05b2419edb5c8ee0471b67a40403df940149",
     urls = [
-        "https://github.com/bazelbuild/rules_closure/archive/316e6133888bfc39fb860a4f1a31cfcbae485aef.tar.gz",
+        "https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz",
     ],
 )
 
@@ -88,11 +89,11 @@ http_archive(
     patches = [
         "//third_party/tensorflow:nsync.BUILD.patch",
     ],
-    sha256 = "caf32e6b3d478b78cff6c2ba009c3400f8251f646804bcb65465666a9cea93c4",
-    strip_prefix = "nsync-1.22.0",
+    sha256 = "704be7f58afa47b99476bbac7aafd1a9db4357cef519db361716f13538547ffd",
+    strip_prefix = "nsync-1.20.2",
     urls = [
-        "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",
+        "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",
     ],
 )
 
@@ -114,11 +115,12 @@ http_archive(
     name = "tf_serving",
     patches = [
         "//third_party/serving:apis.BUILD.patch",
+        "//third_party/serving:oss.BUILD.patch",
     ],
-    sha256 = "4ad265afb5b7a5cfa38e374a6d7a2f8fcb25b5222ac0c413dbc04cd00a3499c0",
-    strip_prefix = "serving-1.15.0",
+    sha256 = "52e2dfed08c185d0fb9da9454063dac053f0889118b38e818b74631ea1b06ebe",
+    strip_prefix = "serving-2.0.0",
     urls = [
-        "https://github.com/tensorflow/serving/archive/1.15.0.tar.gz",
+        "https://github.com/tensorflow/serving/archive/2.0.0.tar.gz",
     ],
 )
 
@@ -202,7 +204,7 @@ container_pull(
 )
 
 container_pull(
-    name = "discolix_cc_debug_linux_amd64",
+    name = "discolix_cc_linux_amd64_debug",
     digest = "sha256:cdf4fd88dcc9cae6508084b50b7aa1e7834a065426b99989cebc6982de67db77",
     registry = "index.docker.io",
     repository = "discolix/cc",
@@ -220,7 +222,7 @@ container_pull(
 )
 
 container_pull(
-    name = "discolix_cc_debug_linux_arm64",
+    name = "discolix_cc_linux_arm64_debug",
     digest = "sha256:f6e3d0c9b57c3924cab2f891e8f077f4f1390388fb3ca08eec5c85c7681ffcc2",
     registry = "index.docker.io",
     repository = "discolix/cc",
@@ -238,7 +240,7 @@ container_pull(
 )
 
 container_pull(
-    name = "discolix_cc_debug_linux_arm",
+    name = "discolix_cc_linux_arm_debug",
     digest = "sha256:4fb7463db2391762742fcbf8acbf8a5e0c251b7aa2eb8f83cf4e626c907a0394",
     registry = "index.docker.io",
     repository = "discolix/cc",

Diff for: tensorflow_model_server/BUILD

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@bazel_skylib//lib:selects.bzl", "selects")
 load(
     "@io_bazel_rules_docker//container:container.bzl",
     "container_bundle",
@@ -77,26 +76,6 @@ config_setting(
     ],
 )
 
-config_setting(
-    name = "debug",
-    define_values = {"image": "debug"},
-)
-
-selects.config_setting_group(
-    name = "linux_arm_debug",
-    match_all = [":linux_arm", ":debug"],
-)
-
-selects.config_setting_group(
-    name = "linux_arm64_debug",
-    match_all = [":linux_arm64", ":debug"],
-)
-
-selects.config_setting_group(
-    name = "linux_amd64_debug",
-    match_all = [":linux_amd64", ":debug"],
-)
-
 container_layer(
     name = "dash",
     debs = select({
@@ -106,15 +85,12 @@ container_layer(
     }),
 )
 
-container_image(
-    name = "image",
+[container_image(
+    name = "image" + suffix,
     base = select({
-        ":linux_arm": "@discolix_cc_linux_arm//image",
-        ":linux_arm64": "@discolix_cc_linux_arm64//image",
-        ":linux_amd64": "@discolix_cc_linux_amd64//image",
-        ":linux_arm_debug": "@discolix_cc_debug_linux_arm//image",
-        ":linux_arm64_debug": "@discolix_cc_debug_linux_arm64//image",
-        ":linux_amd64_debug": "@discolix_cc_debug_linux_amd64//image",
+        ":linux_arm": "@discolix_cc_linux_arm" + suffix + "//image",
+        ":linux_arm64": "@discolix_cc_linux_arm64" + suffix + "//image",
+        ":linux_amd64": "@discolix_cc_linux_amd64" + suffix + "//image",
     }),
     directory = "/usr/bin/",
     entrypoint = ["tf_serving_entrypoint.sh"],
@@ -132,11 +108,12 @@ container_image(
         "8501",
     ],
     stamp = True,
-)
+) for suffix in ("", "_debug")]
 
-# these targets only serve to give a project ":image" a fully qualified docker
-# image name and should always be accompanied by their respective config group like:
+# these targets only serve to generate publishable images with fully qualified docker
+# image names and should always be accompanied by their respective config group like:
 # bazel run //tensorflow_model_server:linux_arm64_armv8-a --config=linux_arm64_armv8-a
+
 [container_bundle(
     name = tag,
     images = {"{PROJECT_REGISTRY_PREFIX}:{UPSTREAM_TFS_VERSION}-" + tag: ":image"},
@@ -147,3 +124,14 @@ container_image(
     "linux_arm64_armv8-a",
     "linux_amd64_avx_sse4.2",
 ]]
+
+[container_bundle(
+    name = tag,
+    images = {"{PROJECT_REGISTRY_PREFIX}:{UPSTREAM_TFS_VERSION}-" + tag: ":image_debug"},
+) for tag in [
+    "debug-linux_arm_armv7-a_neon_vfpv4",
+    "debug-linux_arm_armv7-a_neon_vfpv3",
+    "debug-linux_arm64_armv8.2-a",
+    "debug-linux_arm64_armv8-a",
+    "debug-linux_amd64_avx_sse4.2",
+]]

Diff for: tensorflow_model_server/main.cc

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

Diff for: tensorflow_model_server/tools/ci/bazel.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 # Copyright 2019 Erik Maciejewski
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

Diff for: tensorflow_model_server/tools/ci/image_arch_fix.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 # Copyright 2019 Erik Maciejewski
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

Diff for: tensorflow_model_server/tools/ci/publish.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 # Copyright 2019 Erik Maciejewski
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -85,7 +85,27 @@ publish_platform_bundle "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION" "$GENER
 retag_platform_bundle "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION" "$PROJECT_REGISTRY_PREFIX:latest" "$GENERIC_PLATFORMS"
 publish_platform_bundle "$PROJECT_REGISTRY_PREFIX:latest" "$GENERIC_PLATFORMS"
 
-# push any changes to the build image
+# debug images
+
+for platform in $PROJECT_PLATFORMS; do
+    image_prefix="$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-debug"
+    # quick and dirty image arch metadata fix for arm images
+    tensorflow_model_server/tools/ci/image_arch_fix.sh $image_prefix-$platform $platform
+    docker push "$image_prefix-$platform"
+done
+
+# debug aliases and manifest lists
+
+docker tag "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-debug-linux_amd64_avx_sse4.2" "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-debug-linux_amd64"
+docker tag "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-debug-linux_arm64_armv8-a" "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-debug-linux_arm64"
+docker tag "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-debug-linux_arm_armv7-a_neon_vfpv4" "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-debug-linux_arm"
+
+publish_platform_bundle "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-debug" "$GENERIC_PLATFORMS"
+
+retag_platform_bundle "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-debug" "$PROJECT_REGISTRY_PREFIX:latest-debug" "$GENERIC_PLATFORMS"
+publish_platform_bundle "$PROJECT_REGISTRY_PREFIX:latest-debug" "$GENERIC_PLATFORMS"
+
+# build image
 docker tag "$PROJECT_REGISTRY_PREFIX:latest-devel" "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-devel"
 docker push $PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-devel
 docker push $PROJECT_REGISTRY_PREFIX:latest-devel

Diff for: tensorflow_model_server/tools/docker/Dockerfile

@@ -36,7 +36,7 @@ RUN apt-get update && \
     apt-get install -y zip unzip && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
-ENV INSTALL_BAZEL_VERSION=1.2.0
+ENV INSTALL_BAZEL_VERSION=2.0.0
 RUN curl -L https://github.com/bazelbuild/bazel/releases/download/${INSTALL_BAZEL_VERSION}/bazel-${INSTALL_BAZEL_VERSION}-installer-linux-x86_64.sh \
         -o bazel-${INSTALL_BAZEL_VERSION}-installer-linux-x86_64.sh && \
     chmod +x bazel-${INSTALL_BAZEL_VERSION}-installer-linux-x86_64.sh && \

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

@@ -0,0 +1,8 @@
+--- tensorflow_serving/session_bundle/oss/BUILD	2020-01-05 18:48:02.876576508 -0800
++++ oss.BUILD.new	2020-01-05 18:49:09.017713023 -0800
+@@ -1,4 +1,4 @@
+-load("@org_tensorflow//tensorflow/core:platform/default/build_config.bzl", "tf_proto_library")
++load("@org_tensorflow//tensorflow/core/platform:default/build_config.bzl", "tf_proto_library")
+ load("//tensorflow_serving:oss_or_google.bzl", "oss_only_cc_test")
+
+ licenses(["notice"])  # Apache 2.0

Diff for: third_party/tensorflow/.bazelrc

@@ -7,7 +7,6 @@ build --define=grpc_no_ares=true
 build --define=use_fast_cpp_protos=true
 build --define=allow_oversize_protos=true
 
-build:common_arm --copt=-DARM_NON_MOBILE
 build:common_arm --copt=-DRASPBERRY_PI
 build:common_arm --define=tensorflow_mkldnn_contraction_kernel=0
 
@@ -20,7 +19,6 @@ 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=raspberry_pi_with_neon=true
 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