minor readme and publish.sh updates

publish.sh now uses upstream tf serving version from wsc.sh

add arm arch variant to manifest

fix up arm image metadata

Author: emacski

Diff for: README.md

@@ -1,21 +1,22 @@
 TensorFlow Serving on ARM
 =========================
 
-TensorFlow Serving cross-compile project targeting linux on common ARM cores from
-a linux x86_64 host.
+TensorFlow Serving cross-compile project targeting linux on common arm cores from
+a linux amd64 (x86_64) host.
 
 ## Overview
 
 **Upstream Project:** [tensorflow/serving](https://github.com/tensorflow/serving)
 
 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 the project targeting common
-linux arm platforms. A set of docker images are also maintained that support some
-of the most popular linux arm platforms.
+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 Hub.
 
 ## The Docker Images
 
-**Hosted on DockerHub:** [emacski/tensorflow-serving](https://hub.docker.com/r/emacski/tensorflow-serving)
+**Hosted on Docker Hub:** [emacski/tensorflow-serving](https://hub.docker.com/r/emacski/tensorflow-serving)
 
 ### Images
 
@@ -166,9 +167,9 @@ For `linux_arm` options see: https://gcc.gnu.org/onlinedocs/gcc-8.3.0/gcc/ARM-Op
 
 Example building an image tuned for Cortex-A72
 ```bash
-bazel build //tensorflow_model_server:image --config=linux_arm64 \
+bazel build //tensorflow_model_server:image.tar --config=linux_arm64 \
     --copt=-mtune=cortex-a72
-# resulting image tar: bazel-bin/tensorflow_model_server/image-layer.tar
+# resulting image tar: bazel-bin/tensorflow_model_server/image.tar
 ```
 
 ## Disclaimer

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

@@ -0,0 +1,38 @@
+#!/usr/bin/env sh
+# Copyright 2019 Erik Maciejewski
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# quick and dirty script to fix image arch in configs
+# note this sript relies on jq (apt-get install jq)
+
+set -e
+
+work_dir=".image_arch_fix"
+image=$1
+platform=$2
+
+os="$(echo $platform | cut -d '_' -f1)"
+arch="$(echo $platform | cut -d '_' -f2)"
+
+mkdir -p $work_dir
+cd $work_dir
+docker save $image -o image.tar
+tar -xvf image.tar
+rm image.tar
+config=$(jq -r '.[0].Config' manifest.json)
+sed -i "s/amd64/$arch/g" $config
+tar -cvf image.tar .
+docker load -i image.tar
+cd ..
+rm -rf $work_dir

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

@@ -15,17 +15,14 @@
 
 set -e
 
-if [ -z "$1" ]; then
-    echo "error: version must be specified"
-    exit 1
-fi
-
-UPSTREAM_TFS_VERSION="$1"
+# this script must be run in the top-level project dir
 
 if [ -z "$PROJECT_REGISTRY_PREFIX" ]; then
     PROJECT_REGISTRY_PREFIX="emacski/tensorflow-serving"
 fi
 
+UPSTREAM_TFS_VERSION=$(echo -n $(./tools/wsc.sh | head -n 1 | cut -d ' ' -f 2))
+
 PROJECT_PLATFORMS="linux_amd64_avx_sse4.2 linux_arm64_armv8-a linux_arm64_armv8.2-a linux_arm_armv7-a_neon_vfpv3 linux_arm_armv7-a_neon_vfpv4"
 
 GENERIC_PLATFORMS="linux_amd64 linux_arm64 linux_arm"
@@ -41,6 +38,10 @@ publish_platform_bundle() {
     local manifest=$1; local platforms="$2"
     # push platform image bundle
     for platform in $platforms; do
+        # quick and dirty image arch metadata fix for arm images
+        if [ $platform = "linux_arm64" ] || [ $platform = "linux_arm" ]; then
+            tensorflow_model_server/tools/ci/image_arch_fix.sh $manifest-$platform $platform
+        fi
         docker push $manifest-$platform
     done
     # create and push manifest for arch image bundle
@@ -52,7 +53,14 @@ publish_platform_bundle() {
     for platform in $platforms; do
         os="$(echo $platform | cut -d '_' -f1)"
         arch="$(echo $platform | cut -d '_' -f2)"
-        docker manifest annotate --arch $arch --os $os $manifest $manifest-$platform
+        if_variant=""
+        if [ $arch = "arm64" ]; then
+            if_variant="--variant v8"
+        fi
+        if [ $arch = "arm" ]; then
+            if_variant="--variant v7"
+        fi
+        docker manifest annotate --arch $arch $if_variant --os $os $manifest $manifest-$platform
     done
     docker manifest push --purge $manifest
 }