Merge pull request #377 from adamcrume/master

Post-release cleanup

Author: adamcrume

.github/workflows/ci.yml

@@ -28,6 +28,15 @@ jobs:
           toolchain: stable
           override: true
           components: rustfmt
+      - name: Setup Python # Set Python version
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.8
+      # Install pip and pytest
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r .github/workflows/requirements.txt
       - name: Execute test-all
         run: ./test-all
         shell: bash

.github/workflows/requirements.txt

@@ -0,0 +1 @@
+tensorflow == 2.9.1

Cargo.toml

@@ -9,6 +9,7 @@ readme = "README.md"
 repository = "https://github.com/tensorflow/rust"
 documentation = "https://tensorflow.github.io/rust/tensorflow"
 edition = "2018"
+rust-version = "1.59.0"
 
 [lib]
 # We want to run doctests, but they're broken by https://github.com/rust-lang/cargo/issues/8531.
@@ -19,22 +20,22 @@ doctest = false
 features = ["private-docs-rs", "tensorflow_unstable", "ndarray", "eager"]
 
 [dependencies]
-libc = "0.2.98"
-num-complex = { version = "0.4.0", default-features = false }
+libc = "0.2.132"
+num-complex = { version = "0.4.2", default-features = false }
 tensorflow-internal-macros = { version = "=0.0.3", path = "tensorflow-internal-macros" }
 tensorflow-sys = { version = "0.22.1", path = "tensorflow-sys" }
 byteorder = "1.4.3"
-crc = "2.0.0"
-half = "1.7.1"
+crc = "3.0.0"
+half = "2.1.0"
 # This is used internally but not intended to be exposed through the API.
 protobuf = "=2.27.1"
 # Enables conversions between ndarray::Array objects and tensorflow::Tensor
-ndarray = { version = "0.15.3", optional = true }
-rustversion = "1.0.5"
+ndarray = { version = "0.15.6", optional = true }
+rustversion = "1.0.9"
 
 [dev-dependencies]
 random = "0.12.2"
-serial_test = "0.5.1"
+serial_test = "0.9.0"
 
 [features]
 tensorflow_gpu = ["tensorflow-sys/tensorflow_gpu"]

RELEASING.md

@@ -1,11 +1,13 @@
 ## Pre-release
 
+1. Clean up clippy lints
+1. Run `cargo audit` and fix any issues
 1. Generate protos
-   1. Run `cd tensorflow-proto-codegen; cargo run -- $PATH_TO_TENSORFLOW $PWD/..`
+   1. Run `cd tensorflow-proto-codegen; cargo run -- ${PATH_TO_TENSORFLOW?} $PWD/..`
    1. Update Cargo.toml in root and tensorflow-op-codegen to ensure version of protobuf exactly equals version of protoc_rust used
 1. Generate ops
-   1. Run `cd tensorflow-op-codegen; cargo run -- $PATH_TO_TENSORFLOW $PWD/..`
-   1. Run `cd tensorflow-op-codegen; cargo run --bin eager -- $PATH_TO_TENSORFLOW $PWD/..`
+   1. Run `cd tensorflow-op-codegen; cargo run -- ${PATH_TO_TENSORFLOW?} $PWD/..`
+   1. Run `cd tensorflow-op-codegen; cargo run --bin eager -- ${PATH_TO_TENSORFLOW?} $PWD/..`
    1. Run `cargo fmt` to format generated code
 1. Commit and push changes
 
