eeva/tensorflow-haskell
1
0
Fork 0
mirror of https://github.com/tensorflow/haskell.git synced 2024-06-02 11:03:34 +02:00
Code Issues Releases Wiki Activity

Fix compatilibility with tensorflow 1.14.0

Browse Source
This commit is contained in:
Yorick van Pelt 2019-06-30 18:39:20 +02:00
parent 0d6991d196
commit 675214ef91
No known key found for this signature in database
GPG Key ID: A36E70F9DC014A15
7 changed files with 16 additions and 13 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
## v0.2.0.1
- Switch to tensorflow 1.13.1.
- Switch to tensorflow 1.14.0.
- Compatibility with stackage LTS-13.13.
## v0.2.0.0

2
README.md
View File

@ -91,7 +91,7 @@ stack --docker --docker-image=$IMAGE_NAME build --exec Main
If you want to use GPU you can do:
```
IMAGE_NAME=tensorflow/haskell:1.13.1-gpu
IMAGE_NAME=tensorflow/haskell:1.14.0-gpu
docker build -t $IMAGE_NAME docker/gpu
```

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.13.1
FROM tensorflow/tensorflow:1.14.0
LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
# The build context directory is the top of the tensorflow-haskell
@ -34,8 +34,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.13.1.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.13.1.tar.gz -C /usr/local && \
curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.14.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.13.1
FROM tensorflow/tensorflow:1.14.0
LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
RUN apt-get update
@ -29,8 +29,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.13.1.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.13.1.tar.gz -C /usr/local && \
curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.14.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.13.1-gpu docker/gpu
FROM tensorflow/tensorflow:1.13.1-gpu
# docker build -t tensorflow/haskell:1.14.0-gpu docker/gpu
FROM tensorflow/tensorflow:1.14.0-gpu
LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
RUN apt-get update
@ -29,8 +29,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.13.1.tar.gz && \
tar zxf libtensorflow-gpu-linux-x86_64-1.13.1.tar.gz -C /usr/local && \
curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz && \
tar zxf libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz -C /usr/local && \
ldconfig
ENV LANG en_US.UTF-8

3
tensorflow-core-ops/Setup.hs
View File

@ -92,6 +92,8 @@ blackList =
[ -- Requires the "func" type:
"FilterDataset"
, "BatchFunction"
, "Case"
, "ChooseFastestBranchDataset"
, "ExperimentalGroupByReducerDataset"
, "ExperimentalGroupByWindowDataset"
, "ExperimentalMapAndBatchDataset"
@ -135,6 +137,7 @@ blackList =
, "XlaSelectAndScatter"
, "XlaWhile"
, "_If"
, "_TPUReplicate"
, "_While"
, "_XlaCompile"
]

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.13.1.tar.gz > "$TMP_DIR/libtensorflow.tar.gz"
curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz > "$TMP_DIR/libtensorflow.tar.gz"
echo "Extracting and copying libtensorflow..."
tar zxf "$TMP_DIR/libtensorflow.tar.gz" -C "$TMP_DIR"