Merge commit 'd51e8de7'

CHANGELOG.md

@@ -1,9 +1,29 @@
-# Unreleased (targerting 0.20)
-* [optim] 32x32 f32 AMX kernel (for Apple Silicone M family)
+# 0.20.0 - 2023-04-25
+* [optim] 32x32 f32 AMX kernel (for Apple Silicon M family)
 * [optim] bunch of AMX512F kernels (square, skinny, vector)
-* [ONNX] introduce Trilu
+* [ONNX] introduce Trilu, TopK
 * [NNEF/OPL] submodel loader
 * [ONNX] support alternative layout for LSTM (layout=1, batch becomes first axis)
+* [ONNX] If operators with dynamic condition (very basic optimisations, no nnef support yet).
+
+# 0.19.9 & 0.19.10 - 2023-04-17
+* HardSwiwh ONNX, tract_core_hard_swish in NNEF/OPL
+* introducing tract_core_submodel in NNEF/OPL
+* JSON resource loader in NNEF/OPL
+* Profiling API tweaks
+* `--folded` view for model command line dump (hide Scan loops)
+
+# 0.19.8 - 2023-03-27
+* Various bug fixes
+
+# 0.19.7 & 0.19.6 - 2023-02-24
+* more bug fixes
+* wip on python doc auto-deploy
+
+# 0.19.5 - 2023-02-22
+* 0.19.3 and 0.19.4 are release misfires
+* lots of bugfixes following 0.19 big changes
+* introducing the JSON NNEF resource
 
 # 0.19.2 - 2023-01-30
 * [NNEF/OPL] introduce json resource loader

ci/tract-ci-minion/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tract-ci-minion"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 edition = "2021"
 
 [workspace]

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tract"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = [ "Romain Liautaud <[email protected]>", "Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference"
@@ -34,15 +34,15 @@ rustls.workspace = true
 scan_fmt.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-tract-core = { version = "=0.20.0-pre", path = "../core" }
-tract-hir = { version = "=0.20.0-pre", path = "../hir" }
-tract-nnef = { version = "=0.20.0-pre", path = "../nnef" }
-tract-libcli = { version = "=0.20.0-pre", path = "../libcli" }
-tract-pulse-opl = { optional = true, version = "=0.20.0-pre", path = "../pulse-opl" }
-tract-pulse = { optional = true, version = "=0.20.0-pre", path = "../pulse" }
-tract-kaldi = { optional = true, version = "=0.20.0-pre", path = "../kaldi" }
-tract-onnx = { optional = true, version = "=0.20.0-pre", path = "../onnx" }
-tract-tensorflow = { optional = true, version = "=0.20.0-pre", path = "../tensorflow" }
+tract-core = { version = "=0.20.1-pre", path = "../core" }
+tract-hir = { version = "=0.20.1-pre", path = "../hir" }
+tract-nnef = { version = "=0.20.1-pre", path = "../nnef" }
+tract-libcli = { version = "=0.20.1-pre", path = "../libcli" }
+tract-pulse-opl = { optional = true, version = "=0.20.1-pre", path = "../pulse-opl" }
+tract-pulse = { optional = true, version = "=0.20.1-pre", path = "../pulse" }
+tract-kaldi = { optional = true, version = "=0.20.1-pre", path = "../kaldi" }
+tract-onnx = { optional = true, version = "=0.20.1-pre", path = "../onnx" }
+tract-tensorflow = { optional = true, version = "=0.20.1-pre", path = "../tensorflow" }
 
 [features]
 default = ["kaldi", "onnx", "tf", "pulse", "pulse-opl"]

core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tract-core"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 license = "MIT/Apache-2.0"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference"
@@ -29,8 +29,8 @@ num-traits.workspace = true
 num-complex.workspace = true
 rustfft.workspace = true
 smallvec.workspace = true
-tract-linalg = { version = "=0.20.0-pre", path = "../linalg" }
-tract-data = { version = "=0.20.0-pre", path = "../data" }
+tract-linalg = { version = "=0.20.1-pre", path = "../linalg" }
+tract-data = { version = "=0.20.1-pre", path = "../data" }
 
 [features]
 default = [ ]

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tract-data"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 license = "MIT/Apache-2.0"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference"

examples/jupyter-keras-tract-tf1/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jupyter-keras-tract-tf1"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Matthew Alhonte <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
@@ -9,5 +9,5 @@ edition = "2021"
 
 [dependencies]
 rand.workspace = true
