aboutsummaryrefslogtreecommitdiffhomepage
path: root/projects/tensorflow
diff options
context:
space:
mode:
authorGravatar Mihai Maruseac <mihai.maruseac@gmail.com>2019-04-03 09:57:58 -0700
committerGravatar Abhishek Arya <inferno@chromium.org>2019-04-03 09:57:58 -0700
commit2fa5eca226a5257f0798c40f99d78f5b3b29093c (patch)
tree00a0f1dcc0e3623858dc2cba0ec34e3c4758bfc4 /projects/tensorflow
parent23a5f44b29dcf3996bbfb9710ba50f1816faf644 (diff)
[tensorflow] Update Bazel version and check that it is compatible (#2288)
* Update Bazel to 0.24.0 * Always run ./configure
Diffstat (limited to 'projects/tensorflow')
-rw-r--r--projects/tensorflow/Dockerfile8
-rwxr-xr-xprojects/tensorflow/build.sh3
2 files changed, 7 insertions, 4 deletions
diff --git a/projects/tensorflow/Dockerfile b/projects/tensorflow/Dockerfile
index e5aca53a..ddccda84 100644
--- a/projects/tensorflow/Dockerfile
+++ b/projects/tensorflow/Dockerfile
@@ -30,10 +30,10 @@ RUN echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8
RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
RUN apt-get update && apt-get install -y bazel
-# Downgrade Bazel to latest supported version (0.21.0)
-RUN curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/0.21.0/bazel-0.21.0-installer-linux-x86_64.sh
-RUN chmod +x ./bazel-0.21.0-installer-linux-x86_64.sh
-RUN ./bazel-0.21.0-installer-linux-x86_64.sh
+# Downgrade Bazel to latest supported version (0.24.0)
+RUN curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/0.24.0/bazel-0.24.0-installer-linux-x86_64.sh
+RUN chmod +x ./bazel-0.24.0-installer-linux-x86_64.sh
+RUN ./bazel-0.24.0-installer-linux-x86_64.sh
RUN git clone --depth 1 https://github.com/tensorflow/tensorflow tensorflow
WORKDIR $SRC/tensorflow
diff --git a/projects/tensorflow/build.sh b/projects/tensorflow/build.sh
index a3027bdb..752ba2bb 100755
--- a/projects/tensorflow/build.sh
+++ b/projects/tensorflow/build.sh
@@ -27,6 +27,9 @@ declare -r FUZZERS=$(
CFLAGS="${CFLAGS} -fno-sanitize=vptr"
CXXFLAGS="${CXXFLAGS} -fno-sanitize=vptr -std=c++11 -stdlib=libc++"
+# Make sure we run ./configure to detect when we are using a Bazel out of range
+yes "" | ./configure
+
# See https://github.com/bazelbuild/bazel/issues/6697
sed '/::kM..SeedBytes/d' -i tensorflow/stream_executor/rng.cc