Merge pull request #426 from adamcrume/master

Upgrade to TensorFlow 2.18.0

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Setup Python # Set Python version
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: "3.10"
       # Install pip and pytest
       - name: Install dependencies
         run: |

.github/workflows/requirements.txt

@@ -1 +1,2 @@
-tensorflow == 2.13.0
+tensorflow == 2.18.0
+tf_keras == 2.18.0

RELEASING.md

@@ -36,7 +36,7 @@ Note that any crate not mentioned here (e.g. tensorflow-proto-codegen, tensorflo
    1. Bump the version for `tensorflow-internal-macros` in the root `Cargo.toml`
 1. Bump the version number in `Cargo.toml`
 1. Bump the version number in `README.md`
-1. Run `./test-all`
+1. Inside a virtualenv, run `./test-all`.  (See "Running in a virtualenv" section.)
 1. Double-check that addition.py is built using the version of TensorFlow being linked against.  (See "Upgrading TensorFlow" section.)
 1. Run `./run-valgrind`
 1. Commit and push the changes. (Push before publishing to ensure that the changes being published are up to date.)
@@ -56,12 +56,12 @@ Note that any crate not mentioned here (e.g. tensorflow-proto-codegen, tensorflo
 ## Upgrading TensorFlow
 
 1. Update version and tag in tensorflow-sys/build.rs
-1. Update version in run-valgrind
-1. Run `python examples/addition/addition.py` using the version of TensorFlow being linked against.
-   (Use pip in a virtualenv, see https://www.tensorflow.org/install/pip#2-create-a-virtual-environment-recommended)
-   1. Run `virtualenv --system-site-packages -p python3 ~/tensorflow-${TENSORFLOW_VERSION?}`
-   1. Run `source ~/tensorflow-${TENSORFLOW_VERSION?}/bin/activate` to activate the virtualenv
-   1. Run `pip install --upgrade pip`
-   1. Run `pip install --upgrade tensorflow==${TENSORFLOW_VERSION?}`
-   1. Run `python examples/addition/addition.py`
-   1. Run `deactivate` to exit the virtualenv
+1. Update version in .github/workflow/requirements.txt
+1. Inside a virtualenv using the version of TensorFlow being linked against, run `python examples/addition/addition.py`.  (See "Running in a virtualenv" section.)
+
+## Running in a virtualenv
+
+1. If you haven't set it up, run `./create-virtualenv ${TENSORFLOW_VERSION?}`
+1. Run `source ~/tensorflow-${TENSORFLOW_VERSION?}/bin/activate` to activate the virtualenv
+1. Do whatever you need to do in the virtual env
+1. Run `deactivate` to exit the virtualenv

check-disk-space

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -euo pipefail
+
+df -h || true
+du -sh || true
+du -sh /* || true

create-virtualenv

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# See https://www.tensorflow.org/install/pip#2-create-a-virtual-environment-recommended
+
+set -euo pipefail
+
+if [ "$#" -lt 1 ]; then
+     echo "Expected first argument to be TensorFlow version"
+     exit 1
+fi
+TENSORFLOW_VERSION="$1"
+
+function run {
+    echo "----------------------------------------------------------------------"
+    echo "Running: $@"
+    "$@"
+    echo
+}
+
+run virtualenv --system-site-packages -p python3 ~/tensorflow-${TENSORFLOW_VERSION?}
+run source ~/tensorflow-${TENSORFLOW_VERSION?}/bin/activate
+run pip install --upgrade pip
+run pip install --upgrade tensorflow==${TENSORFLOW_VERSION?}
+run pip install tf_keras # required for examples/mobilenetv3
+run deactivate

run-valgrind

@@ -19,8 +19,6 @@ function run {
     echo
 }
 
-tensorflow_version=2.13.0
-
 valgrind_log=valgrind.log
 truncate --size=0 "$valgrind_log"