Skip to content

Commit ebd925e

Browse files
committed
[BUILD] Upgrade default BAZEL version to 5.3.1.
Support bazel 0.26.1 - 5.3.1 build DeepRec.
1 parent fb2eae3 commit ebd925e

File tree

13 files changed

+13
-12
lines changed

13 files changed

+13
-12
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.2
1+
5.3.1

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ swift_rules_dependencies()
7575
# files, in case the parsing of those build files depends on the bazel
7676
# version we require here.
7777
load("//tensorflow:version_check.bzl", "check_bazel_version_at_least")
78-
check_bazel_version_at_least("5.3.1")
78+
check_bazel_version_at_least("0.26.1")
7979

8080
load("//third_party/android:android_configure.bzl", "android_configure")
8181
android_configure(name="local_config_android")

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
_TF_BAZELRC = ''
5151
_TF_CURRENT_BAZEL_VERSION = None
5252
_TF_MIN_BAZEL_VERSION = '0.26.1'
53-
_TF_MAX_BAZEL_VERSION = '3.7.2'
53+
_TF_MAX_BAZEL_VERSION = '5.3.1'
5454

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

tensorflow/contrib/tensor_forest/kernels/v4/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ cc_library(
3737
srcs = ["decision-tree-resource.cc"],
3838
hdrs = ["decision-tree-resource.h"],
3939
deps = DECISION_TREE_RESOURCE_DEPS,
40+
alwayslink = 1,
4041
)
4142

4243
cc_library(

tensorflow/tools/ci_build/install/install_bazel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# ==============================================================================
1616

1717
# Select bazel version.
18-
BAZEL_VERSION="3.7.2"
18+
BAZEL_VERSION="5.3.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

Lines changed: 1 addition & 1 deletion
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="3.7.2"
21+
BAZEL_VERSION="5.3.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

Lines changed: 1 addition & 1 deletion
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=3.7.2
20+
LATEST_BAZEL_VERSION=5.3.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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ SET PATH=%CUDNN_INSTALL_PATH%\bin;%PATH%
7474
@REM Setup Bazel
7575
@REM
7676
:: Download Bazel from github and make sure its found in PATH.
77-
SET BAZEL_VERSION=3.7.2
77+
SET BAZEL_VERSION=5.3.1
7878
md C:\tools\bazel\
7979
wget -q https://github.com/bazelbuild/bazel/releases/download/%BAZEL_VERSION%/bazel-%BAZEL_VERSION%-windows-x86_64.exe -O C:/tools/bazel/bazel.exe
8080
SET PATH=C:\tools\bazel;%PATH%

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RUN ${PIP} --no-cache-dir install \
9898
enum34
9999

100100
# Install bazel
101-
ARG BAZEL_VERSION=3.7.2
101+
ARG BAZEL_VERSION=5.3.1
102102
RUN mkdir /bazel && \
103103
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
104104
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RUN ${PIP} --no-cache-dir install \
9898
enum34
9999

100100
# Install bazel
101-
ARG BAZEL_VERSION=3.7.2
101+
ARG BAZEL_VERSION=5.3.1
102102
RUN mkdir /bazel && \
103103
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
104104
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \

0 commit comments

Comments
 (0)