TF Serving Dockerfiles upgraded for a hermetic build. MKL stays non-hermetic at this time because of strict linker checks in llvm_openmp.

PiperOrigin-RevId: 895497907

Author: dmiltr3

.bazelrc

@@ -11,6 +11,8 @@ build:cuda --@local_config_cuda//:enable_cuda
 build:cuda_clang --config=cuda
 build:cuda_clang --copt=-Wno-gnu-offsetof-extensions
 build:cuda_clang --copt=-Wno-error=unused-command-line-argument
+build --linkopt=-Wno-unused-command-line-argument
+build --host_linkopt=-Wno-unused-command-line-argument
 build:cuda_clang --host_copt=-Wno-error=unused-command-line-argument
 build:cuda_clang --repo_env TF_NEED_TENSORRT=0
 build:cuda_clang --action_env=TF_CUDA_CLANG="1"
@@ -23,9 +25,6 @@ build:cuda_clang --repo_env=HERMETIC_NVSHMEM_VERSION="3.2.5"
 build:cuda_clang --action_env=GCC_HOST_COMPILER_PATH="/usr/bin/gcc-10"
 build:cuda_clang --action_env=CLANG_CUDA_COMPILER_PATH="/usr/lib/llvm-17/bin/clang"
 
-build:kokoro --repo_env=CC="/usr/bin/gcc-10"
-build:kokoro --action_env=CC="/usr/bin/gcc-10"
-
 # Options used to build with TPU support.
 build:tpu --define=with_tpu_support=true --define=framework_shared_object=false
 build:tpu --copt=-DLIBTPU_ON_GCE
@@ -115,8 +114,12 @@ common --incompatible_enable_cc_toolchain_resolution
 common --repo_env USE_HERMETIC_CC_TOOLCHAIN=1
 common --repo_env=HERMETIC_PYTHON_VERSION="3.10"
 build --features=-layering_check
+build --define=framework_shared_object=false
+build --dynamic_mode=off
+
 
 common:clang_local --noincompatible_enable_cc_toolchain_resolution
 common:clang_local --noincompatible_enable_android_toolchain_resolution
 common:clang_local --@rules_ml_toolchain//cc_toolchain/config:enable_hermetic_cc=False
 common:clang_local --repo_env USE_HERMETIC_CC_TOOLCHAIN=0
+

WORKSPACE

@@ -27,6 +27,12 @@ tensorflow_http_archive(
     sha256 = "86150d55ce57b2298d8ed42caa7b91c466ad33d9f7f347117c2257cc576d3413",
     git_commit = "72fbba3d20f4616d7312b5e2b7f79daf6e82f2fa",
     patch = "//third_party/tensorflow:tensorflow.patch",
+    patch_cmds = [
+        "sed -i '/cc_library = _cc_library/d' tensorflow/core/platform/rules_cc.bzl",
+        "echo -e \"\\ndef cc_library_oss(deps=[], **kwargs):\\n    if kwargs.get(\\\"name\\\") == \\\"lib_internal_impl\\\" or \\\"protobuf\\\" in kwargs.get(\\\"name\\\", \\\"\\\"):\\n        _cc_library(deps = deps, **kwargs)\\n        return\\n    if type(deps) == \\\"list\\\":\\n        if \\\"@com_google_protobuf//:protobuf\\\" not in deps:\\n            deps = deps + [\\\"@com_google_protobuf//:protobuf\\\"]\\n    else:\\n        deps = deps + [\\\"@com_google_protobuf//:protobuf\\\"]\\n    _cc_library(deps = deps, **kwargs)\\ncc_library = cc_library_oss\" >> tensorflow/core/platform/rules_cc.bzl",
+        "sed -i 's#deps = \\[op_gen\\] + deps#deps = [op_gen] + deps + [clean_dep(\"//tensorflow/core/framework:kernel_shape_util\"), clean_dep(\"//tensorflow/core/framework:full_type_util\")]#' tensorflow/tensorflow.bzl",
+        "sed -i '/name = \"kernel_shape_util\",/a \\    visibility = [\"//visibility:public\"],' tensorflow/core/framework/BUILD",
+    ],
 )
 
 # Import all of TensorFlow Serving's external dependencies.

tensorflow_serving/example/BUILD

@@ -29,8 +29,10 @@ cc_binary(
         "//tensorflow_serving/apis:prediction_service_cc_proto",
         "@com_github_grpc_grpc//:grpc++",
         "@com_google_protobuf//:protobuf_lite",
+        "@local_xla//xla/tsl/util:command_line_flags",
         "@org_tensorflow//tensorflow/core:framework",
         "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core/framework:tensor",
         "@org_tensorflow//tensorflow/core/platform:jpeg",
     ],
 )

tensorflow_serving/model_servers/test_util/BUILD

@@ -109,6 +109,7 @@ cc_library(
         ":storage_path_error_injecting_source_adapter_cc_proto",
         "//tensorflow_serving/core:source_adapter",
     ],
+    alwayslink = 1,
 )
 
 serving_proto_library(

tensorflow_serving/repo.bzl

@@ -18,6 +18,7 @@ def _tensorflow_http_archive(ctx):
     git_commit = ctx.attr.git_commit
     sha256 = ctx.attr.sha256
     patch = getattr(ctx.attr, "patch", None)
+    patch_cmds = getattr(ctx.attr, "patch_cmds", [])
 
     override_git_commit = ctx.os.environ.get(_TF_REVISION)
     if override_git_commit:
@@ -37,12 +38,17 @@ def _tensorflow_http_archive(ctx):
     )
     if patch:
         ctx.patch(patch, strip = 1)