-tract-core = { path = "../../core", version = "=0.20.0-pre" }
-tract-tensorflow = { path = "../../tensorflow", version = "=0.20.0-pre" }
+tract-core = { path = "../../core", version = "=0.20.1-pre" }
+tract-tensorflow = { path = "../../tensorflow", version = "=0.20.1-pre" }

examples/jupyter-keras-tract-tf2/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jupyter-keras-tract-tf2"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Matthew Alhonte <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
@@ -10,5 +10,5 @@ edition = "2021"
 [dependencies]
 
 rand.workspace = true
-tract-core = { path = "../../core", version = "=0.20.0-pre" }
-tract-onnx = { path = "../../onnx", version = "=0.20.0-pre" }
+tract-core = { path = "../../core", version = "=0.20.1-pre" }
+tract-onnx = { path = "../../onnx", version = "=0.20.1-pre" }

examples/nnef-dump-mobilenet-v2/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "example-dump-nnef-mobilenet-v2"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
 
 [dependencies]
 image.workspace = true
 
-tract-nnef = { version = "=0.20.0-pre", path = "../../nnef" }
+tract-nnef = { version = "=0.20.1-pre", path = "../../nnef" }

examples/nnef-mobilenet-v2/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "example-nnef-mobilenet-v2"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
 
 [dependencies]
 image.workspace = true
 
-tract-nnef = { version = "=0.20.0-pre", path = "../../nnef" }
+tract-nnef = { version = "=0.20.1-pre", path = "../../nnef" }

examples/onnx-mobilenet-v2/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "example-onnx-mobilenet-v2"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
 
 [dependencies]
 image.workspace = true
-tract-onnx = { path = "../../onnx", version = "=0.20.0-pre" }
+tract-onnx = { path = "../../onnx", version = "=0.20.1-pre" }

examples/pytorch-albert-v2/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "pytorch-albert-v2"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 ndarray.workspace = true
 tokenizers.workspace = true
-tract-onnx = { path = "../../onnx", version = "=0.20.0-pre" }
+tract-onnx = { path = "../../onnx", version = "=0.20.1-pre" }

examples/pytorch-resnet/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "example-pytorch-resnet"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Teddy Koker <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
@@ -9,4 +9,4 @@ edition = "2021"
 
 [dependencies]
 image.workspace = true
-tract-onnx = { path = "../../onnx", version = "=0.20.0-pre" }
+tract-onnx = { path = "../../onnx", version = "=0.20.1-pre" }

examples/tensorflow-mobilenet-v2/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "example-tensorflow-mobilenet-v2"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
 
 [dependencies]
 image.workspace = true
-tract-tensorflow = { path = "../../tensorflow", version = "=0.20.0-pre" }
+tract-tensorflow = { path = "../../tensorflow", version = "=0.20.1-pre" }

ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tract-ffi"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 license = "MIT/Apache-2.0"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference"
@@ -23,9 +23,9 @@ anyhow.workspace = true
 flate2.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-tract-data = { path = "../data", version = "=0.20.0-pre" }
-tract-nnef = { path = "../nnef", version = "=0.20.0-pre" }
-tract-onnx = { path = "../onnx", version = "=0.20.0-pre" }
-tract-pulse = { path = "../pulse", version = "=0.20.0-pre" }
-tract-tensorflow = { path = "../tensorflow", version = "=0.20.0-pre" }
-tract-libcli = { path = "../libcli", version = "=0.20.0-pre" }
+tract-data = { path = "../data", version = "=0.20.1-pre" }
+tract-nnef = { path = "../nnef", version = "=0.20.1-pre" }
+tract-onnx = { path = "../onnx", version = "=0.20.1-pre" }
+tract-pulse = { path = "../pulse", version = "=0.20.1-pre" }
+tract-tensorflow = { path = "../tensorflow", version = "=0.20.1-pre" }
+tract-libcli = { path = "../libcli", version = "=0.20.1-pre" }

harness/core-proptest-pulse/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "core-proptest-pulse"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
 
 [dependencies]
