Skip to content

Fix compatibility with tensorflow 1.14.0 #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# ChangeLog

## v0.2.0.1
- Switch to tensorflow 1.14.0.
- Compatibility with stackage LTS-13.13.

## v0.2.0.0
- Switch to tensorflow 1.9.
- Switch to proto-lens 0.2.2.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0-gpu
IMAGE_NAME=tensorflow/haskell:1.14.0-gpu
docker build -t $IMAGE_NAME docker/gpu
```

Expand Down
10 changes: 7 additions & 3 deletions ci_build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# stack to be installed on the host. This comes at the expense of
# flexibility.

FROM tensorflow/tensorflow:1.9.0
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
Expand All @@ -22,6 +22,10 @@ RUN \
# Makes stack viable in the container
libgmp-dev \
libcurl3-dev \
zlib1g-dev \
# For fetching dependencies
curl \
unzip \
# Required for tcp connections by stack (See: https://github.com/tensorflow/haskell/issues/182)
netbase \
&& \
Expand All @@ -32,8 +36,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.9.0.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.9.0.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
10 changes: 7 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Prepare the image with:
# docker build -t tensorflow/haskell:v0 docker
FROM tensorflow/tensorflow:1.9.0
FROM tensorflow/tensorflow:1.14.0
LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"

RUN apt-get update
Expand All @@ -12,6 +12,10 @@ RUN apt-get install -y \
libncurses5-dev \
# Makes stack viable in the container
libgmp-dev \
zlib1g-dev \
# For fetching dependencies
curl \
unzip \
# Required for locales configuration.
locales \
# Required for tcp connections by stack (See: https://github.com/tensorflow/haskell/issues/182)
Expand All @@ -27,8 +31,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.9.0.tar.gz && \
tar zxf libtensorflow-cpu-linux-x86_64-1.9.0.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
12 changes: 8 additions & 4 deletions docker/gpu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Prepare the image with:
# docker build -t tensorflow/haskell:1.9.0-gpu docker/gpu
FROM tensorflow/tensorflow:1.9.0-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
Expand All @@ -14,6 +14,10 @@ RUN apt-get install -y \
libncurses5-dev \
# Makes stack viable in the container
libgmp-dev \
zlib1g-dev \
# For fetching dependencies
curl \
unzip \
# Required for locales configuration.
locales

Expand All @@ -27,8 +31,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.9.0.tar.gz && \
tar zxf libtensorflow-gpu-linux-x86_64-1.9.0.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
25 changes: 24 additions & 1 deletion tensorflow-core-ops/Setup.hs
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,18 @@ fudgePackageDesc lbi p = p
blackList =
[ -- Requires the "func" type:
"FilterDataset"
, "BatchFunction"
, "Case"
, "ChooseFastestBranchDataset"
, "ExperimentalGroupByReducerDataset"
, "ExperimentalGroupByWindowDataset"
, "ExperimentalMapAndBatchDataset"
, "ExperimentalMapDataset"
, "ExperimentalNumaMapAndBatchDataset"
, "ExperimentalParallelInterleaveDataset"
, "ExperimentalScanDataset"
, "ExperimentalTakeWhileDataset"
, "FilterDataset"
, "FlatMapDataset"
, "For"
, "GeneratorDataset"
Expand All @@ -101,22 +113,33 @@ blackList =
, "MapAndBatchDataset"
, "MapAndBatchDatasetV2"
, "MapDataset"
, "MapDataset"
, "MapDefun"
, "OneShotIterator"
, "ParallelInterleaveDataset"
, "ParallelInterleaveDatasetV2"
, "ParallelMapDataset"
, "ParseSequenceExample"
, "PartitionedCall"
, "ReduceDataset"
, "RemoteCall"
, "ScanDataset"
, "StatefulPartitionedCall"
, "StatelessIf"
, "StatelessWhile"
, "SymbolicGradient"
, "TPUPartitionedCall"
, "TPUReplicate"
, "While"
, "XlaIf"
, "XlaLaunch"
, "XlaReduce"
, "XlaReduceWindow"
, "XlaSelectAndScatter"
, "XlaWhile"
, "_If"
, "_TPUReplicate"
, "_While"
, "_XlaCompile"
]

autogenModulesDir :: LocalBuildInfo -> FilePath
Expand Down
2 changes: 1 addition & 1 deletion third_party/tensorflow
Submodule tensorflow updated 10600 files
2 changes: 1 addition & 1 deletion tools/install_macos_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0.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"
Expand Down