From 26f6439b7317861e51338684aff0d68aa96e5be2 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 15 Aug 2024 08:09:06 -0700 Subject: [PATCH] Bump TF to 2.17 Signed-off-by: Mihai Maruseac --- README.md | 4 ++-- ci_build/Dockerfile | 6 +++--- docker/Dockerfile | 8 ++++---- docker/gpu/Dockerfile | 8 ++++---- stack.yaml | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index e6e447b..2c99f7c 100644 --- 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.12.0 docker +docker build -t tensorflow/haskell:2.17.0 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.12.0-gpu +IMAGE_NAME=tensorflow/haskell:2.17.0-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 index c6b99f0..8995c07 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:2.12.0 +FROM tensorflow/tensorflow:2.17.0 LABEL maintainer="TensorFlow authors " # 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.12.0.tar.gz && \ - tar zxf libtensorflow-cpu-linux-x86_64-2.12.0.tar.gz -C /usr/local && \ + curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.17.0.tar.gz && \ + tar zxf libtensorflow-cpu-linux-x86_64-2.17.0.tar.gz -C /usr/local && \ ldconfig && \ stack setup && \ stack test --only-dependencies diff --git a/docker/Dockerfile b/docker/Dockerfile index d8734aa..22adc5a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ # Prepare the image with: -# docker build -t tensorflow/haskell:2.12.0 docker -FROM tensorflow/tensorflow:2.12.0 +# docker build -t tensorflow/haskell:2.17.0 docker +FROM tensorflow/tensorflow:2.17.0 LABEL maintainer="TensorFlow authors " 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.12.0.tar.gz && \ - tar zxf libtensorflow-cpu-linux-x86_64-2.12.0.tar.gz -C /usr/local && \ + curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.17.0.tar.gz && \ + tar zxf libtensorflow-cpu-linux-x86_64-2.17.0.tar.gz -C /usr/local && \ ldconfig ENV LANG en_US.UTF-8 diff --git a/docker/gpu/Dockerfile b/docker/gpu/Dockerfile index 2594fba..76eef97 100644 --- a/docker/gpu/Dockerfile +++ b/docker/gpu/Dockerfile @@ -1,6 +1,6 @@ # Prepare the image with: -# docker build -t tensorflow/haskell:2.12.0-gpu docker/gpu -FROM tensorflow/tensorflow:2.12.0-gpu +# docker build -t tensorflow/haskell:2.17.0-gpu docker/gpu +FROM tensorflow/tensorflow:2.17.0-gpu LABEL maintainer="TensorFlow authors " 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.12.0.tar.gz && \ - tar zxf libtensorflow-gpu-linux-x86_64-2.12.0.tar.gz -C /usr/local && \ + curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-2.17.0.tar.gz && \ + tar zxf libtensorflow-gpu-linux-x86_64-2.17.0.tar.gz -C /usr/local && \ ldconfig ENV LANG en_US.UTF-8 diff --git a/stack.yaml b/stack.yaml index ee53ca8..8b096ec 100644 --- a/stack.yaml +++ b/stack.yaml @@ -29,10 +29,10 @@ extra-include-dirs: docker: enable: false - image: tensorflow/haskell:2.12.0 + image: tensorflow/haskell:2.17.0 nix: enable: false - # nixos-22.11 with libtensorflow 2.10.1 - path: ["nixpkgs=https://github.com/NixOS/nixpkgs/archive/2dea8991d89b9f1e78d874945f78ca15f6954289.tar.gz"] + # nixos-24.05 with libtensorflow 2.13.0 + path: ["nixpkgs=https://github.com/NixOS/nixpkgs/archive/63dacb46bf939521bdc93981b4cbb7ecb58427a0.tar.gz"] packages: [snappy, zlib, protobuf, libtensorflow]