Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update TF to 2.17 #296

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update TF to 2.17 #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ci_build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"

# The build context directory is the top of the tensorflow-haskell
Expand Down Expand Up @@ -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
8 changes: 4 additions & 4 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

RUN apt-get update
Expand Down Expand Up @@ -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
8 changes: 4 additions & 4 deletions docker/gpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"

RUN apt-get update
Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]