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.9

Browse source
This commit is contained in:
helq 2018-07-24 16:17:08 -05:00
parent e40d2c44f0
commit ecfea97992
7 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog.md
View file

@ -1,5 +1,8 @@
# ChangeLog
## v0.2.0.1
- Switch to tensorflow 1.9.
## v0.2.0.0
- Switch to tensorflow 1.8.
- Switch to proto-lens 0.2.2.

6
ci_build/Dockerfile
View file

@ -3,7 +3,7 @@
# stack to be installed on the host. This comes at the expense of
# flexibility.
FROM tensorflow/tensorflow:1.8.0
FROM tensorflow/tensorflow:1.9.0
LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
# The build context directory is the top of the tensorflow-haskell
@ -32,8 +32,8 @@ RUN \
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 && \
chmod 755 /usr/local/bin/protoc && \
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.8.0.tar.gz -C /usr/local && \
curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.9.0.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.9.0.tar.gz -C /usr/local && \
ldconfig && \
stack setup && \
stack test --only-dependencies

6
docker/Dockerfile
View file

@ -1,6 +1,6 @@
# Prepare the image with:
# docker build -t tensorflow/haskell:v0 docker
FROM tensorflow/tensorflow:1.8.0
FROM tensorflow/tensorflow:1.9.0
LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
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 && \
unzip -d /usr/local protoc-3.2.0-linux-x86_64.zip bin/protoc && \
chmod 755 /usr/local/bin/protoc && \
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.8.0.tar.gz -C /usr/local && \
curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.9.0.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.9.0.tar.gz -C /usr/local && \
ldconfig
ENV LANG en_US.UTF-8

8
docker/gpu/Dockerfile
View file

@ -1,6 +1,6 @@
# Prepare the image with:
# docker build -t tensorflow/haskell:1.8.0-gpu docker/gpu
FROM gcr.io/tensorflow/tensorflow:1.8.0-gpu
# docker build -t tensorflow/haskell:1.9.0-gpu docker/gpu
FROM gcr.io/tensorflow/tensorflow:1.9.0-gpu
LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
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 && \
unzip -d /usr/local protoc-3.2.0-linux-x86_64.zip bin/protoc && \
chmod 755 /usr/local/bin/protoc && \
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.8.0.tar.gz -C /usr/local && \
curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.9.0.tar.gz && \
tar zxf libtensorflow-gpu-linux-x86_64-1.9.0.tar.gz -C /usr/local && \
ldconfig
ENV LANG en_US.UTF-8

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

@ -94,20 +94,27 @@ blackList =
, "FlatMapDataset"
, "For"
, "GeneratorDataset"
, "GroupByReducerDataset"
, "GroupByWindowDataset"
, "If"
, "InterleaveDataset"
, "MapAndBatchDataset"
, "MapAndBatchDatasetV2"
, "MapDataset"
, "MapDataset"
, "OneShotIterator"
, "ParallelInterleaveDataset"
, "ParallelMapDataset"
, "PartitionedCall"
, "RemoteCall"
, "ScanDataset"
, "SymbolicGradient"
, "TPUReplicate"
, "While"
, "XlaIf"
, "XlaLaunch"
, "XlaReduceWindow"
, "XlaWhile"
, "_If"
, "_While"
]

2
third_party/tensorflow vendored

@ -1 +1 @@
Subproject commit 93bc2e2072e0daccbcff7a90d397b704a9e8f778
Subproject commit 25c197e02393bd44f50079945409009dd4d434f8

2
tools/install_macos_dependencies.sh
View file

@ -27,7 +27,7 @@ fi
TMP_DIR=$(mktemp -d)
echo "Downloading libtensorflow..."
curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.8.0.tar.gz > "$TMP_DIR/libtensorflow.tar.gz"
curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.9.0.tar.gz > "$TMP_DIR/libtensorflow.tar.gz"
echo "Extracting and copying libtensorflow..."
tar zxf "$TMP_DIR/libtensorflow.tar.gz" -C "$TMP_DIR"