tensorflow · fkm3 · Jan 24, 2023 · Jan 17, 2023 · Jan 17, 2023 · Jan 17, 2023
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ working, the following commands will compile and run the tests.
 ```
 git clone --recursive https://github.com/tensorflow/haskell.git tensorflow-haskell
 cd tensorflow-haskell
-docker build -t tensorflow/haskell:2.3.0 docker
+docker build -t tensorflow/haskell:2.10.1 docker
 # TODO: move the setup step to the docker script.
 stack --docker setup
 stack --docker test
@@ -90,7 +90,7 @@ stack --docker build --exec Main
 If you want to use GPU you can do:
 
 ```
-IMAGE_NAME=tensorflow/haskell:2.3.0-gpu
+IMAGE_NAME=tensorflow/haskell:2.10.1-gpu
 docker build -t $IMAGE_NAME docker/gpu
 # TODO: move the setup step to the docker script.
 stack --docker --docker-image=$IMAGE_NAME setup

diff --git 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:2.3.0
+FROM tensorflow/tensorflow:2.10.1
 LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
 
 # The build context directory is the top of the tensorflow-haskell
@@ -36,8 +36,8 @@ RUN \
     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-2.3.0.tar.gz && \
-    tar zxf libtensorflow-cpu-linux-x86_64-2.3.0.tar.gz -C /usr/local && \
+    curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.10.1.tar.gz && \
+    tar zxf libtensorflow-cpu-linux-x86_64-2.10.1.tar.gz -C /usr/local && \
     ldconfig && \
     stack setup && \
     stack test --only-dependencies
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Prepare the image with:
-#   docker build -t tensorflow/haskell:2.3.0 docker
-FROM tensorflow/tensorflow:2.3.0
+#   docker build -t tensorflow/haskell:2.10.1 docker
+FROM tensorflow/tensorflow:2.10.1
 LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
 
 RUN apt-get update
@@ -31,8 +31,8 @@ RUN \
     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-2.3.0.tar.gz && \
-    tar zxf libtensorflow-cpu-linux-x86_64-2.3.0.tar.gz -C /usr/local && \
+    curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.10.1.tar.gz && \
+    tar zxf libtensorflow-cpu-linux-x86_64-2.10.1.tar.gz -C /usr/local && \
     ldconfig
 
 ENV LANG en_US.UTF-8
diff --git a/docker/gpu/Dockerfile b/docker/gpu/Dockerfile
@@ -1,6 +1,6 @@
 # Prepare the image with:
-#   docker build -t tensorflow/haskell:2.3.0-gpu docker/gpu
-FROM tensorflow/tensorflow:2.3.0-gpu
+#   docker build -t tensorflow/haskell:2.10.1-gpu docker/gpu
+FROM tensorflow/tensorflow:2.10.1-gpu
 LABEL maintainer="TensorFlow authors <tensorflow-haskell@googlegroups.com>"
 
 RUN apt-get update
@@ -31,8 +31,8 @@ RUN \
     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-2.3.0.tar.gz && \
-    tar zxf libtensorflow-gpu-linux-x86_64-2.3.0.tar.gz -C /usr/local && \
+    curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-2.10.1.tar.gz && \
+    tar zxf libtensorflow-gpu-linux-x86_64-2.10.1.tar.gz -C /usr/local && \
     ldconfig
 
 ENV LANG en_US.UTF-8
diff --git a/stack.yaml b/stack.yaml
@@ -14,8 +14,10 @@ packages:
 - tensorflow-test
 
 extra-deps:
-- snappy-framing-0.1.2
+- c2hs-0.28.8
+- language-c-0.9.2
 - snappy-0.2.0.2
+- snappy-framing-0.1.2
 
 # For Mac OS X, whose linker doesn't use this path by default
 # unless you run `xcode-select --install`.
@@ -27,10 +29,10 @@ extra-include-dirs:
 
 docker:
     enable: false
-    image: tensorflow/haskell:2.3.0
+    image: tensorflow/haskell:2.10.1
 
 nix:
     enable: false
