1
0
Fork 0
mirror of https://github.com/tensorflow/haskell.git synced 2024-11-26 21:09:44 +01:00

Update to 1.0 release and newest proto-lens (#77)

* Update from rc to full 1.0 release.
* Switch to proto-lens 0.1.0.5.
This commit is contained in:
Greg Steuck 2017-02-22 15:24:45 -08:00 committed by GitHub
parent 0c8d41250a
commit 5414f197a1
4 changed files with 10 additions and 9 deletions

View file

@ -98,7 +98,7 @@ The following instructions were verified with Mac OS X El Capitan.
- Install the TensorFlow library on your machine: - Install the TensorFlow library on your machine:
curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.0.0-rc0.tar.gz > libtensorflow.tar.gz curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.0.0.tar.gz > libtensorflow.tar.gz
tar zxf libtensorflow.tar.gz -C /usr/local tar zxf libtensorflow.tar.gz -C /usr/local
mv /usr/local/lib/libtensorflow.so /usr/local/lib/libtensorflow.dylib mv /usr/local/lib/libtensorflow.so /usr/local/lib/libtensorflow.dylib
install_name_tool -id libtensorflow.dylib /usr/local/lib/libtensorflow.dylib install_name_tool -id libtensorflow.dylib /usr/local/lib/libtensorflow.dylib

View file

@ -3,7 +3,7 @@
# stack to be installed on the host. This comes at the expense of # stack to be installed on the host. This comes at the expense of
# flexibility. # flexibility.
FROM tensorflow/tensorflow:1.0.0-rc1 FROM tensorflow/tensorflow:1.0.0
MAINTAINER TensorFlow authors <tensorflow-haskell@googlegroups.com> MAINTAINER TensorFlow authors <tensorflow-haskell@googlegroups.com>
# The build context directory is the top of the tensorflow-haskell # The build context directory is the top of the tensorflow-haskell
@ -30,8 +30,8 @@ RUN \
curl -O -L https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip && \ curl -O -L https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip && \
unzip -d /usr/local protoc-3.2.0-linux-x86_64.zip bin/protoc && \ unzip -d /usr/local protoc-3.2.0-linux-x86_64.zip bin/protoc && \
chmod 755 /usr/local/bin/protoc && \ chmod 755 /usr/local/bin/protoc && \
curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.0.0-rc0.tar.gz && \ curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.0.0.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.0.0-rc0.tar.gz -C /usr/local && \ tar zxf libtensorflow-cpu-linux-x86_64-1.0.0.tar.gz -C /usr/local && \
ldconfig && \ ldconfig && \
stack setup --resolver=${STACK_RESOLVER} && \ stack setup --resolver=${STACK_RESOLVER} && \
stack test --resolver=${STACK_RESOLVER} --only-dependencies stack test --resolver=${STACK_RESOLVER} --only-dependencies

View file

@ -1,6 +1,6 @@
# Prepare the image with: # Prepare the image with:
# docker build -t tensorflow/haskell:v0 docker # docker build -t tensorflow/haskell:v0 docker
FROM tensorflow/tensorflow:1.0.0-rc1 FROM tensorflow/tensorflow:1.0.0
MAINTAINER TensorFlow authors <tensorflow-haskell@googlegroups.com> MAINTAINER TensorFlow authors <tensorflow-haskell@googlegroups.com>
RUN apt-get update RUN apt-get update
@ -25,8 +25,8 @@ RUN \
curl -O -L https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip && \ curl -O -L https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip && \
unzip -d /usr/local protoc-3.2.0-linux-x86_64.zip bin/protoc && \ unzip -d /usr/local protoc-3.2.0-linux-x86_64.zip bin/protoc && \
chmod 755 /usr/local/bin/protoc && \ chmod 755 /usr/local/bin/protoc && \
curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.0.0-rc0.tar.gz && \ curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.0.0.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.0.0-rc0.tar.gz -C /usr/local && \ tar zxf libtensorflow-cpu-linux-x86_64-1.0.0.tar.gz -C /usr/local && \
ldconfig ldconfig
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8

View file

@ -18,8 +18,9 @@ packages:
extra-deps: extra-deps:
# proto-lens is not yet in Stackage. # proto-lens is not yet in Stackage.
- proto-lens-0.1.0.4 - proto-lens-0.1.0.5
- proto-lens-protoc-0.1.0.4 - proto-lens-protoc-0.1.0.5
- proto-lens-descriptors-0.1.0.5
- snappy-framing-0.1.1 - snappy-framing-0.1.1
- snappy-0.2.0.2 - snappy-0.2.0.2