-tract-hir = { path = "../../hir", version = "=0.20.0-pre" }
-tract-pulse = { path = "../../pulse", version = "=0.20.0-pre" }
-tract-onnx = { path = "../../onnx", version = "=0.20.0-pre" }
-tract-onnx-opl = { path = "../../onnx-opl", version = "=0.20.0-pre" }
+tract-hir = { path = "../../hir", version = "=0.20.1-pre" }
+tract-pulse = { path = "../../pulse", version = "=0.20.1-pre" }
+tract-onnx = { path = "../../onnx", version = "=0.20.1-pre" }
+tract-onnx-opl = { path = "../../onnx-opl", version = "=0.20.1-pre" }
 
 [dev-dependencies]
 log.workspace = true

harness/lstm-proptest-onnx-vs-tf/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "lstm-proptest-onnx-vs-tf"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
 
 [dependencies]
 proptest.workspace = true
-tract-tensorflow = { path = "../../tensorflow", version = "=0.20.0-pre" }
-tract-onnx = { path = "../../onnx", version = "=0.20.0-pre" }
+tract-tensorflow = { path = "../../tensorflow", version = "=0.20.1-pre" }
+tract-onnx = { path = "../../onnx", version = "=0.20.1-pre" }

harness/nnef-inceptionv3/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "nnef-inceptionv3"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
 
 [dependencies]
 flate2.workspace = true
 image.workspace = true
-tract-core = { version = "=0.20.0-pre", path = "../../core" }
-tract-nnef = { version = "=0.20.0-pre", path = "../../nnef" }
+tract-core = { version = "=0.20.1-pre", path = "../../core" }
+tract-nnef = { version = "=0.20.1-pre", path = "../../nnef" }
 
 [dev-dependencies]
 dinghy-test.workspace = true

harness/onnx-proptest/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "onnx-proptest"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 edition = "2021"
 
 [workspace]
@@ -12,5 +12,5 @@ onnxruntime = { path = "../../../../github/onnxruntime-rs/onnxruntime" }
 onnx-pb = "0.1.4"
 anyhow = "1.0.56"
 prost = "0.11.0"
-tract-onnx = { path = "../../onnx" , version = "=0.20.0-pre" }
+tract-onnx = { path = "../../onnx" , version = "=0.20.1-pre" }
 proptest = "1.0.0"

harness/onnx-test-suite/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "onnx-test-suite"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2021"
@@ -10,9 +10,9 @@ bytes.workspace = true
 fs2.workspace = true
 log.workspace = true
 prost.workspace = true
-tract-core = { path = "../../core", version = "=0.20.0-pre" }
-tract-nnef = { path = "../../nnef", version = "=0.20.0-pre" }
-tract-onnx = { path = "../../onnx", version = "=0.20.0-pre" }
+tract-core = { path = "../../core", version = "=0.20.1-pre" }
+tract-nnef = { path = "../../nnef", version = "=0.20.1-pre" }
+tract-onnx = { path = "../../onnx", version = "=0.20.1-pre" }
 
 [features]
 onnx_1_4_1 = []

harness/onnx-test-suite/debug-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "debug-utils"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 edition = "2021"
 
@@ -9,4 +9,4 @@ members = []
 
 [dependencies]
 protobuf = "*"
-tract-onnx = { path = "../../../onnx" , version = "=0.20.0-pre" }
+tract-onnx = { path = "../../../onnx" , version = "=0.20.1-pre" }

harness/tf-inceptionv3/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "tf-inceptionv3"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
 image.workspace = true
-tract-tensorflow = { path = "../../tensorflow", version = "=0.20.0-pre" }
+tract-tensorflow = { path = "../../tensorflow", version = "=0.20.1-pre" }
 
 [features]
 conform = [ "tract-tensorflow/conform" ]

harness/tf-mobilenet-v2/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "tf-mobilenet-v2"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
 image.workspace = true
-tract-tensorflow = { path = "../../tensorflow", version = "=0.20.0-pre" }
+tract-tensorflow = { path = "../../tensorflow", version = "=0.20.1-pre" }
 
 [dev-dependencies]
 dinghy-test.workspace = true

harness/tf-moz-deepspeech/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "tf-moz-deepspeech"
-version = "0.20.0-pre"
+version = "0.20.1-pre"
 authors = ["Mathieu Poumeyrol <[email protected]>"]
 edition = "2021"
 license = "MIT/Apache-2.0"
 
 [dependencies]
 log.workspace = true
-tract-tensorflow = { path = "../../tensorflow", version = "=0.20.0-pre" }
+tract-tensorflow = { path = "../../tensorflow", version = "=0.20.1-pre" }
 
 [dev-dependencies]
 env_logger.workspace = true