diff --git a/ChangeLog.md b/ChangeLog.md index f9ff490..7d3fbf3 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,7 +1,7 @@ # ChangeLog ## 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 (gradients, feed, colocateWith) support `ResourceHandle` wrappers like `Variables`. diff --git a/ci_build/Dockerfile b/ci_build/Dockerfile index e367340..ebde853 100644 --- a/ci_build/Dockerfile +++ b/ci_build/Dockerfile @@ -3,7 +3,7 @@ # stack to be installed on the host. This comes at the expense of # flexibility. -FROM tensorflow/tensorflow:1.7.0 +FROM tensorflow/tensorflow:1.8.0 LABEL maintainer="TensorFlow authors " # 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 && \ 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.7.0.tar.gz && \ - tar zxf libtensorflow-cpu-linux-x86_64-1.7.0.tar.gz -C /usr/local && \ + 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 && \ ldconfig && \ stack setup && \ stack test --only-dependencies diff --git a/docker/Dockerfile b/docker/Dockerfile index 7231f44..ac834a5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ # Prepare the image with: # docker build -t tensorflow/haskell:v0 docker -FROM tensorflow/tensorflow:1.7.0 +FROM tensorflow/tensorflow:1.8.0 LABEL maintainer="TensorFlow authors " 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.7.0.tar.gz && \ - tar zxf libtensorflow-cpu-linux-x86_64-1.7.0.tar.gz -C /usr/local && \ + 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 && \ ldconfig ENV LANG en_US.UTF-8 diff --git a/docker/gpu/Dockerfile b/docker/gpu/Dockerfile index 2798f06..66e7b43 100644 --- a/docker/gpu/Dockerfile +++ b/docker/gpu/Dockerfile @@ -1,6 +1,6 @@ # Prepare the image with: -# docker build -t tensorflow/haskell:1.3.0-gpu docker/gpu -FROM gcr.io/tensorflow/tensorflow:1.3.0-gpu +# docker build -t tensorflow/haskell:1.8.0-gpu docker/gpu +FROM gcr.io/tensorflow/tensorflow:1.8.0-gpu LABEL maintainer="TensorFlow authors " 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.3.0.tar.gz && \ - tar zxf libtensorflow-gpu-linux-x86_64-1.3.0.tar.gz -C /usr/local && \ + 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 && \ ldconfig ENV LANG en_US.UTF-8 diff --git a/tensorflow-core-ops/Setup.hs b/tensorflow-core-ops/Setup.hs index a127306..a040088 100644 --- a/tensorflow-core-ops/Setup.hs +++ b/tensorflow-core-ops/Setup.hs @@ -92,8 +92,10 @@ blackList = [ -- Requires the "func" type: "FilterDataset" , "FlatMapDataset" + , "For" , "GeneratorDataset" , "GroupByWindowDataset" + , "If" , "InterleaveDataset" , "MapAndBatchDataset" , "MapDataset" @@ -104,6 +106,8 @@ blackList = , "RemoteCall" , "ScanDataset" , "SymbolicGradient" + , "TPUReplicate" + , "While" , "_If" , "_While" ] diff --git a/third_party/tensorflow b/third_party/tensorflow index 92e6c3e..93bc2e2 160000 --- a/third_party/tensorflow +++ b/third_party/tensorflow @@ -1 +1 @@ -Subproject commit 92e6c3e4f5c1cabfda1e61547a6a1b268ef95fa5 +Subproject commit 93bc2e2072e0daccbcff7a90d397b704a9e8f778 diff --git a/tools/install_macos_dependencies.sh b/tools/install_macos_dependencies.sh index a320916..918bada 100755 --- a/tools/install_macos_dependencies.sh +++ b/tools/install_macos_dependencies.sh @@ -25,7 +25,7 @@ else fi 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..." sudo tar zxf libtensorflow.tar.gz -C /usr/local diff --git a/tools/userchroot.nix b/tools/userchroot.nix index 0e0a7cb..6394e23 100644 --- a/tools/userchroot.nix +++ b/tools/userchroot.nix @@ -13,8 +13,8 @@ let name = "tensorflow-c"; src = fetchurl { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.7.0.tar.gz"; - sha256 = "621642b1fddd3831e048817d2220d9d7cf8ba359ac81c83a808bcdd9a982ee90"; + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.8.0.tar.gz"; + sha256 = "0a8e334d7c20879df9857c762472329d70cbf2f316af113d0b26f5c17209fe63"; }; buildCommand = ''