@@ -19,12 +21,12 @@ Note that any crate not mentioned here (e.g. tensorflow-proto-codegen, tensorflo
 1. Ensure that the minimum supported Rust version in the README is up to date
 1. Update changelog.
 1. Bump version number of `tensorflow-sys` if necessary
-   1. Run `git log v${PREVIOUS_VERSION}..HEAD tensorflow-sys` and see if there were any changes. If not, skip.
+   1. Run `git log v${PREVIOUS_VERSION?}..HEAD tensorflow-sys` and see if there were any changes. If not, skip.
    1. Bump the version in `tensorflow-sys/Cargo.toml`
    1. Bump the version in `tensorflow-sys/README.md`
    1. Bump the version for `tensorflow-sys` in the root `Cargo.toml`
 1. Bump version number of `tensorflow-internal-macros` if necessary
-   1. Run `git log v${PREVIOUS_VERSION}..HEAD tensorflow-internal-macros` and see if there were any changes. If not, skip.
+   1. Run `git log v${PREVIOUS_VERSION?}..HEAD tensorflow-internal-macros` and see if there were any changes. If not, skip.
    1. Bump the version in `tensorflow-internal-macros/Cargo.toml`
    1. Bump the version for `tensorflow-internal-macros` in the root `Cargo.toml`
 1. Bump the version number in `Cargo.toml`
@@ -36,7 +38,7 @@ Note that any crate not mentioned here (e.g. tensorflow-proto-codegen, tensorflo
 1. If the version of tensorflow-sys was bumped, run `cargo publish` for tensorflow-sys. (Publish before tagging in case there are problems publishing and we need to add commits to fix them.)
 1. If the version of tensorflow-internal-macros was bumped, run `cargo publish` for tensorflow-internal-macros. (Publish before tagging in case there are problems publishing and we need to add commits to fix them.)
 1. Run `cargo publish`. (Publish before tagging in case there are problems publishing and we need to add commits to fix them.)
-1. Add a `v${VERSION}` tag and push it
+1. Add a `v${VERSION?}` tag and push it
 1. Run `./update-docs`
 1. Announce the release to the mailing list
 

run-valgrind

@@ -46,6 +46,12 @@ for example in addition regression expressions regression_checkpoint regression_
     run valgrind --leak-check=full target/debug/examples/"$example" >> "$valgrind_log" 2>&1
 done
 
+echo "Testing tensorflow eager examples"
+for example in mobilenetv3; do
+    run cargo build --features='examples_system_alloc tensorflow_unstable eager' --example="$example"
+    run valgrind --leak-check=full target/debug/examples/"$example" >> "$valgrind_log" 2>&1
+done
+
 echo "Testing tensorflow-sys examples"
 for example in multiplication; do
     cargo build --features=examples_system_alloc --example="$example" -p tensorflow-sys

tensorflow-proto-codegen/Cargo.toml

@@ -5,6 +5,6 @@ authors = ["Adam Crume <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-protoc-rust = "2.24.1"
+protoc-rust = "2.27.1"
 
 [workspace]

tensorflow-sys/Cargo.toml

@@ -19,18 +19,18 @@ edition = "2018"
 features = ["private-docs-rs"]
 
 [dependencies]
-libc = "0.2.98"
-lazy_static = { version = "1.4", optional = true }
-libloading = { version = "0.7", optional = true }
-cfg-if = { version = "1.0", optional = true }
-log = { version = "0.4", optional = true }
+libc = "0.2.132"
+lazy_static = { version = "1.4.0", optional = true }
+libloading = { version = "0.7.3", optional = true }
+cfg-if = { version = "1.0.0", optional = true }
+log = { version = "0.4.17", optional = true }
 
 [build-dependencies]
-curl = "0.4.38"
-flate2 = "1.0.20"
-pkg-config = "0.3.19"
-semver = "1.0.3"
-tar = "0.4.35"
+curl = "0.4.44"
+flate2 = "1.0.24"
+pkg-config = "0.3.25"
+semver = "1.0.13"
+tar = "0.4.38"
 zip = "0.6.2"
 
 [features]

test-all

@@ -13,11 +13,14 @@ function run {
 # the run-valgrind script.
 version_build_script=`grep "const VERSION" tensorflow-sys/build.rs | sed 's|.*"\([^"]*\)";|\1|g'`
 version_run_valgrind=`grep "tensorflow_version=" run-valgrind | sed "s|.*=\(.*\)|\1|g"`
-if [[ "${version_build_script}" != "${version_run_valgrind}" ]]; then
+version_requirements=`grep "tensorflow\s*=" .github/workflows/requirements.txt | sed "s|.*== \(.*\)|\1|g"`
+if [[ "${version_build_script}" != "${version_run_valgrind}" || \
+    "${version_build_script}" != "${version_requirements}" ]]; then
     echo "ERROR: Tensorflow version specified in build script does not match the one in the"
     echo "       valgrind run script."
     echo "       tensorflow-sys/build.rs: ${version_build_script}"
     echo "       run-valgrind: ${version_run_valgrind}"
+    echo "       ./github/workflows/requirements.txt: ${version_requirements}"
     exit 1
 fi
 
@@ -44,6 +47,7 @@ if [[ "${version_tensorflow_sys_crate}" != "${version_tensorflow_sys_readme}" ]]
     exit 1
 fi
 
+run python3 examples/mobilenetv3/create_model.py
 run cargo fmt --all -- --check
 run cargo test -vv -j 2
 run cargo test -vv -j 2 --features eager
@@ -52,6 +56,7 @@ run cargo test -vv -j 2 --features ndarray
 run cargo run --example regression
 run cargo run --example xor
 run cargo run --features tensorflow_unstable --example expressions
+run cargo run --features eager --example mobilenetv3
 run cargo doc -vv --features tensorflow_unstable,ndarray,eager
 run cargo doc -vv --features tensorflow_unstable,ndarray,eager,private-docs-rs
 # TODO(#66): Re-enable: (cd tensorflow-sys && cargo test -vv -j 1)