on master help sign in
Merge pull request #2523 from judah/tensorflow-reenable

Reenable and fix the tensorflow-* packages.

commit5dd94f54e9bbd2d06e14f59f7fb2b4a57c28f3a9 authorChris Dornan <chris@chrisdornan.com> dateThu 18 May 2017, 14:57 (9 years ago) parentac69a5f4f73bb7
2 files changed+10−5
build-constraints.yaml+3−3 debian-bootstrap.sh+7−2
build-constraints.yaml+3−3
@@ -3026,10 +3026,10 @@ packages:
30263026 - proto-lens-combinators
30273027 - proto-lens-arbitrary
30283028 - proto-lens-optparse
3029− # - tensorflow # blocked on C library
3030− # - tensorflow-core-ops # blocked on C library
3029+ - tensorflow
3030+ - tensorflow-core-ops
30313031 - tensorflow-opgen
3032− # - tensorflow-ops # blocked on C library
3032+ - tensorflow-ops
30333033 - tensorflow-proto
30343034 - tensorflow-test
30353035
debian-bootstrap.sh+7−2
@@ -123,7 +123,6 @@ apt-get install -y \
123123 nodejs \
124124 npm \
125125 openjdk-8-jdk \
126− protobuf-compiler \
127126 python-mpltoolkits.basemap \
128127 python3-matplotlib \
129128 python3-numpy \
@@ -191,9 +190,15 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
191190 && apt-get update \
192191 && apt-get install -y llvm-4.0
193192
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+
194199# Install the TensorFlow C API.
195200curl 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 \
197202 && rm libtensorflow.tar.gz \
198203 && ldconfig
199204