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 https://github.com/tensorflow/community/pull/179 PiperOrigin-RevId: 288808507 Change-Id: Ie78fb4ff8dad128ebef280037cce4d3c4f42addc
This commit is contained in:
parent
65c7a019af
commit
feb0c7b4bb
@ -1 +1 @@
|
|||||||
1.1.0
|
1.2.1
|
||||||
|
@ -49,8 +49,8 @@ _TF_BAZELRC_FILENAME = '.tf_configure.bazelrc'
|
|||||||
_TF_WORKSPACE_ROOT = ''
|
_TF_WORKSPACE_ROOT = ''
|
||||||
_TF_BAZELRC = ''
|
_TF_BAZELRC = ''
|
||||||
_TF_CURRENT_BAZEL_VERSION = None
|
_TF_CURRENT_BAZEL_VERSION = None
|
||||||
_TF_MIN_BAZEL_VERSION = '1.0.0'
|
_TF_MIN_BAZEL_VERSION = '1.2.1'
|
||||||
_TF_MAX_BAZEL_VERSION = '1.1.0'
|
_TF_MAX_BAZEL_VERSION = '1.2.1'
|
||||||
|
|
||||||
NCCL_LIB_PATHS = [
|
NCCL_LIB_PATHS = [
|
||||||
'lib64/', 'lib/powerpc64le-linux-gnu/', 'lib/x86_64-linux-gnu/', ''
|
'lib64/', 'lib/powerpc64le-linux-gnu/', 'lib/x86_64-linux-gnu/', ''
|
||||||
|
@ -461,7 +461,9 @@ do_bazel_deps_query() {
|
|||||||
# default in TF WORKSPACE file.
|
# default in TF WORKSPACE file.
|
||||||
local BUILD_TARGET="${BUILD_TARGET}"' - kind("android_*", //tensorflow/...)'
|
local BUILD_TARGET="${BUILD_TARGET}"' - kind("android_*", //tensorflow/...)'
|
||||||
|
|
||||||
bazel query ${BAZEL_FLAGS} -- "deps($BUILD_TARGET)" > /dev/null
|
# We've set the flag noimplicit_deps as a workaround for
|
||||||
|
# https://github.com/bazelbuild/bazel/issues/10544
|
||||||
|
bazel query ${BAZEL_FLAGS} --noimplicit_deps -- "deps($BUILD_TARGET)" > /dev/null
|
||||||
|
|
||||||
cmd_status \
|
cmd_status \
|
||||||
"This is due to invalid BUILD files."
|
"This is due to invalid BUILD files."
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
# Select bazel version.
|
# Select bazel version.
|
||||||
BAZEL_VERSION="1.1.0"
|
BAZEL_VERSION="1.2.1"
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
|
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
# It will compile bazel from source and install it in /usr/local/bin
|
# It will compile bazel from source and install it in /usr/local/bin
|
||||||
|
|
||||||
# Select bazel version.
|
# Select bazel version.
|
||||||
BAZEL_VERSION="1.1.0"
|
BAZEL_VERSION="1.2.1"
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
|
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
# Keep in sync with tensorflow_estimator and configure.py.
|
# Keep in sync with tensorflow_estimator and configure.py.
|
||||||
# LINT.IfChange
|
# LINT.IfChange
|
||||||
LATEST_BAZEL_VERSION=1.1.0
|
LATEST_BAZEL_VERSION=1.2.1
|
||||||
# LINT.ThenChange(
|
# LINT.ThenChange(
|
||||||
# //tensorflow/opensource_only/configure.py,
|
# //tensorflow/opensource_only/configure.py,
|
||||||
# //tensorflow_estimator/google/kokoro/common.sh,
|
# //tensorflow_estimator/google/kokoro/common.sh,
|
||||||
|
@ -69,7 +69,7 @@ SET PATH=%CUDNN_INSTALL_PATH%\bin;%PATH%
|
|||||||
@REM Setup Bazel
|
@REM Setup Bazel
|
||||||
@REM
|
@REM
|
||||||
:: Download Bazel from github and make sure its found in PATH.
|
:: Download Bazel from github and make sure its found in PATH.
|
||||||
SET BAZEL_VERSION=1.1.0
|
SET BAZEL_VERSION=1.2.1
|
||||||
md C:\tools\bazel\
|
md C:\tools\bazel\
|
||||||
wget -q https://github.com/bazelbuild/bazel/releases/download/%BAZEL_VERSION%/bazel-%BAZEL_VERSION%-windows-x86_64.exe -O C:/tools/bazel/bazel.exe
|
wget -q https://github.com/bazelbuild/bazel/releases/download/%BAZEL_VERSION%/bazel-%BAZEL_VERSION%-windows-x86_64.exe -O C:/tools/bazel/bazel.exe
|
||||||
SET PATH=C:\tools\bazel;%PATH%
|
SET PATH=C:\tools\bazel;%PATH%
|
||||||
|
@ -99,7 +99,7 @@ RUN ${PIP} --no-cache-dir install \
|
|||||||
enum34
|
enum34
|
||||||
|
|
||||||
# Install bazel
|
# Install bazel
|
||||||
ARG BAZEL_VERSION=1.1.0
|
ARG BAZEL_VERSION=1.2.1
|
||||||
RUN mkdir /bazel && \
|
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/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" && \
|
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \
|
||||||
|
@ -99,7 +99,7 @@ RUN ${PIP} --no-cache-dir install \
|
|||||||
enum34
|
enum34
|
||||||
|
|
||||||
# Install bazel
|
# Install bazel
|
||||||
ARG BAZEL_VERSION=1.1.0
|
ARG BAZEL_VERSION=1.2.1
|
||||||
RUN mkdir /bazel && \
|
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/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" && \
|
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \
|
||||||
|
@ -141,7 +141,7 @@ RUN ${PIP} --no-cache-dir install \
|
|||||||
enum34
|
enum34
|
||||||
|
|
||||||
# Install bazel
|
# Install bazel
|
||||||
ARG BAZEL_VERSION=1.1.0
|
ARG BAZEL_VERSION=1.2.1
|
||||||
RUN mkdir /bazel && \
|
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/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" && \
|
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \
|
||||||
|
@ -141,7 +141,7 @@ RUN ${PIP} --no-cache-dir install \
|
|||||||
enum34
|
enum34
|
||||||
|
|
||||||
# Install bazel
|
# Install bazel
|
||||||
ARG BAZEL_VERSION=1.1.0
|
ARG BAZEL_VERSION=1.2.1
|
||||||
RUN mkdir /bazel && \
|
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/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" && \
|
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \
|
||||||
|
@ -24,7 +24,7 @@ RUN ${PIP} --no-cache-dir install \
|
|||||||
enum34
|
enum34
|
||||||
|
|
||||||
# Install bazel
|
# Install bazel
|
||||||
ARG BAZEL_VERSION=1.1.0
|
ARG BAZEL_VERSION=1.2.1
|
||||||
RUN mkdir /bazel && \
|
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/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" && \
|
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \
|
||||||
|
Loading…
Reference in New Issue
Block a user