on master help sign in
Merge pull request #2523 from judah/tensorflow-reenable
5dd94f5Chris Dornan
build-constraints.yaml+3−3
@@ -3026,10 +3026,10 @@ packages:
3026 - proto-lens-combinators
3026 - proto-lens-combinators
3027 - proto-lens-arbitrary
3027 - proto-lens-arbitrary
3028 - proto-lens-optparse
3028 - proto-lens-optparse
3029− # - tensorflow # blocked on C library
3029+ - tensorflow
3030− # - tensorflow-core-ops # blocked on C library
3030+ - tensorflow-core-ops
3031 - tensorflow-opgen
3031 - tensorflow-opgen
3032− # - tensorflow-ops # blocked on C library
3032+ - tensorflow-ops
3033 - tensorflow-proto
3033 - tensorflow-proto
3034 - tensorflow-test
3034 - tensorflow-test
3035
3035
debian-bootstrap.sh+7−2
@@ -123,7 +123,6 @@ apt-get install -y \
123 nodejs \
123 nodejs \
124 npm \
124 npm \
125 openjdk-8-jdk \
125 openjdk-8-jdk \
126− protobuf-compiler \
127 python-mpltoolkits.basemap \
126 python-mpltoolkits.basemap \
128 python3-matplotlib \
127 python3-matplotlib \
129 python3-numpy \
128 python3-numpy \
@@ -191,9 +190,15 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
191 && apt-get update \
190 && apt-get update \
192 && apt-get install -y llvm-4.0
191 && apt-get install -y llvm-4.0
193
192
193+# Install version 3 of the protobuf compiler. (The `protobuf-compiler` package only
194+# supports version 2.)
195+curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip \
196+ && sudo unzip -o protoc-3.3.0-linux-x86_64.zip -d /usr bin/protoc \
197+ && rm -f protoc-3.3.0-linux-x84_64.zip
198+
194# Install the TensorFlow C API.
199# Install the TensorFlow C API.
195curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.1.0.tar.gz > libtensorflow.tar.gz \
200curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.1.0.tar.gz > libtensorflow.tar.gz \
196− && sudo tar zxf libtensorflow.tar.gz -C /usr/local \
201+ && sudo tar zxf libtensorflow.tar.gz -C /usr \
197 && rm libtensorflow.tar.gz \
202 && rm libtensorflow.tar.gz \
198 && ldconfig
203 && ldconfig
199
204