From d2b02580e6f68d2360bd6ad6eda805aa1d4e9871 Mon Sep 17 00:00:00 2001 From: Jakob Buchgraber Date: Tue, 9 Jun 2020 07:59:17 -0700 Subject: [PATCH] Update TF bazel version requirements. PiperOrigin-RevId: 315483879 Change-Id: I4be29ffa3c425f01c28dc8c95250209a2b0bada4 --- .bazelversion | 2 +- configure.py | 2 +- tensorflow/tools/ci_build/install/install_bazel.sh | 2 +- tensorflow/tools/ci_build/install/install_bazel_from_source.sh | 2 +- tensorflow/tools/ci_build/release/common.sh | 2 +- .../tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile | 2 +- tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile | 2 +- .../tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile | 2 +- tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile | 2 +- .../tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile | 2 +- .../dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.bazelversion b/.bazelversion index 4a36342fcab..fd2a01863fd 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.0.0 +3.1.0 diff --git a/configure.py b/configure.py index c2850beede6..da6af8f8cc9 100644 --- a/configure.py +++ b/configure.py @@ -49,7 +49,7 @@ _TF_BAZELRC_FILENAME = '.tf_configure.bazelrc' _TF_WORKSPACE_ROOT = '' _TF_BAZELRC = '' _TF_CURRENT_BAZEL_VERSION = None -_TF_MIN_BAZEL_VERSION = '2.0.0' +_TF_MIN_BAZEL_VERSION = '3.1.0' _TF_MAX_BAZEL_VERSION = '3.99.0' NCCL_LIB_PATHS = [ diff --git a/tensorflow/tools/ci_build/install/install_bazel.sh b/tensorflow/tools/ci_build/install/install_bazel.sh index f14740ea6f9..555eb2d935f 100755 --- a/tensorflow/tools/ci_build/install/install_bazel.sh +++ b/tensorflow/tools/ci_build/install/install_bazel.sh @@ -15,7 +15,7 @@ # ============================================================================== # Select bazel version. -BAZEL_VERSION="3.0.0" +BAZEL_VERSION="3.1.0" set +e local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}') diff --git a/tensorflow/tools/ci_build/install/install_bazel_from_source.sh b/tensorflow/tools/ci_build/install/install_bazel_from_source.sh index 3c40f0c0f34..66761217018 100755 --- a/tensorflow/tools/ci_build/install/install_bazel_from_source.sh +++ b/tensorflow/tools/ci_build/install/install_bazel_from_source.sh @@ -18,7 +18,7 @@ # It will compile bazel from source and install it in /usr/local/bin # Select bazel version. -BAZEL_VERSION="3.0.0" +BAZEL_VERSION="3.1.0" set +e local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}') diff --git a/tensorflow/tools/ci_build/release/common.sh b/tensorflow/tools/ci_build/release/common.sh index 0a9f6eae0b3..b533564e7a1 100644 --- a/tensorflow/tools/ci_build/release/common.sh +++ b/tensorflow/tools/ci_build/release/common.sh @@ -17,7 +17,7 @@ # Keep in sync with tensorflow_estimator and configure.py. # LINT.IfChange -LATEST_BAZEL_VERSION=3.0.0 +LATEST_BAZEL_VERSION=3.1.0 # LINT.ThenChange( # //tensorflow/opensource_only/configure.py, # //tensorflow_estimator/google/kokoro/common.sh, diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile index 1024f64bfbb..a215449ef7f 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile @@ -93,7 +93,7 @@ RUN python3 -m pip --no-cache-dir install \ enum34 # Install bazel -ARG BAZEL_VERSION=3.0.0 +ARG BAZEL_VERSION=3.1.0 RUN mkdir /bazel && \ wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \ wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile index f20b4c28e3a..f7d414bc902 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile @@ -93,7 +93,7 @@ RUN python3 -m pip --no-cache-dir install \ enum34 # Install bazel -ARG BAZEL_VERSION=3.0.0 +ARG BAZEL_VERSION=3.1.0 RUN mkdir /bazel && \ wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \ wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile index 091ac0d3931..e7e717c584c 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile @@ -135,7 +135,7 @@ RUN python3 -m pip --no-cache-dir install \ enum34 # Install bazel -ARG BAZEL_VERSION=3.0.0 +ARG BAZEL_VERSION=3.1.0 RUN mkdir /bazel && \ wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \ wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile index 9f7e67eeee3..b18af60892f 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile @@ -135,7 +135,7 @@ RUN python3 -m pip --no-cache-dir install \ enum34 # Install bazel -ARG BAZEL_VERSION=3.0.0 +ARG BAZEL_VERSION=3.1.0 RUN mkdir /bazel && \ wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \ wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \ diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile index fc6baecb9b6..54fdb2be648 100644 --- a/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile @@ -23,7 +23,7 @@ RUN python3 -m pip --no-cache-dir install \ enum34 # Install bazel -ARG BAZEL_VERSION=3.0.0 +ARG BAZEL_VERSION=3.1.0 RUN mkdir /bazel && \ wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \ wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \ diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile index 2b4761abc39..c0327619ad9 100644 --- a/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile @@ -21,7 +21,7 @@ RUN python3 -m pip --no-cache-dir install \ enum34 # Build and install bazel -ENV BAZEL_VERSION 3.0.0 +ENV BAZEL_VERSION 3.1.0 WORKDIR / RUN mkdir /bazel && \ cd /bazel && \ -- GitLab