update cross-compile toolchain to clang 11

update workspace dependencies to latest

update libevent BUILD file with updated toolchain capabilities

remove project local platform definitions in favor of using platforms
defined by the bazel-tools project

Author: emacski

Diff for: .bazelrc

@@ -1,5 +1,5 @@
 # upstream tensorflow/serving version
-build --embed_label=2.4.1
+build --embed_label=2.5.0
 
 common --experimental_repo_remote_exec
 
@@ -30,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=//:linux_amd64
+build:linux_amd64 --platforms=@com_github_emacski_bazeltools//platform:linux_amd64
 
 build:linux_amd64_avx_sse4.2 --config=linux_amd64
 build:linux_amd64_avx_sse4.2 --copt=-mavx
@@ -41,7 +41,7 @@ build:linux_amd64_avx_sse4.2 --define=tag_suffix=linux_amd64_avx_sse4.2
 
 # this config group should not be invoked directly on the command-line
 # TODO: remove legacy crosstool when tf supports toolchain resolution
-build:common_arm --crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
+build:common_arm --crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:clang11_crosstool
 build:common_arm --copt=-funsafe-math-optimizations
 build:common_arm --copt=-ftree-vectorize
 build:common_arm --copt=-fomit-frame-pointer
@@ -52,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=//:linux_arm64
+build:linux_arm64 --platforms=@com_github_emacski_bazeltools//platform:linux_arm64
 build:linux_arm64 --copt=-march=armv8-a
 
 build:linux_arm64_armv8-a --config=linux_arm64
@@ -68,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=//:linux_arm
+build:linux_arm --platforms=@com_github_emacski_bazeltools//platform:linux_arm
 build:linux_arm --copt=-march=armv7-a
 
 build:linux_arm_armv7-a_neon_vfpv4 --config=linux_arm

Diff for: BUILD

@@ -1,41 +1 @@
-# 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 referenced by 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",
-    ],
-)
+# intentionally blank

Diff for: WORKSPACE

@@ -18,19 +18,24 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"
 
 http_archive(
     name = "com_github_emacski_bazeltools",
-    sha256 = "ac040d00f7f00c9947d61c7b8970a877d907c92e088966c24a0eaeeba5551b19",
-    strip_prefix = "bazel-tools-250e4a98908fa0c6631ebccdeae930a60fd4c0d5",
-    urls = ["https://github.com/emacski/bazel-tools/archive/250e4a98908fa0c6631ebccdeae930a60fd4c0d5.tar.gz"],
+    sha256 = "36c3fb806547b202c98c137a41d2bb2aebf3a52dfc8dedc7d972c1731368e7c7",
+    strip_prefix = "bazel-tools-7d90c92c3b361b0345451425d85d58a25de80ad9",
+    urls = ["https://github.com/emacski/bazel-tools/archive/7d90c92c3b361b0345451425d85d58a25de80ad9.tar.gz"],
+)
+
+load(
+    "@com_github_emacski_bazeltools//toolchain/cpp/clang:defs.bzl",
+    "register_clang_cross_toolchains",
 )
 
 # x86_64 to arm(64) cross-compile toolchains
