Merge pull request #803 from Kaggle/tf-2.2-whl

Build TensorFlow 2.2.0 whl
Kaggle · May 19, 2020 · 4dffc09 · 4dffc09
2 parents 894baa4 + d907aea
commit 4dffc09
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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.
diff --git 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
 

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
@@ -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_;