From e2b74d28c65e5ed3b12f9533b0b18894b94b11e9 Mon Sep 17 00:00:00 2001 From: Vincent Roseberry Date: Wed, 13 May 2020 17:07:15 +0000 Subject: [PATCH 1/2] Build TensorFlow 2.2.0 whl --- tensorflow-whl/CHANGELOG.md | 1 + tensorflow-whl/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tensorflow-whl/CHANGELOG.md b/tensorflow-whl/CHANGELOG.md index 39a1d972..425d33fa 100644 --- a/tensorflow-whl/CHANGELOG.md +++ b/tensorflow-whl/CHANGELOG.md @@ -14,3 +14,4 @@ * `2.1.0-py37`: TensorFlow 2.1.0 with Python 3.7 * `2.1.0-py37-2`: TensorFlow 2.1.0 with Python 3.7 & DLVM base image. * `2.1.0-py37-3`: TensorFlow 2.1.0 with Python 3.7, DLVM base image, tensorflow-gcs-config. +* `2.2.0-py37`: TensorFlow 2.2.0 with Python 3.7. \ No newline at end of file diff --git a/tensorflow-whl/Dockerfile b/tensorflow-whl/Dockerfile index c53c5759..831faa13 100644 --- a/tensorflow-whl/Dockerfile +++ b/tensorflow-whl/Dockerfile @@ -53,7 +53,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ RUN pip install --upgrade pip # See _TF_(MIN|MAX)_BAZEL_VERSION at https://github.com/tensorflow/tensorflow/blob/master/configure.py. -ENV BAZEL_VERSION=0.29.1 +ENV BAZEL_VERSION=2.0.0 RUN apt-get install -y gnupg zip openjdk-8-jdk && \ apt-get install -y --no-install-recommends \ bash-completion \ @@ -66,7 +66,7 @@ RUN apt-get install -y gnupg zip openjdk-8-jdk && \ RUN cd /usr/local/src && \ git clone https://github.com/tensorflow/tensorflow && \ cd tensorflow && \ - git checkout tags/v2.1.0 && \ + git checkout tags/v2.2.0 && \ pip install keras_applications --no-deps && \ pip install keras_preprocessing --no-deps From d907aeab7b11e4c8cd9a9cfca12e502b4a52dfc9 Mon Sep 17 00:00:00 2001 From: Mark Collins Date: Fri, 15 May 2020 16:44:15 -0600 Subject: [PATCH 2/2] Update tensorflow_gcs_config source with upstream changes for TF 2.2 --- .../tensorflow_gcs_config/gcs_config_op_kernels.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorflow-whl/tensorflow-gcs-config/tensorflow_gcs_config/gcs_config_op_kernels.cc b/tensorflow-whl/tensorflow-gcs-config/tensorflow_gcs_config/gcs_config_op_kernels.cc index 3e2fc310..d5b1e992 100644 --- a/tensorflow-whl/tensorflow-gcs-config/tensorflow_gcs_config/gcs_config_op_kernels.cc +++ b/tensorflow-whl/tensorflow-gcs-config/tensorflow_gcs_config/gcs_config_op_kernels.cc @@ -172,8 +172,8 @@ class GcsCredentialsOpKernel : public OpKernel { Env* env_; mutex mu_; - string current_token_ GUARDED_BY(mu_); - uint64 expiration_timestamp_sec_ GUARDED_BY(mu_) = 0; + string current_token_ TF_GUARDED_BY(mu_); + uint64 expiration_timestamp_sec_ TF_GUARDED_BY(mu_) = 0; // The initial delay for exponential backoffs when retrying failed calls. const int64 initial_retry_delay_usec_;