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

Update to tensorflow 1.8 (#188)

Browse source
This commit is contained in:
Erlend Hamberg 2018-05-14 21:55:33 +02:00 committed by fkm3
parent 1e2dca8701
commit 1829c7ef3c
8 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog.md
View file

@ -1,7 +1,7 @@
# ChangeLog # ChangeLog
## Upcoming (v0.2.0.0) ## Upcoming (v0.2.0.0)
- Switch to tensorflow 1.7. - Switch to tensorflow 1.8.
- Expand the `Rendered` class and add a `ToTensor` class to let more functions - Expand the `Rendered` class and add a `ToTensor` class to let more functions
(gradients, feed, colocateWith) support `ResourceHandle` wrappers like (gradients, feed, colocateWith) support `ResourceHandle` wrappers like
`Variables`. `Variables`.

6
ci_build/Dockerfile
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.7.0 FROM tensorflow/tensorflow:1.8.0
LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>" LABEL 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
@ -28,8 +28,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.7.0.tar.gz && \ curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.8.0.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.7.0.tar.gz -C /usr/local && \ tar zxf libtensorflow-cpu-linux-x86_64-1.8.0.tar.gz -C /usr/local && \
ldconfig && \ ldconfig && \
stack setup && \ stack setup && \
stack test --only-dependencies stack test --only-dependencies

6
docker/Dockerfile
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.7.0 FROM tensorflow/tensorflow:1.8.0
LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>" LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
RUN apt-get update RUN apt-get update
@ -27,8 +27,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.7.0.tar.gz && \ curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.8.0.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.7.0.tar.gz -C /usr/local && \ tar zxf libtensorflow-cpu-linux-x86_64-1.8.0.tar.gz -C /usr/local && \
ldconfig ldconfig
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8

8
docker/gpu/Dockerfile
View file

@ -1,6 +1,6 @@
# Prepare the image with: # Prepare the image with:
# docker build -t tensorflow/haskell:1.3.0-gpu docker/gpu # docker build -t tensorflow/haskell:1.8.0-gpu docker/gpu
FROM gcr.io/tensorflow/tensorflow:1.3.0-gpu FROM gcr.io/tensorflow/tensorflow:1.8.0-gpu
LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>" LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
RUN apt-get update RUN apt-get update
@ -27,8 +27,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-gpu-linux-x86_64-1.3.0.tar.gz && \ curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.8.0.tar.gz && \
tar zxf libtensorflow-gpu-linux-x86_64-1.3.0.tar.gz -C /usr/local && \ tar zxf libtensorflow-gpu-linux-x86_64-1.8.0.tar.gz -C /usr/local && \
ldconfig ldconfig
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8

4
tensorflow-core-ops/Setup.hs
View file

@ -92,8 +92,10 @@ blackList =
[ -- Requires the "func" type: [ -- Requires the "func" type:
"FilterDataset" "FilterDataset"
, "FlatMapDataset" , "FlatMapDataset"
, "For"
, "GeneratorDataset" , "GeneratorDataset"
, "GroupByWindowDataset" , "GroupByWindowDataset"
, "If"
, "InterleaveDataset" , "InterleaveDataset"
, "MapAndBatchDataset" , "MapAndBatchDataset"
, "MapDataset" , "MapDataset"
@ -104,6 +106,8 @@ blackList =
, "RemoteCall" , "RemoteCall"
, "ScanDataset" , "ScanDataset"
, "SymbolicGradient" , "SymbolicGradient"
, "TPUReplicate"
, "While"
, "_If" , "_If"
, "_While" , "_While"
] ]

2
third_party/tensorflow vendored

@ -1 +1 @@
Subproject commit 92e6c3e4f5c1cabfda1e61547a6a1b268ef95fa5 Subproject commit 93bc2e2072e0daccbcff7a90d397b704a9e8f778

2
tools/install_macos_dependencies.sh
View file

@ -25,7 +25,7 @@ else
fi fi
echo "Downloading libtensorflow..." echo "Downloading libtensorflow..."
curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.7.0.tar.gz > libtensorflow.tar.gz curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.8.0.tar.gz > libtensorflow.tar.gz
echo "Extracting and copying libtensorflow..." echo "Extracting and copying libtensorflow..."
sudo tar zxf libtensorflow.tar.gz -C /usr/local sudo tar zxf libtensorflow.tar.gz -C /usr/local

4
tools/userchroot.nix
View file

@ -13,8 +13,8 @@ let
name = "tensorflow-c"; name = "tensorflow-c";
src = fetchurl { src = fetchurl {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.7.0.tar.gz"; url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.8.0.tar.gz";
sha256 = "621642b1fddd3831e048817d2220d9d7cf8ba359ac81c83a808bcdd9a982ee90"; sha256 = "0a8e334d7c20879df9857c762472329d70cbf2f316af113d0b26f5c17209fe63";
}; };
buildCommand = '' buildCommand = ''