consolidate bazel platform targets

update main.cc with latest from tensorflow/serving

minor readme updates

minor updates to .bazelrc to suppress noisy build warning output

Author: emacski

Diff for: .bazelrc

@@ -14,6 +14,10 @@ build --copt=-O3
 build --cxxopt=-std=c++14
 build --host_cxxopt=-std=c++14
 
+# disable diagnostics warning outputs for release builds
+build:release --copt=-w
+build:release --output_filter=DONT_MATCH_ANYTHING
+
 # build with shared gnu libstdc++ instead of static libc++
 build:gnulibcpp --//tools/cpp/clang:use_libcpp="libstdc++"
 build:gnulibcpp --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0
@@ -26,7 +30,7 @@ import %workspace%/third_party/tensorflow/.bazelrc
 
 # linux_amd64 base config group. use this config when cross-building
 # for custom amd64 targets (i.e. ones not defined here)
-build:linux_amd64 --platforms=//platforms:linux_amd64
+build:linux_amd64 --platforms=//:linux_amd64
 
 build:linux_amd64_avx_sse4.2 --config=linux_amd64
 build:linux_amd64_avx_sse4.2 --copt=-mavx
@@ -48,7 +52,7 @@ build:common_arm --copt=-fomit-frame-pointer
 # for custom 64 bit arm targets (i.e. ones not defined here)
 build:linux_arm64 --config=common_arm
 build:linux_arm64 --cpu=aarch64
-build:linux_arm64 --platforms=//platforms:linux_arm64
+build:linux_arm64 --platforms=//:linux_arm64
 build:linux_arm64 --copt=-march=armv8-a
 
 build:linux_arm64_armv8-a --config=linux_arm64
@@ -64,7 +68,7 @@ build:linux_arm64_armv8.2-a --define=tag_suffix=linux_arm64_armv8.2-a
 # custom 32 bit arm targets (i.e. ones not defined here)
 build:linux_arm --config=common_arm
 build:linux_arm --cpu=arm
-build:linux_arm --platforms=//platforms:linux_arm
+build:linux_arm --platforms=//:linux_arm
 build:linux_arm --copt=-march=armv7-a
 
 build:linux_arm_armv7-a_neon_vfpv4 --config=linux_arm

Diff for: BUILD

@@ -1,2 +1,41 @@
-# only serves to make the workspace root a bazel package as rules_docker, or one
-# of it's dependencies, needs to reference WORKSPACE by label (//:WORKSPACE)
+# Copyright 2020 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.
+
+# this build file serves to make the workspace root a bazel package so that
+# WORKSPACE can be referenceby label (//:WORKSPACE) regardless if any build
+# targets are defined here
+
+platform(
+    name = "linux_amd64",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+    ],
+)
+
+platform(
+    name = "linux_arm64",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:aarch64",
+    ],
+)
+
+platform(
+    name = "linux_arm",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:arm",
+    ],
+)

Diff for: README.md

@@ -37,7 +37,7 @@ 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.2.0
+docker pull emacski/tensorflow-serving:2.3.0
 ```
 
 Refer to [TensorFlow Serving with Docker](https://www.tensorflow.org/tfx/serving/docker)
@@ -58,7 +58,7 @@ for configuration and setting up a model for serving.
 Example
 ```bash
 # on beaglebone black
-docker pull emacski/tensorflow-serving:2.2.0-linux_arm_armv7-a_neon_vfpv3
+docker pull emacski/tensorflow-serving:2.3.0-linux_arm_armv7-a_neon_vfpv3
 ```
 
 ### Aliases
@@ -77,7 +77,7 @@ docker pull emacski/tensorflow-serving:2.2.0-linux_arm_armv7-a_neon_vfpv3
 Examples
 ```bash
 # on Raspberry PI 3 B+
-docker pull emacski/tensorflow-serving:2.2.0-linux_arm64
+docker pull emacski/tensorflow-serving:2.3.0-linux_arm64
 # or
 docker pull emacski/tensorflow-serving:latest-linux_arm64
 ```
@@ -113,9 +113,9 @@ docker pull emacski/tensorflow-serving:latest
 Example
 ```sh
 # on Raspberry PI 3 B+
-docker pull emacski/tensorflow-serving:2.2.0
-# the actual image used is emacski/tensorflow-serving:2.2.0-linux_arm64
-# itself actually being emacski/tensorflow-serving:2.2.0-linux_arm64_armv8-a
+docker pull emacski/tensorflow-serving:2.3.0
+# the actual image used is emacski/tensorflow-serving:2.3.0-linux_arm64
+# itself actually being emacski/tensorflow-serving:2.3.0-linux_arm64_armv8-a
 ```
 
 ### Debug Images
@@ -130,9 +130,9 @@ suffix (if one is required) in the image tag.
 
 ```sh
 # multi-arch
-docker pull emacski/tensorflow-serving:2.2.0-debug
+docker pull emacski/tensorflow-serving:2.3.0-debug
 # specific image
-docker pull emacski/tensorflow-serving:2.2.0-debug-linux_arm64_armv8-a
+docker pull emacski/tensorflow-serving:2.3.0-debug-linux_arm64_armv8-a
 # specific alias
 docker pull emacski/tensorflow-serving:latest-debug-linux_arm64
 ```

Diff for: platforms/BUILD

@@ -192,11 +192,13 @@ int main(int argc, char** argv) {
           &options.remove_unused_fields_from_bundle_metagraph,
           "Removes unused fields from MetaGraphDef proto message to save "
           "memory."),
-      tensorflow::Flag("use_tflite_model", &options.use_tflite_model,
-                       "EXPERIMENTAL; CAN BE REMOVED ANYTIME! Load and use "
-                       "TensorFlow Lite model from `model.tflite` file in "
-                       "SavedModel directory instead of the TensorFlow model "
-                       "from `saved_model.pb` file.")};
+      tensorflow::Flag("prefer_tflite_model", &options.prefer_tflite_model,
+                       "EXPERIMENTAL; CAN BE REMOVED ANYTIME! "
+                       "Prefer TensorFlow Lite model from `model.tflite` file "
+                       "in SavedModel directory, instead of the TensorFlow "
+                       "model from `saved_model.pb` file. "
+                       "If no TensorFlow Lite model found, fallback to "
+                       "TensorFlow model.")};
 
   const auto& usage = tensorflow::Flags::Usage(argv[0], flag_list);
   if (!tensorflow::Flags::Parse(&argc, argv, flag_list)) {

Diff for: tensorflow_model_server/main.cc

@@ -20,7 +20,7 @@
 -        if_false = _INCLUDE_PRIVATE_HWLOC_AUTOIGEN_CONFIG_H_LINUX_SUBS,
 -    ),
 +    substitutions = select({
-+        "@//platforms:is_linux_arm": _INCLUDE_PRIVATE_HWLOC_AUTOIGEN_CONFIG_H_LINUX_ARMV7_SUBS,
++        "@//tensorflow_model_server:linux_arm": _INCLUDE_PRIVATE_HWLOC_AUTOIGEN_CONFIG_H_LINUX_ARMV7_SUBS,
 +        "//conditions:default": _INCLUDE_PRIVATE_HWLOC_AUTOIGEN_CONFIG_H_LINUX_SUBS,
 +    }),
  )