-register_toolchains("@com_github_emacski_bazeltools//toolchain/cpp/clang:all")
+register_clang_cross_toolchains(clang_version = "11")
 
 http_archive(
     name = "io_bazel_rules_docker",
-    sha256 = "95d39fd84ff4474babaf190450ee034d958202043e366b9fc38f438c9e6c3334",
-    strip_prefix = "rules_docker-0.16.0",
-    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.16.0/rules_docker-v0.16.0.tar.gz"],
+    sha256 = "59d5b42ac315e7eadffa944e86e90c2990110a1c8075f1cd145f487e999d22b3",
+    strip_prefix = "rules_docker-0.17.0",
+    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.17.0/rules_docker-v0.17.0.tar.gz"],
 )
 
 load(
@@ -66,6 +71,10 @@ http_archive(
         # arm (32-bit) datatype sizes
         "//third_party/tensorflow:curl.patch",
         "//third_party/tensorflow:hwloc.patch",
+        # might be using host's cpu
+        "//third_party/tensorflow:mkl.patch",
+        # remove explicit dep on libgomp
+        "//third_party/tensorflow:mkl_dnn.patch",
         # allow android cpu helper to be used for linux_arm and linux_arm64
         "//third_party/tensorflow:tensorflow.patch",
     ],
@@ -107,10 +116,10 @@ http_archive(
 # tensorflow serving 2.5.0
 http_archive(
     name = "tf_serving",
-    sha256 = "755a717e04e89ef6ef3aad12fcc3f65d276af06269e0979f11aadbf3c1f0f213",
-    strip_prefix = "serving-84bc4e4bd5b0c624612438e8b6c6e0d39f2c9a66",
+    sha256 = "eec408b6950c4d4d06d148ceb1567eaac0c28b9c38fbc2328fe96d07fec3e3d8",
+    strip_prefix = "serving-bba3972185e47376a63d801ffcd2831684db114a",
     urls = [
-        "https://github.com/tensorflow/serving/archive/84bc4e4bd5b0c624612438e8b6c6e0d39f2c9a66.tar.gz",
+        "https://github.com/tensorflow/serving/archive/bba3972185e47376a63d801ffcd2831684db114a.tar.gz",
     ],
 )
 
@@ -138,6 +147,26 @@ load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 
 rules_pkg_dependencies()
 
+# local cross lib repos
+
+new_local_repository(
+    name = "local_crosslib_amd64",
+    build_file = "BUILD.local_crosslib",
+    path = "/usr/lib/x86_64-linux-gnu",
+)
+
+new_local_repository(
+    name = "local_crosslib_arm64",
+    build_file = "BUILD.local_crosslib",
+    path = "/usr/aarch64-linux-gnu/lib",
+)
+
+new_local_repository(
+    name = "local_crosslib_arm",
+    build_file = "BUILD.local_crosslib",
+    path = "/usr/arm-linux-gnueabihf/lib",
+)
+
 # debian packages
 
 http_archive(

Diff for: tensorflow_model_server/tools/docker/Dockerfile

@@ -17,17 +17,15 @@ FROM debian:buster as build
 # cc toolchain
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
+        curl ca-certificates \
         gcc g++ \
         gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
-        gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
-        libtinfo5 \
-        curl xz-utils ca-certificates && \
+        gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
-ENV INSTALL_LLVM_VERSION=10.0.0
-RUN curl -L https://raw.githubusercontent.com/emacski/bazel-tools/master/toolchain/cpp/clang/install_clang_cross.sh \
-        -o install_clang_cross.sh && \
-    sh install_clang_cross.sh && rm -f install_clang_cross.sh
+RUN curl -L https://raw.githubusercontent.com/emacski/bazel-tools/master/toolchain/cpp/clang/install_clang11_debian10.sh \
+        -o install_clang11_debian10.sh && \
+    sh install_clang11_debian10.sh && rm -f install_clang11_debian10.sh
 # python toolchain
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

Diff for: third_party/libevent/BUILD

@@ -60,7 +60,7 @@ genrule(
         "cp -R $$(pwd)/external/com_github_libevent_libevent/* $$TMP_DIR",
         "cd $$TMP_DIR",
         "./autogen.sh",
-        "CC=$(CC) CFLAGS=\"$(CC_FLAGS) -fuse-ld=lld -fPIC -O3\" CXXFLAGS=-fPIC ./configure \\",
+        "CC=$(CC) CFLAGS=\"$(CC_FLAGS) -fPIC\" CXXFLAGS=-fPIC ./configure \\",
         "   --prefix=$$INSTALL_DIR --host=$(TARGET_GNU_SYSTEM_NAME) \\",
         "   --with-sysroot=$(SYSROOT) --enable-shared=no --disable-openssl \\",
         "   --disable-libevent-regress --disable-samples",