+    for cmd in patch_cmds:
+        res = ctx.execute(["bash", "-c", cmd])
+        if res.return_code != 0:
+            fail("Failed to execute patch_cmd %s: %s" % (cmd, res.stderr))
 
 tensorflow_http_archive = repository_rule(
     implementation = _tensorflow_http_archive,
     attrs = {
         "git_commit": attr.string(mandatory = True),
         "sha256": attr.string(mandatory = True),
         "patch": attr.label(),
+        "patch_cmds": attr.string_list(),
     },
 )

tensorflow_serving/resources/BUILD

@@ -50,6 +50,7 @@ cc_library(
     deps = [
         ":resources_cc_proto",
         "@com_google_absl//absl/container:flat_hash_set",
+        "@com_google_absl//absl/log:check",
         "@org_tensorflow//tensorflow/core:lib",
     ],
 )

tensorflow_serving/servables/tensorflow/BUILD

@@ -971,6 +971,7 @@ cc_library(
         "//tensorflow_serving/apis:predict_cc_proto",
         "//tensorflow_serving/apis:prediction_log_cc_proto",
         "//tensorflow_serving/apis:regression_cc_proto",
+        "@com_google_protobuf//:protobuf",
         "@org_tensorflow//tensorflow/cc/saved_model:constants",
         "@org_tensorflow//tensorflow/cc/saved_model:signature_constants",
         "@org_tensorflow//tensorflow/core:lib",

tensorflow_serving/test_util/BUILD

@@ -47,7 +47,8 @@ cc_binary(
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/flags:parse",
         "@com_google_absl//absl/strings",
+        "@local_xla//xla/tsl/lib/histogram",
+        "@local_xla//xla/tsl/platform:env",
         "@org_tensorflow//tensorflow/core:lib",
-        "@org_tensorflow//tensorflow/core/platform:env",
     ],
 )

tensorflow_serving/tools/docker/Dockerfile

@@ -16,7 +16,7 @@ ARG TF_SERVING_VERSION=latest
 ARG TF_SERVING_BUILD_IMAGE=tensorflow/serving:${TF_SERVING_VERSION}-devel
 
 FROM ${TF_SERVING_BUILD_IMAGE} as build_image
-FROM ubuntu:20.04
+FROM ubuntu:22.04@sha256:eb29ed27b0821dca09c2e28b39135e185fc1302036427d5f4d70a41ce8fd7659
 
 ARG TF_SERVING_VERSION_GIT_BRANCH=master
 ARG TF_SERVING_VERSION_GIT_COMMIT=head

tensorflow_serving/tools/docker/Dockerfile.devel

@@ -11,7 +11,8 @@
 # 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.
-FROM ubuntu:20.04 as base_build
+FROM ubuntu:22.04@sha256:eb29ed27b0821dca09c2e28b39135e185fc1302036427d5f4d70a41ce8fd7659 as base_build
+
 
 ARG TF_SERVING_VERSION_GIT_BRANCH=master
 ARG TF_SERVING_VERSION_GIT_COMMIT=HEAD
@@ -27,37 +28,35 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         ca-certificates \
         curl \
         git \
-        gcc-10 \
-        g++-10 \
         libcurl3-dev \
         libfreetype6-dev \
         libpng-dev \
         libtool \
         libzmq3-dev \
         mlocate \
-        openjdk-8-jdk\
-        openjdk-8-jre-headless \
+        openjdk-11-jdk \
+        openjdk-11-jre-headless \
         pkg-config \
-        python-dev \
+        python3-dev \
         software-properties-common \
         swig \
         unzip \
         wget \
         zip \
         zlib1g-dev \
-        python3-distutils \
+        python3-setuptools \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Install python 3.10.
-RUN add-apt-repository ppa:deadsnakes/ppa && \
-    apt-get update && apt-get install -y \
+# Install python 3.10 (Native on Ubuntu 22.04).
+RUN apt-get update && apt-get install -y \
     python3.10 python3.10-dev python3-pip python3.10-venv && \
     rm -rf /var/lib/apt/lists/* && \
     python3.10 -m pip install pip --upgrade && \
     update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 0
 
+
 # Make python3.10 the default python version
 # If updating default python version, also update version in the WORKSPACE file.
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.10 0
@@ -107,7 +106,6 @@ RUN bazel build --color=yes --curses=yes \
     --verbose_failures \
     --output_filter=DONT_MATCH_ANYTHING \
     ${TF_SERVING_BUILD_OPTIONS} \
-    --config=kokoro \
     tensorflow_serving/model_servers:tensorflow_model_server && \
     cp bazel-bin/tensorflow_serving/model_servers/tensorflow_model_server \
     /usr/local/bin/
@@ -118,7 +116,6 @@ RUN bazel build --color=yes --curses=yes \
     --verbose_failures \
     --output_filter=DONT_MATCH_ANYTHING \
     ${TF_SERVING_BUILD_OPTIONS} \
-    --config=kokoro \
     tensorflow_serving/tools/pip_package:build_pip_package && \
     bazel-bin/tensorflow_serving/tools/pip_package/build_pip_package \
     /tmp/pip && \