diff --git a/.gitignore b/.gitignore index c9f81e4..7195879 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .stack/ tensorflow-mnist-input-data/data/*.gz .DS_Store +stack.yaml.lock diff --git a/docker/Dockerfile b/docker/Dockerfile index 25f9d24..c0a1f16 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.14.0 +FROM tensorflow/tensorflow:2.3.0 LABEL maintainer="TensorFlow authors " RUN apt-get update @@ -28,11 +28,11 @@ RUN dpkg-reconfigure locales && \ # Installs protoc and the libraries. RUN \ - curl -O -L https://github.com/google/protobuf/releases/download/v3.9.1/protoc-3.9.1-linux-x86_64.zip && \ - unzip -d /usr/local protoc-3.9.1-linux-x86_64.zip bin/protoc && \ + curl -O -L https://github.com/google/protobuf/releases/download/v3.13.0/protoc-3.13.0-linux-x86_64.zip && \ + unzip -d /usr/local protoc-3.13.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.14.0.tar.gz && \ - tar zxf libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz -C /usr/local && \ + curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.3.0.tar.gz && \ + tar zxf libtensorflow-cpu-linux-x86_64-2.3.0.tar.gz -C /usr/local && \ ldconfig ENV LANG en_US.UTF-8 diff --git a/docker/gpu/Dockerfile b/docker/gpu/Dockerfile index 81272bd..dfc22c7 100644 --- a/docker/gpu/Dockerfile +++ b/docker/gpu/Dockerfile @@ -1,6 +1,6 @@ # Prepare the image with: # docker build -t tensorflow/haskell:1.14.0-gpu docker/gpu -FROM tensorflow/tensorflow:1.14.0-gpu +FROM tensorflow/tensorflow:2.3.0-gpu LABEL maintainer="TensorFlow authors " RUN apt-get update @@ -28,11 +28,11 @@ RUN dpkg-reconfigure locales && \ # Installs protoc and the libraries. RUN \ - curl -O -L https://github.com/google/protobuf/releases/download/v3.9.1/protoc-3.9.1-linux-x86_64.zip && \ - unzip -d /usr/local protoc-3.9.1-linux-x86_64.zip bin/protoc && \ + curl -O -L https://github.com/google/protobuf/releases/download/v3.13.0/protoc-3.13.0-linux-x86_64.zip && \ + unzip -d /usr/local protoc-3.13.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.14.0.tar.gz && \ - tar zxf libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz -C /usr/local && \ + curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-2.3.0.tar.gz && \ + tar zxf libtensorflow-gpu-linux-x86_64-2.3.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 7d478dd..aebd49d 100644 --- a/tensorflow-core-ops/Setup.hs +++ b/tensorflow-core-ops/Setup.hs @@ -105,6 +105,8 @@ blackList = , "GroupByWindowDataset" , "If" , "InterleaveDataset" + , "LegacyParallelInterleaveDatasetV2" + , "LoadDataset" , "MapAndBatchDataset" , "MapAndBatchDatasetV2" , "MapDataset" @@ -112,16 +114,24 @@ blackList = , "OneShotIterator" , "ParallelInterleaveDataset" , "ParallelInterleaveDatasetV2" + , "ParallelInterleaveDatasetV3" + , "ParallelInterleaveDatasetV4" , "ParallelMapDataset" + , "ParallelMapDatasetV2" , "ParseSequenceExample" + , "ParseSequenceExampleV2" + , "ParseSingleSequenceExample" , "PartitionedCall" , "ReduceDataset" , "RemoteCall" + , "SaveDataset" , "ScanDataset" + , "SnapshotDatasetV2" , "StatefulPartitionedCall" , "StatelessIf" , "StatelessWhile" , "SymbolicGradient" + , "TakeWhileDataset" , "TPUPartitionedCall" , "TPUReplicate" , "While" @@ -130,6 +140,7 @@ blackList = , "XlaReduce" , "XlaReduceWindow" , "XlaSelectAndScatter" + , "XlaScatter" , "XlaWhile" , "_If" , "_TPUReplicate" diff --git a/tensorflow-proto/tensorflow-proto.cabal b/tensorflow-proto/tensorflow-proto.cabal index 5d453b8..f17122e 100644 --- a/tensorflow-proto/tensorflow-proto.cabal +++ b/tensorflow-proto/tensorflow-proto.cabal @@ -73,6 +73,8 @@ library , Proto.Tensorflow.Core.Protobuf.ControlFlow_Fields , Proto.Tensorflow.Core.Protobuf.Debug , Proto.Tensorflow.Core.Protobuf.Debug_Fields + , Proto.Tensorflow.Core.Protobuf.DeviceFilters + , Proto.Tensorflow.Core.Protobuf.ErrorCodes , Proto.Tensorflow.Core.Protobuf.MetaGraph , Proto.Tensorflow.Core.Protobuf.MetaGraph_Fields , Proto.Tensorflow.Core.Protobuf.NamedTensor @@ -83,12 +85,16 @@ library , Proto.Tensorflow.Core.Protobuf.RewriterConfig_Fields , Proto.Tensorflow.Core.Protobuf.SavedModel , Proto.Tensorflow.Core.Protobuf.SavedModel_Fields + , Proto.Tensorflow.Core.Protobuf.SavedObjectGraph , Proto.Tensorflow.Core.Protobuf.Saver , Proto.Tensorflow.Core.Protobuf.Saver_Fields + , Proto.Tensorflow.Core.Protobuf.Struct , Proto.Tensorflow.Core.Protobuf.TensorBundle , Proto.Tensorflow.Core.Protobuf.TensorBundle_Fields , Proto.Tensorflow.Core.Protobuf.TensorflowServer , Proto.Tensorflow.Core.Protobuf.TensorflowServer_Fields + , Proto.Tensorflow.Core.Protobuf.TrackableObjectGraph + , Proto.Tensorflow.Core.Protobuf.VerifierConfig , Proto.Tensorflow.Core.Util.Event , Proto.Tensorflow.Core.Util.Event_Fields , Proto.Tensorflow.Core.Util.MemmappedFileSystem @@ -125,6 +131,7 @@ library , Proto.Tensorflow.Core.Framework.OpDef_Fields , Proto.Tensorflow.Core.Framework.ResourceHandle , Proto.Tensorflow.Core.Framework.ResourceHandle_Fields + , Proto.Tensorflow.Core.Protobuf.SavedObjectGraph , Proto.Tensorflow.Core.Framework.StepStats , Proto.Tensorflow.Core.Framework.StepStats_Fields , Proto.Tensorflow.Core.Framework.Summary @@ -152,6 +159,8 @@ library , Proto.Tensorflow.Core.Protobuf.ControlFlow_Fields , Proto.Tensorflow.Core.Protobuf.Debug , Proto.Tensorflow.Core.Protobuf.Debug_Fields + , Proto.Tensorflow.Core.Protobuf.DeviceFilters + , Proto.Tensorflow.Core.Protobuf.ErrorCodes , Proto.Tensorflow.Core.Protobuf.MetaGraph , Proto.Tensorflow.Core.Protobuf.MetaGraph_Fields , Proto.Tensorflow.Core.Protobuf.NamedTensor @@ -162,12 +171,16 @@ library , Proto.Tensorflow.Core.Protobuf.RewriterConfig_Fields , Proto.Tensorflow.Core.Protobuf.SavedModel , Proto.Tensorflow.Core.Protobuf.SavedModel_Fields + , Proto.Tensorflow.Core.Protobuf.SavedObjectGraph , Proto.Tensorflow.Core.Protobuf.Saver , Proto.Tensorflow.Core.Protobuf.Saver_Fields + , Proto.Tensorflow.Core.Protobuf.Struct , Proto.Tensorflow.Core.Protobuf.TensorBundle , Proto.Tensorflow.Core.Protobuf.TensorBundle_Fields , Proto.Tensorflow.Core.Protobuf.TensorflowServer , Proto.Tensorflow.Core.Protobuf.TensorflowServer_Fields + , Proto.Tensorflow.Core.Protobuf.TrackableObjectGraph + , Proto.Tensorflow.Core.Protobuf.VerifierConfig , Proto.Tensorflow.Core.Util.Event , Proto.Tensorflow.Core.Util.Event_Fields , Proto.Tensorflow.Core.Util.MemmappedFileSystem diff --git a/third_party/tensorflow b/third_party/tensorflow index 6612da8..b36436b 160000 --- a/third_party/tensorflow +++ b/third_party/tensorflow @@ -1 +1 @@ -Subproject commit 6612da89516247503f03ef76e974b51a434fb52e +Subproject commit b36436b087bd8e8701ef51718179037cccdfc26e