move and rename bazel rc file, upstream location changed

update aws client lib patch based on upstream changes
move libevent build file override, upstream location changed
udpate file overrides in dockerfile

Author: emacski

tools/bazel.rc renamed to .bazelrc

@@ -31,7 +31,7 @@ build --define=grpc_no_ares=true
 
 build -c opt
 
-# Adding --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0 creates parity with TF
+# Adding --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0" creates parity with TF
 # compilation options. It also addresses memory use due to
 # copy-on-write semantics of std::strings of the older ABI.
 build --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0

WORKSPACE

@@ -11,11 +11,13 @@ load("//tensorflow_serving:repo.bzl", "tensorflow_http_archive")
 
 tensorflow_http_archive(
     name = "org_tensorflow",
-    sha256 = "5aae44f967556dc524e6b184643bbd33a2d78184bc654b72c09f041f266b89a2",
-    git_commit = "a6d8ffae097d0132989ae4688d224121ec6d8f35",
-    patches = ["aws.BUILD.patch"]
+    sha256 = "9345658274058773f34a8865fba14b9fdd3c1c4cb3eaf44dbb7f6c01632ee830",
+    git_commit = "6612da89516247503f03ef76e974b51a434fb52e",
+    patches = ["aws.BUILD.bazel.patch"]
 )
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 # TensorFlow depends on "io_bazel_rules_closure" so we need this here.
 # Needs to be kept in sync with the same target in TensorFlow's WORKSPACE file.
 http_archive(
@@ -36,4 +38,4 @@ tf_serving_workspace()
 # Specify the minimum required bazel version.
 load("@org_tensorflow//tensorflow:version_check.bzl", "check_bazel_version_at_least")
 
-check_bazel_version_at_least("0.15.0")
+check_bazel_version_at_least("0.20.0")

external/aws.BUILD.patch renamed to external/aws.BUILD.bazel.patch

@@ -1,7 +1,7 @@
---- third_party/aws.BUILD	2018-09-24 10:49:26.000000000 -0700
-+++ aws.BUILD	2018-10-30 12:41:38.000000000 -0700
+--- third_party/aws/BUILD.bazel	2019-03-29 13:04:47.000000000 -0700
++++ aws.BUILD.bazel	2019-03-29 13:10:11.000000000 -0700
 @@ -11,21 +11,8 @@
- 
+
  cc_library(
      name = "aws",
 -    srcs = select({

tensorflow_serving/repo.bzl

@@ -1,6 +1,6 @@
 """ TensorFlow Http Archive
 
-Modified http_arhive that allows us to override the TensorFlow commit that is
+Modified http_archive that allows us to override the TensorFlow commit that is
 downloaded by setting an environment variable. This override is to be used for
 testing purposes.
 

tensorflow_serving/tools/docker/Dockerfile.arm

@@ -15,27 +15,27 @@ ARG ARCH=arm64v8
 ARG TFS_VERSION=latest
 FROM tensorflow/serving:$TFS_VERSION-devel as devel
 # install arm toolchain dependencies
+ENV TF_ENABLE_XLA=0
 COPY tensorflow_serving/tools/docker/install_arm_toolchain.sh /install_arm_toolchain.sh
 RUN /install_arm_toolchain.sh
 # overwrite existing sources
 # adds config groupings with default options for arm32v7 and arm64v8
-COPY tools/bazel.rc /tensorflow-serving/tools/bazel.rc
-# uses bazelrc make variables to get arch specific flags
-COPY third_party/libevent.BUILD /tensorflow-serving/third_party/libevent.BUILD
+COPY .bazelrc /tensorflow-serving/.bazelrc
+# uses bazelrc make variables to get arch specific compile flags
+COPY third_party/libevent/BUILD /tensorflow-serving/third_party/libevent/BUILD
 # implements bazel external source patching for aws client libs
 COPY WORKSPACE /tensorflow-serving/WORKSPACE
 COPY tensorflow_serving/repo.bzl /tensorflow-serving/tensorflow_serving/repo.bzl
-COPY external/aws.BUILD.patch /tensorflow-serving/external/aws.BUILD.patch
-# backport upstream patch for gzip implementation causing build failures for 32-bit
-COPY tensorflow_serving/util/net_http/server/internal/evhttp_request.cc /tensorflow-serving/tensorflow_serving/util/net_http/server/internal/evhttp_request.cc
+COPY external/aws.BUILD.bazel.patch /tensorflow-serving/external/aws.BUILD.bazel.patch
 # add new sources
 # adds bazel C++ toolchains for armhf and arm64
 COPY tools/cpp /tensorflow-serving/tools/cpp
 
 FROM devel as build
 ARG ARCH
 ARG BUILD_OPTS
-RUN bazel build --verbose_failures --config=${ARCH} ${BUILD_OPTS} tensorflow_serving/model_servers:tensorflow_model_server
+RUN bazel build --verbose_failures --output_filter=DONT_MATCH_ANYTHING --config=${ARCH} \
+  ${BUILD_OPTS} tensorflow_serving/model_servers:tensorflow_model_server
 
 FROM ${ARCH}/debian:stretch-slim as tensorflow_model_server
 # Install TF Serving binary