-    # nixos-21.05 with libtensorflow 2.3.0
-    path: ["nixpkgs=https://github.com/NixOS/nixpkgs/archive/c7cb72b0cae397d311236d6773338efb4bd4f2d1.tar.gz"]
-    packages: [snappy, zlib, protobuf, python3Packages.tensorflow_2.libtensorflow]
+    # nixos-22.11 with libtensorflow 2.10.1
+    path: ["nixpkgs=https://github.com/NixOS/nixpkgs/archive/2dea8991d89b9f1e78d874945f78ca15f6954289.tar.gz"]
+    packages: [snappy, zlib, protobuf, libtensorflow]
diff --git a/tensorflow-core-ops/Setup.hs b/tensorflow-core-ops/Setup.hs
@@ -148,6 +148,16 @@ blackList =
     , "_TPUReplicate"
     , "_While"
     , "_XlaCompile"
+    -- Incorrectly generated:
+    , "_FusedBatchNormGradEx"
+    -- Could not deduce:
+    , "_MklFusedBatchNorm"
+    , "_MklFusedBatchNormEx"
+    , "_MklFusedBatchNormGrad"
+    , "_MklFusedBatchNormGradV2"
+    , "_MklFusedBatchNormGradV3"
+    , "_MklFusedBatchNormV2"
+    , "_MklFusedBatchNormV3"
     ]
 
 autogenModulesDir :: LocalBuildInfo -> FilePath

diff --git a/tensorflow-core-ops/tensorflow-core-ops.cabal b/tensorflow-core-ops/tensorflow-core-ops.cabal
@@ -10,7 +10,7 @@ maintainer:          tensorflow-haskell@googlegroups.com
 copyright:           Google Inc.
 category:            Machine Learning
 build-type:          Custom
-cabal-version:       >=2.0
+cabal-version:       2.0
 
 library
   exposed-modules:  TensorFlow.GenOps.Core

diff --git a/tensorflow-logging/tensorflow-logging.cabal b/tensorflow-logging/tensorflow-logging.cabal
@@ -10,7 +10,7 @@ maintainer:          tensorflow-haskell@googlegroups.com
 copyright:           Google Inc.
 category:            Machine Learning
 build-type:          Simple
-cabal-version:       >=1.22
+cabal-version:       2.0
 
 library
   hs-source-dirs:   src

diff --git a/tensorflow-mnist-input-data/tensorflow-mnist-input-data.cabal b/tensorflow-mnist-input-data/tensorflow-mnist-input-data.cabal
@@ -10,7 +10,7 @@ maintainer:          tensorflow-haskell@googlegroups.com
 copyright:           Google Inc.
 category:            Machine Learning
 build-type:          Custom
-cabal-version:       >=1.24
+cabal-version:       2.0
 -- These files are downloaded automatically by Setup.hs. If the
 -- automatic download fails, follow the instructions in error messages
 -- displayed by Setup.hs.

diff --git a/tensorflow-mnist/tensorflow-mnist.cabal b/tensorflow-mnist/tensorflow-mnist.cabal
@@ -10,7 +10,7 @@ maintainer:          tensorflow-haskell@googlegroups.com
 copyright:           Google Inc.
 category:            Machine Learning
 build-type:          Simple
-cabal-version:       >=1.22
+cabal-version:       2.0
 data-files:          data/*.ckpt
                    , data/*.pb
 

diff --git a/tensorflow-opgen/tensorflow-opgen.cabal b/tensorflow-opgen/tensorflow-opgen.cabal
@@ -10,7 +10,7 @@ maintainer:          tensorflow-haskell@googlegroups.com
 copyright:           Google Inc.
 category:            Machine Learning
 build-type:          Simple
-cabal-version:       >=1.22
+cabal-version:       2.0
 
 library
   hs-source-dirs:      src

diff --git a/tensorflow-ops/tensorflow-ops.cabal b/tensorflow-ops/tensorflow-ops.cabal
@@ -10,7 +10,7 @@ maintainer:          tensorflow-haskell@googlegroups.com
 copyright:           Google Inc.
 category:            Machine Learning
 build-type:          Simple
-cabal-version:       >=1.22
+cabal-version:       2.0
 
 library
   hs-source-dirs:   src