Tensorflow 2.3.0 Support (#267)

* Tensorflow 2.3.0 building and passing tests.
* Added einsum and test.
* Added ByteString as a possible argument to a function.
* Support more data types for Adam.
* Move to later version of LTS on stackage.
* Added a wrapper module for convolution functions.
* Update ci build to use a later version of stack.
* Removed a deprecated import in GradientTest.

Author: jcmartin

.gitignore

@@ -2,3 +2,4 @@
 .stack/
 tensorflow-mnist-input-data/data/*.gz
 .DS_Store
+stack.yaml.lock

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.14.0
+FROM tensorflow/tensorflow:2.3.0
 LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
 
 # The build context directory is the top of the tensorflow-haskell
@@ -30,14 +30,14 @@ RUN \
         netbase \
         && \
     # Installs stack.
-    curl -O -L https://github.com/commercialhaskell/stack/releases/download/v2.1.3/stack-2.1.3-linux-x86_64.tar.gz && \
-    tar zxf stack-2.1.3-linux-x86_64.tar.gz -C /usr/local/bin stack-2.1.3-linux-x86_64/stack --strip 1 && \
+    curl -O -L https://github.com/commercialhaskell/stack/releases/download/v2.5.1/stack-2.5.1-linux-x86_64.tar.gz && \
+    tar zxf stack-2.5.1-linux-x86_64.tar.gz -C /usr/local/bin stack-2.5.1-linux-x86_64/stack --strip 1 && \
     # Installs protoc and the libraries.
-    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 && \
     stack setup && \
     stack test --only-dependencies

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 <tensorflow-haskell@googlegroups.com>"
 
 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

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 <tensorflow-haskell@googlegroups.com>"
 
 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

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-15.11
+resolver: lts-16.18
 
 packages:
 - tensorflow

tensorflow-core-ops/Setup.hs

@@ -105,23 +105,33 @@ blackList =
     , "GroupByWindowDataset"
     , "If"
     , "InterleaveDataset"
+    , "LegacyParallelInterleaveDatasetV2"
+    , "LoadDataset"
     , "MapAndBatchDataset"
     , "MapAndBatchDatasetV2"
     , "MapDataset"
     , "MapDefun"
     , "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"

tensorflow-core-ops/tensorflow-core-ops.cabal

@@ -16,7 +16,7 @@ library
   exposed-modules:  TensorFlow.GenOps.Core
   autogen-modules:  TensorFlow.GenOps.Core
   build-depends:  bytestring
-                , proto-lens == 0.6.*
+                , proto-lens == 0.7.*
                 , tensorflow == 0.2.*
                 , base >= 4.7 && < 5
                 , lens-family == 2.*
@@ -27,7 +27,7 @@ custom-setup
   setup-depends: Cabal
                 , bytestring
                 , directory
-                , proto-lens == 0.6.*
+                , proto-lens == 0.7.*
                 , tensorflow-opgen == 0.2.*
                 , tensorflow == 0.2.*
                 , base >= 4.7 && < 5

tensorflow-logging/tensorflow-logging.cabal

@@ -24,7 +24,7 @@ library
                 , filepath
                 , hostname
                 , lens-family == 2.*
-                , proto-lens == 0.6.*
+                , proto-lens == 0.7.*
                 , resourcet
                 , stm
                 , stm-chans

tensorflow-mnist/tensorflow-mnist.cabal

@@ -20,7 +20,7 @@ library
   exposed-modules: TensorFlow.Examples.MNIST.Parse
                 ,  TensorFlow.Examples.MNIST.TrainedGraph
   other-modules:  Paths_tensorflow_mnist
-  build-depends: proto-lens == 0.6.*
+  build-depends: proto-lens == 0.7.*
                 , base >= 4.7 && < 5
                 , binary
                 , bytestring

tensorflow-opgen/src/TensorFlow/OpGen/ParsedOp.hs

@@ -266,7 +266,7 @@ getExplicitInputAttr o implicitAttrs a
     , a ^. maybe'defaultValue == Nothing
     , t <- parseAttrType o (a ^. type')
     , t `elem` map AttrSingle
-                    [AttrBool, AttrInt64, AttrFloat, AttrType, AttrShape]
+                    [AttrBool, AttrInt64, AttrFloat, AttrType, AttrShape, AttrBytes]
                 ++ [AttrList AttrType] = Just t
     | otherwise = Nothing
 

tensorflow-opgen/tensorflow-opgen.cabal

@@ -16,7 +16,7 @@ library
   hs-source-dirs:      src
   exposed-modules:     TensorFlow.OpGen.ParsedOp
                      , TensorFlow.OpGen
-  build-depends:  proto-lens == 0.6.*
+  build-depends:  proto-lens == 0.7.*
                 , tensorflow-proto == 0.2.*
                 , base >= 4.7 && < 5
                 , bytestring