Skip to content

Commit feb0c7b

Browse files
bmzhaotensorflower-gardener
authored andcommitted
Upgrading bazel version to 1.2.1
This is necessary to start using bazel's experimental cc_shared_library support. This change is part of the refactoring described in tensorflow/community#179 PiperOrigin-RevId: 288808507 Change-Id: Ie78fb4ff8dad128ebef280037cce4d3c4f42addc
1 parent 65c7a01 commit feb0c7b

12 files changed

+15
-13
lines changed

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.0
1+
1.2.1

configure.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
_TF_WORKSPACE_ROOT = ''
5050
_TF_BAZELRC = ''
5151
_TF_CURRENT_BAZEL_VERSION = None
52-
_TF_MIN_BAZEL_VERSION = '1.0.0'
53-
_TF_MAX_BAZEL_VERSION = '1.1.0'
52+
_TF_MIN_BAZEL_VERSION = '1.2.1'
53+
_TF_MAX_BAZEL_VERSION = '1.2.1'
5454

5555
NCCL_LIB_PATHS = [
5656
'lib64/', 'lib/powerpc64le-linux-gnu/', 'lib/x86_64-linux-gnu/', ''

tensorflow/tools/ci_build/ci_sanity.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,9 @@ do_bazel_deps_query() {
461461
# default in TF WORKSPACE file.
462462
local BUILD_TARGET="${BUILD_TARGET}"' - kind("android_*", //tensorflow/...)'
463463

464-
bazel query ${BAZEL_FLAGS} -- "deps($BUILD_TARGET)" > /dev/null
464+
# We've set the flag noimplicit_deps as a workaround for
465+
# https://github.com/bazelbuild/bazel/issues/10544
466+
bazel query ${BAZEL_FLAGS} --noimplicit_deps -- "deps($BUILD_TARGET)" > /dev/null
465467

466468
cmd_status \
467469
"This is due to invalid BUILD files."

tensorflow/tools/ci_build/install/install_bazel.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# ==============================================================================
1616

1717
# Select bazel version.
18-
BAZEL_VERSION="1.1.0"
18+
BAZEL_VERSION="1.2.1"
1919

2020
set +e
2121
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')

tensorflow/tools/ci_build/install/install_bazel_from_source.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# It will compile bazel from source and install it in /usr/local/bin
1919

2020
# Select bazel version.
21-
BAZEL_VERSION="1.1.0"
21+
BAZEL_VERSION="1.2.1"
2222

2323
set +e
2424
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')

tensorflow/tools/ci_build/release/common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
# Keep in sync with tensorflow_estimator and configure.py.
1919
# LINT.IfChange
20-
LATEST_BAZEL_VERSION=1.1.0
20+
LATEST_BAZEL_VERSION=1.2.1
2121
# LINT.ThenChange(
2222
# //tensorflow/opensource_only/configure.py,
2323
# //tensorflow_estimator/google/kokoro/common.sh,

tensorflow/tools/ci_build/release/common_win.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ SET PATH=%CUDNN_INSTALL_PATH%\bin;%PATH%
6969
@REM Setup Bazel
7070
@REM
7171
:: Download Bazel from github and make sure its found in PATH.
72-
SET BAZEL_VERSION=1.1.0
72+
SET BAZEL_VERSION=1.2.1
7373
md C:\tools\bazel\
7474
wget -q https://github.com/bazelbuild/bazel/releases/download/%BAZEL_VERSION%/bazel-%BAZEL_VERSION%-windows-x86_64.exe -O C:/tools/bazel/bazel.exe
7575
SET PATH=C:\tools\bazel;%PATH%

tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ RUN ${PIP} --no-cache-dir install \
9999
enum34
100100

101101
# Install bazel
102-
ARG BAZEL_VERSION=1.1.0
102+
ARG BAZEL_VERSION=1.2.1
103103
RUN mkdir /bazel && \
104104
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
105105
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \

tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ RUN ${PIP} --no-cache-dir install \
9999
enum34
100100

101101
# Install bazel
102-
ARG BAZEL_VERSION=1.1.0
102+
ARG BAZEL_VERSION=1.2.1
103103
RUN mkdir /bazel && \
104104
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
105105
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \

tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ RUN ${PIP} --no-cache-dir install \
141141
enum34
142142

143143
# Install bazel
144-
ARG BAZEL_VERSION=1.1.0
144+
ARG BAZEL_VERSION=1.2.1
145145
RUN mkdir /bazel && \
146146
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
147147
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \

tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ RUN ${PIP} --no-cache-dir install \
141141
enum34
142142

143143
# Install bazel
144-
ARG BAZEL_VERSION=1.1.0
144+
ARG BAZEL_VERSION=1.2.1
145145
RUN mkdir /bazel && \
146146
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
147147
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \

tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN ${PIP} --no-cache-dir install \
2424
enum34
2525

2626
# Install bazel
27-
ARG BAZEL_VERSION=1.1.0
27+
ARG BAZEL_VERSION=1.2.1
2828
RUN mkdir /bazel && \
2929
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
3030
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \

0 commit comments

Comments
 (0)