From b5df93116a05bc30446bf35591b3d5572f417c5e Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Wed, 30 Aug 2023 14:59:28 +0200 Subject: [PATCH] release 0.20.18 --- api/Cargo.toml | 2 +- api/ffi/Cargo.toml | 6 +++--- api/proxy/Cargo.toml | 6 +++--- api/proxy/sys/Cargo.toml | 6 +++--- api/proxy/sys/build.rs | 4 ++-- api/rs/Cargo.toml | 14 ++++++------- cli/Cargo.toml | 20 +++++++++---------- core/Cargo.toml | 6 +++--- data/Cargo.toml | 2 +- examples/jupyter-keras-tract-tf1/Cargo.toml | 4 ++-- examples/jupyter-keras-tract-tf2/Cargo.toml | 4 ++-- examples/nnef-dump-mobilenet-v2/Cargo.toml | 2 +- examples/nnef-mobilenet-v2/Cargo.toml | 2 +- examples/onnx-mobilenet-v2/Cargo.toml | 2 +- examples/pytorch-albert-v2/Cargo.toml | 2 +- examples/pytorch-resnet/Cargo.toml | 2 +- examples/tensorflow-mobilenet-v2/Cargo.toml | 2 +- examples/tflite-mobilenet-v3/Cargo.toml | 2 +- harness/core-proptest-pulse/Cargo.toml | 8 ++++---- harness/lstm-proptest-onnx-vs-tf/Cargo.toml | 4 ++-- harness/nnef-inceptionv3/Cargo.toml | 4 ++-- harness/onnx-proptest/Cargo.toml | 2 +- harness/tf-inceptionv3/Cargo.toml | 2 +- harness/tf-mobilenet-v2/Cargo.toml | 2 +- harness/tf-moz-deepspeech/Cargo.toml | 2 +- harness/tfl-mobilenet-v2-q/Cargo.toml | 2 +- hir/Cargo.toml | 4 ++-- libcli/Cargo.toml | 10 +++++----- linalg/Cargo.toml | 4 ++-- linalg/cost_model/Cargo.toml | 4 ++-- linalg/matmul-bench/Cargo.toml | 4 ++-- nnef/Cargo.toml | 4 ++-- nnef/nnef-resources/Cargo.toml | 4 ++-- onnx-opl/Cargo.toml | 4 ++-- onnx/Cargo.toml | 8 ++++---- post-release.sh | 2 +- pulse-opl/Cargo.toml | 4 ++-- pulse/Cargo.toml | 4 ++-- release.sh | 6 +++--- tensorflow/Cargo.toml | 6 +++--- test-rt/infra/Cargo.toml | 2 +- test-rt/suite-conv/Cargo.toml | 2 +- test-rt/suite-onnx/Cargo.toml | 6 +++--- test-rt/test-conv-core/Cargo.toml | 2 +- test-rt/test-onnx-core/Cargo.toml | 6 +++--- test-rt/test-onnx-core/debug-utils/Cargo.toml | 2 +- test-rt/test-onnx-nnef-cycle/Cargo.toml | 4 ++-- test-rt/test-tflite/Cargo.toml | 4 ++-- tflite/Cargo.toml | 4 ++-- 49 files changed, 107 insertions(+), 107 deletions(-) diff --git a/api/Cargo.toml b/api/Cargo.toml index abf80530fd..8e35e45a6d 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-api" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" diff --git a/api/ffi/Cargo.toml b/api/ffi/Cargo.toml index ffbacfdcda..a19c505e9a 100644 --- a/api/ffi/Cargo.toml +++ b/api/ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-ffi" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, neural network inference" @@ -23,5 +23,5 @@ anyhow.workspace = true flate2.workspace = true serde.workspace = true serde_json.workspace = true -tract-api = { path = ".." } -tract-rs = { path = "../rs" } +tract-api = { path = ".." , version = "=0.20.18" } +tract-rs = { path = "../rs" , version = "=0.20.18" } diff --git a/api/proxy/Cargo.toml b/api/proxy/Cargo.toml index 108d1b276e..bf01d81581 100644 --- a/api/proxy/Cargo.toml +++ b/api/proxy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-proxy" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -16,8 +16,8 @@ include = [ "Cargo.toml", "src/**/*.rs", "LICENSE*" ] anyhow.workspace = true boow.workspace = true ndarray.workspace = true -tract-api = { path = ".." } -tract-proxy-sys = { path = "sys" } +tract-api = { path = ".." , version = "=0.20.18" } +tract-proxy-sys = { path = "sys", version = "=0.20.18" } [dev-dependencies] reqwest.workspace = true diff --git a/api/proxy/sys/Cargo.toml b/api/proxy/sys/Cargo.toml index 44180ecb74..f9c1c9c587 100644 --- a/api/proxy/sys/Cargo.toml +++ b/api/proxy/sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-proxy-sys" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -10,11 +10,11 @@ categories = [ "science" ] autobenches = false edition = "2021" rust-version = "1.65" -include = [ "Cargo.toml", "src/**/*.rs", "LICENSE*" ] +include = [ "Cargo.toml", "src/**/*.rs", "LICENSE*", "build.rs", "tract.h" ] [dependencies] -tract-ffi = { path = "../../ffi" } +tract-ffi = { path = "../../ffi" , version = "=0.20.18" } [build-dependencies] bindgen.workspace = true diff --git a/api/proxy/sys/build.rs b/api/proxy/sys/build.rs index 886a36d8f8..54bd67fade 100644 --- a/api/proxy/sys/build.rs +++ b/api/proxy/sys/build.rs @@ -4,14 +4,14 @@ use std::env; use std::path::PathBuf; fn main() { - println!("cargo:rerun-if-changed=../../tract.h"); + println!("cargo:rerun-if-changed=tract.h"); println!("cargo:rustc-link-lib=tract"); // The bindgen::Builder is the main entry point // to bindgen, and lets you build up options for // the resulting bindings. let bindings = bindgen::Builder::default() - .header("../../tract.h") + .header("tract.h") .parse_callbacks(Box::new(bindgen::CargoCallbacks)) .generate() .expect("Unable to generate bindings"); diff --git a/api/rs/Cargo.toml b/api/rs/Cargo.toml index 1ad3770ce4..cc0b6f7e66 100644 --- a/api/rs/Cargo.toml +++ b/api/rs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-rs" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -18,12 +18,12 @@ boow.workspace = true flate2.workspace = true half.workspace = true ndarray.workspace = true -tract-api = { path = ".." } -tract-nnef = { path = "../../nnef/" } -tract-onnx-opl = { path = "../../onnx-opl/" } -tract-onnx = { path = "../../onnx/" } -tract-pulse = { path = "../../pulse/" } -tract-libcli = { path = "../../libcli" } +tract-api = { path = ".." , version = "=0.20.18" } +tract-nnef = { path = "../../nnef/" , version = "=0.20.18" } +tract-onnx-opl = { path = "../../onnx-opl/" , version = "=0.20.18" } +tract-onnx = { path = "../../onnx/" , version = "=0.20.18" } +tract-pulse = { path = "../../pulse/" , version = "=0.20.18" } +tract-libcli = { path = "../../libcli" , version = "=0.20.18" } serde_json.workspace = true [dev-dependencies] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 58ca4ae1ae..e9837dc57e 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract" -version = "0.20.7-pre" +version = "0.20.18" authors = [ "Romain Liautaud ", "Mathieu Poumeyrol "] license = "MIT OR 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.7-pre", path = "../core" } -tract-hir = { version = "=0.20.7-pre", path = "../hir" } -tract-nnef = { version = "=0.20.7-pre", path = "../nnef" } -tract-libcli = { version = "=0.20.7-pre", path = "../libcli" } -tract-pulse-opl = { optional = true, version = "=0.20.7-pre", path = "../pulse-opl" } -tract-pulse = { optional = true, version = "=0.20.7-pre", path = "../pulse" } -tract-onnx = { optional = true, version = "=0.20.7-pre", path = "../onnx" } -tract-tensorflow = { optional = true, version = "=0.20.7-pre", path = "../tensorflow" } -tract-tflite = { optional = true, version = "=0.20.7-pre", path = "../tflite" } +tract-core = { version = "=0.20.18", path = "../core" } +tract-hir = { version = "=0.20.18", path = "../hir" } +tract-nnef = { version = "=0.20.18", path = "../nnef" } +tract-libcli = { version = "=0.20.18", path = "../libcli" } +tract-pulse-opl = { optional = true, version = "=0.20.18", path = "../pulse-opl" } +tract-pulse = { optional = true, version = "=0.20.18", path = "../pulse" } +tract-onnx = { optional = true, version = "=0.20.18", path = "../onnx" } +tract-tensorflow = { optional = true, version = "=0.20.18", path = "../tensorflow" } +tract-tflite = { optional = true, version = "=0.20.18", path = "../tflite" } [features] default = ["onnx", "tf", "pulse", "pulse-opl", "tflite"] diff --git a/core/Cargo.toml b/core/Cargo.toml index 7dcf496cbe..3d168b7ccb 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-core" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] 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.7-pre", path = "../linalg" } -tract-data = { version = "=0.20.7-pre", path = "../data" } +tract-linalg = { version = "=0.20.18", path = "../linalg" } +tract-data = { version = "=0.20.18", path = "../data" } [features] default = [ ] diff --git a/data/Cargo.toml b/data/Cargo.toml index 05a95cc563..52dfef8676 100644 --- a/data/Cargo.toml +++ b/data/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-data" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" diff --git a/examples/jupyter-keras-tract-tf1/Cargo.toml b/examples/jupyter-keras-tract-tf1/Cargo.toml index c3438b8e59..c3ed7a8680 100644 --- a/examples/jupyter-keras-tract-tf1/Cargo.toml +++ b/examples/jupyter-keras-tract-tf1/Cargo.toml @@ -9,5 +9,5 @@ edition = "2021" [dependencies] rand.workspace = true -tract-core = { path = "../../core", version = "=0.20.7-pre" } -tract-tensorflow = { path = "../../tensorflow", version = "=0.20.7-pre" } +tract-core = { path = "../../core", version = "=0.20.18" } +tract-tensorflow = { path = "../../tensorflow", version = "=0.20.18" } diff --git a/examples/jupyter-keras-tract-tf2/Cargo.toml b/examples/jupyter-keras-tract-tf2/Cargo.toml index 675b3d2009..352ff13190 100644 --- a/examples/jupyter-keras-tract-tf2/Cargo.toml +++ b/examples/jupyter-keras-tract-tf2/Cargo.toml @@ -10,5 +10,5 @@ edition = "2021" [dependencies] rand.workspace = true -tract-core = { path = "../../core", version = "=0.20.7-pre" } -tract-onnx = { path = "../../onnx", version = "=0.20.7-pre" } +tract-core = { path = "../../core", version = "=0.20.18" } +tract-onnx = { path = "../../onnx", version = "=0.20.18" } diff --git a/examples/nnef-dump-mobilenet-v2/Cargo.toml b/examples/nnef-dump-mobilenet-v2/Cargo.toml index 2667e53402..09ed23b0cf 100644 --- a/examples/nnef-dump-mobilenet-v2/Cargo.toml +++ b/examples/nnef-dump-mobilenet-v2/Cargo.toml @@ -8,4 +8,4 @@ edition = "2021" [dependencies] image.workspace = true -tract-nnef = { version = "=0.20.7-pre", path = "../../nnef" } +tract-nnef = { version = "=0.20.18", path = "../../nnef" } diff --git a/examples/nnef-mobilenet-v2/Cargo.toml b/examples/nnef-mobilenet-v2/Cargo.toml index fe2f2e2ed6..ad0197932b 100644 --- a/examples/nnef-mobilenet-v2/Cargo.toml +++ b/examples/nnef-mobilenet-v2/Cargo.toml @@ -8,4 +8,4 @@ edition = "2021" [dependencies] image.workspace = true -tract-nnef = { version = "=0.20.7-pre", path = "../../nnef" } +tract-nnef = { version = "=0.20.18", path = "../../nnef" } diff --git a/examples/onnx-mobilenet-v2/Cargo.toml b/examples/onnx-mobilenet-v2/Cargo.toml index 61e2827d0b..659a46be31 100644 --- a/examples/onnx-mobilenet-v2/Cargo.toml +++ b/examples/onnx-mobilenet-v2/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [dependencies] image.workspace = true -tract-onnx = { path = "../../onnx", version = "=0.20.7-pre" } +tract-onnx = { path = "../../onnx", version = "=0.20.18" } diff --git a/examples/pytorch-albert-v2/Cargo.toml b/examples/pytorch-albert-v2/Cargo.toml index 14a37fd5f1..8741de6339 100644 --- a/examples/pytorch-albert-v2/Cargo.toml +++ b/examples/pytorch-albert-v2/Cargo.toml @@ -10,4 +10,4 @@ ndarray.workspace = true tokenizers.workspace = true clap_builder = { version = "=4.3.24" } clap_lex = { version = "=0.5.0" } -tract-onnx = { path = "../../onnx", version = "=0.20.7-pre" } +tract-onnx = { path = "../../onnx", version = "=0.20.18" } diff --git a/examples/pytorch-resnet/Cargo.toml b/examples/pytorch-resnet/Cargo.toml index 4e6954c8f4..83544d02b8 100644 --- a/examples/pytorch-resnet/Cargo.toml +++ b/examples/pytorch-resnet/Cargo.toml @@ -9,4 +9,4 @@ edition = "2021" [dependencies] image.workspace = true -tract-onnx = { path = "../../onnx", version = "=0.20.7-pre" } +tract-onnx = { path = "../../onnx", version = "=0.20.18" } diff --git a/examples/tensorflow-mobilenet-v2/Cargo.toml b/examples/tensorflow-mobilenet-v2/Cargo.toml index 0f6f05e4f8..8d45b93deb 100644 --- a/examples/tensorflow-mobilenet-v2/Cargo.toml +++ b/examples/tensorflow-mobilenet-v2/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [dependencies] image.workspace = true -tract-tensorflow = { path = "../../tensorflow", version = "=0.20.7-pre" } +tract-tensorflow = { path = "../../tensorflow", version = "=0.20.18" } diff --git a/examples/tflite-mobilenet-v3/Cargo.toml b/examples/tflite-mobilenet-v3/Cargo.toml index 526404bf99..e6f74ace01 100644 --- a/examples/tflite-mobilenet-v3/Cargo.toml +++ b/examples/tflite-mobilenet-v3/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [dependencies] image.workspace = true -tract-tflite = { path = "../../tflite", version = "=0.20.7-pre" } +tract-tflite = { path = "../../tflite", version = "=0.20.18" } diff --git a/harness/core-proptest-pulse/Cargo.toml b/harness/core-proptest-pulse/Cargo.toml index 7e168342eb..312bc83c12 100644 --- a/harness/core-proptest-pulse/Cargo.toml +++ b/harness/core-proptest-pulse/Cargo.toml @@ -6,10 +6,10 @@ license = "MIT OR Apache-2.0" edition = "2021" [dependencies] -tract-hir = { path = "../../hir", version = "=0.20.7-pre" } -tract-pulse = { path = "../../pulse", version = "=0.20.7-pre" } -tract-onnx = { path = "../../onnx", version = "=0.20.7-pre" } -tract-onnx-opl = { path = "../../onnx-opl", version = "=0.20.7-pre" } +tract-hir = { path = "../../hir", version = "=0.20.18" } +tract-pulse = { path = "../../pulse", version = "=0.20.18" } +tract-onnx = { path = "../../onnx", version = "=0.20.18" } +tract-onnx-opl = { path = "../../onnx-opl", version = "=0.20.18" } [dev-dependencies] log.workspace = true diff --git a/harness/lstm-proptest-onnx-vs-tf/Cargo.toml b/harness/lstm-proptest-onnx-vs-tf/Cargo.toml index 8494472a44..bd21cea923 100644 --- a/harness/lstm-proptest-onnx-vs-tf/Cargo.toml +++ b/harness/lstm-proptest-onnx-vs-tf/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [dependencies] proptest.workspace = true -tract-tensorflow = { path = "../../tensorflow", version = "=0.20.7-pre" } -tract-onnx = { path = "../../onnx", version = "=0.20.7-pre" } +tract-tensorflow = { path = "../../tensorflow", version = "=0.20.18" } +tract-onnx = { path = "../../onnx", version = "=0.20.18" } diff --git a/harness/nnef-inceptionv3/Cargo.toml b/harness/nnef-inceptionv3/Cargo.toml index c9beddf682..8ef18273e4 100644 --- a/harness/nnef-inceptionv3/Cargo.toml +++ b/harness/nnef-inceptionv3/Cargo.toml @@ -8,8 +8,8 @@ edition = "2021" [dependencies] flate2.workspace = true image.workspace = true -tract-core = { version = "=0.20.7-pre", path = "../../core" } -tract-nnef = { version = "=0.20.7-pre", path = "../../nnef" } +tract-core = { version = "=0.20.18", path = "../../core" } +tract-nnef = { version = "=0.20.18", path = "../../nnef" } [dev-dependencies] dinghy-test.workspace = true diff --git a/harness/onnx-proptest/Cargo.toml b/harness/onnx-proptest/Cargo.toml index 323745364f..e4ec25889d 100644 --- a/harness/onnx-proptest/Cargo.toml +++ b/harness/onnx-proptest/Cargo.toml @@ -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.7-pre" } +tract-onnx = { path = "../../onnx" , version = "=0.20.18" } proptest = "1.0.0" diff --git a/harness/tf-inceptionv3/Cargo.toml b/harness/tf-inceptionv3/Cargo.toml index a82a4cd1f7..42d7b42f1d 100644 --- a/harness/tf-inceptionv3/Cargo.toml +++ b/harness/tf-inceptionv3/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" [dependencies] image.workspace = true -tract-tensorflow = { path = "../../tensorflow", version = "=0.20.7-pre" } +tract-tensorflow = { path = "../../tensorflow", version = "=0.20.18" } [features] conform = [ "tract-tensorflow/conform" ] diff --git a/harness/tf-mobilenet-v2/Cargo.toml b/harness/tf-mobilenet-v2/Cargo.toml index 2d3c5a216e..761abe7542 100644 --- a/harness/tf-mobilenet-v2/Cargo.toml +++ b/harness/tf-mobilenet-v2/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" [dependencies] image.workspace = true -tract-tensorflow = { path = "../../tensorflow", version = "=0.20.7-pre" } +tract-tensorflow = { path = "../../tensorflow", version = "=0.20.18" } [dev-dependencies] dinghy-test.workspace = true diff --git a/harness/tf-moz-deepspeech/Cargo.toml b/harness/tf-moz-deepspeech/Cargo.toml index ef8bd10af3..b62313f354 100644 --- a/harness/tf-moz-deepspeech/Cargo.toml +++ b/harness/tf-moz-deepspeech/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" [dependencies] log.workspace = true -tract-tensorflow = { path = "../../tensorflow", version = "=0.20.7-pre" } +tract-tensorflow = { path = "../../tensorflow", version = "=0.20.18" } [dev-dependencies] env_logger.workspace = true diff --git a/harness/tfl-mobilenet-v2-q/Cargo.toml b/harness/tfl-mobilenet-v2-q/Cargo.toml index 20401eb2de..3b8c475df7 100644 --- a/harness/tfl-mobilenet-v2-q/Cargo.toml +++ b/harness/tfl-mobilenet-v2-q/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] image.workspace = true -tract-tflite = { path = "../../tflite", version = "=0.20.7-pre" } +tract-tflite = { path = "../../tflite", version = "=0.20.18" } [dev-dependencies] dinghy-test.workspace = true diff --git a/hir/Cargo.toml b/hir/Cargo.toml index cea6490ef6..6eac8333bc 100644 --- a/hir/Cargo.toml +++ b/hir/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-hir" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" } derive-new.workspace = true log.workspace = true -tract-core = { version = "=0.20.7-pre", path = "../core" } +tract-core = { version = "=0.20.18", path = "../core" } [dev-dependencies] env_logger.workspace = true diff --git a/libcli/Cargo.toml b/libcli/Cargo.toml index 53727df8d8..5e72ba0416 100644 --- a/libcli/Cargo.toml +++ b/libcli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-libcli" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -23,10 +23,10 @@ py_literal.workspace = true rand.workspace = true serde.workspace = true serde_json.workspace = true -tract-core = { version = "=0.20.7-pre", path = "../core" } -tract-hir = { version = "=0.20.7-pre", path = "../hir" } -tract-onnx = { version = "=0.20.7-pre", path = "../onnx", optional = true } -tract-tflite = { version = "=0.20.7-pre", path = "../tflite", optional = true } +tract-core = { version = "=0.20.18", path = "../core" } +tract-hir = { version = "=0.20.18", path = "../hir" } +tract-onnx = { version = "=0.20.18", path = "../onnx", optional = true } +tract-tflite = { version = "=0.20.18", path = "../tflite", optional = true } [features] # hir = ["tract-hir"] diff --git a/linalg/Cargo.toml b/linalg/Cargo.toml index cd3cea4b2a..96df21c465 100644 --- a/linalg/Cargo.toml +++ b/linalg/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-linalg" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -22,7 +22,7 @@ log.workspace = true num-traits.workspace = true paste.workspace = true scan_fmt.workspace = true -tract-data = { version = "=0.20.7-pre", path = "../data" } +tract-data = { version = "=0.20.18", path = "../data" } [build-dependencies] cc.workspace = true diff --git a/linalg/cost_model/Cargo.toml b/linalg/cost_model/Cargo.toml index 074636b375..1f17f68a94 100644 --- a/linalg/cost_model/Cargo.toml +++ b/linalg/cost_model/Cargo.toml @@ -15,5 +15,5 @@ colorous = "1.0.6" nu_ansi_term = "0.12.1" pbr = "1" readings-probe = "0.1.4" -tract-linalg = { path="../../linalg", version = "=0.20.7-pre" } -tract-data = { path="../../data", version = "=0.20.7-pre" } +tract-linalg = { path="../../linalg", version = "=0.20.18" } +tract-data = { path="../../data", version = "=0.20.18" } diff --git a/linalg/matmul-bench/Cargo.toml b/linalg/matmul-bench/Cargo.toml index 9e559c4f6b..4f070185c2 100644 --- a/linalg/matmul-bench/Cargo.toml +++ b/linalg/matmul-bench/Cargo.toml @@ -12,8 +12,8 @@ cblas = { version = "0.3", optional = true } accelerate-src = { version = "0.3", optional = true } blis-src = { version = "0.2", features = ["static"], optional = true } matrixmultiply = "*" -tract-data = { path = "../../data", version = "=0.20.7-pre" } -tract-linalg = { path = "../../linalg", version = "=0.20.7-pre" } +tract-data = { path = "../../data", version = "=0.20.18" } +tract-linalg = { path = "../../linalg", version = "=0.20.18" } [features] diff --git a/nnef/Cargo.toml b/nnef/Cargo.toml index ace53e811a..0b43e8411d 100644 --- a/nnef/Cargo.toml +++ b/nnef/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-nnef" -version = "0.20.7-pre" +version = "0.20.18" authors = ["Mathieu Poumeyrol "] license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -21,7 +21,7 @@ nom.workspace = true tar.workspace = true flate2 = { workspace = true, optional = true } walkdir.workspace = true -tract-core = { version = "=0.20.7-pre", path = "../core" } +tract-core = { version = "=0.20.18", path = "../core" } [dev-dependencies] temp-dir = "0.1.11" diff --git a/nnef/nnef-resources/Cargo.toml b/nnef/nnef-resources/Cargo.toml index 864b30eb03..4e4bc0f0ab 100644 --- a/nnef/nnef-resources/Cargo.toml +++ b/nnef/nnef-resources/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-nnef-resources" -version = "0.20.7-pre" +version = "0.20.18" authors = [ "Mathieu Poumeyrol ", "Hubert de La Jonquière " @@ -22,6 +22,6 @@ serde_json.workspace = true serde.workspace = true anyhow.workspace = true nom.workspace = true -tract-nnef = { version = "=0.20.7-pre", path = "../../nnef" } +tract-nnef = { version = "=0.20.18", path = "../../nnef" } diff --git a/onnx-opl/Cargo.toml b/onnx-opl/Cargo.toml index 22aa251648..41b675f489 100644 --- a/onnx-opl/Cargo.toml +++ b/onnx-opl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-onnx-opl" -version = "0.20.7-pre" +version = "0.20.18" authors = ["Mathieu Poumeyrol "] license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -19,7 +19,7 @@ log.workspace = true rand.workspace = true rand_distr.workspace = true rustfft.workspace = true -tract-nnef = { version = "=0.20.7-pre", path = "../nnef" } +tract-nnef = { version = "=0.20.18", path = "../nnef" } [dev-dependencies] env_logger.workspace = true diff --git a/onnx/Cargo.toml b/onnx/Cargo.toml index ace2e5b1b9..df45a39379 100644 --- a/onnx/Cargo.toml +++ b/onnx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-onnx" -version = "0.20.7-pre" +version = "0.20.18" authors = ["Mathieu Poumeyrol "] license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -25,9 +25,9 @@ memmap2.workspace = true num-integer.workspace = true prost.workspace = true smallvec.workspace = true -tract-nnef = { version = "=0.20.7-pre", path = "../nnef" } -tract-hir = { version = "=0.20.7-pre", path = "../hir" } -tract-onnx-opl = { version = "=0.20.7-pre", path = "../onnx-opl" } +tract-nnef = { version = "=0.20.18", path = "../nnef" } +tract-hir = { version = "=0.20.18", path = "../hir" } +tract-onnx-opl = { version = "=0.20.18", path = "../onnx-opl" } [dev-dependencies] env_logger.workspace = true diff --git a/post-release.sh b/post-release.sh index 1c5491c775..9f417cdb08 100755 --- a/post-release.sh +++ b/post-release.sh @@ -1,7 +1,7 @@ #!/bin/sh VERSION=$1 -ALL_CRATES_PATH="data linalg core nnef nnef/nnef-resources pulse-opl pulse hir tflite tensorflow onnx-opl onnx libcli api api/rs api/proxy/sys api/proxy cli" +ALL_CRATES_PATH="data linalg core nnef nnef/nnef-resources pulse-opl pulse hir tflite tensorflow onnx-opl onnx libcli api api/rs api/proxy/ffi api/proxy/sys api/proxy cli" if [ `uname` = "Darwin" ] then diff --git a/pulse-opl/Cargo.toml b/pulse-opl/Cargo.toml index 7cfc0a1637..1c67e7cde3 100644 --- a/pulse-opl/Cargo.toml +++ b/pulse-opl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-pulse-opl" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" } [dependencies] downcast-rs.workspace = true lazy_static.workspace = true -tract-nnef = { version = "=0.20.7-pre", path = "../nnef" } +tract-nnef = { version = "=0.20.18", path = "../nnef" } [features] complex = [ "tract-nnef/complex" ] diff --git a/pulse/Cargo.toml b/pulse/Cargo.toml index 2f50beb56e..d4199204cf 100644 --- a/pulse/Cargo.toml +++ b/pulse/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-pulse" -version = "0.20.7-pre" +version = "0.20.18" license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -17,5 +17,5 @@ maintenance = { status = "actively-developed" } downcast-rs.workspace = true lazy_static.workspace = true log.workspace = true -tract-pulse-opl = { version = "=0.20.7-pre", path = "../pulse-opl" } +tract-pulse-opl = { version = "=0.20.18", path = "../pulse-opl" } diff --git a/release.sh b/release.sh index ffaf463811..af2f01f0e7 100755 --- a/release.sh +++ b/release.sh @@ -9,7 +9,7 @@ cargo install tomato-toml CRATE_PATH=$1 VERSION=$2 -ALL_CRATES_PATH="data linalg core nnef nnef/nnef-resources pulse-opl pulse hir tflite tensorflow onnx-opl onnx libcli api api/rs api/proxy/sys api/proxy cli" +ALL_CRATES_PATH="data linalg core nnef nnef/nnef-resources pulse-opl pulse hir tflite tensorflow onnx-opl onnx libcli api api/rs api/ffi api/proxy/sys api/proxy cli" if [ -z "$VERSION" ] then @@ -35,11 +35,11 @@ cargo publish --allow-dirty -p $crate for other_cargo_toml in `find . -name Cargo.toml` do - if tomato get dependencies.$crate $other_cargo_toml | grep -F . + if tomato get dependencies.$crate $other_cargo_toml | grep . then tomato set "dependencies.$crate.version" "=$VERSION" $other_cargo_toml fi - if tomato get dev-dependencies.$crate $other_cargo_toml | grep -F . + if tomato get dev-dependencies.$crate $other_cargo_toml | grep . then tomato set "dev-dependencies.$crate.version" "=$VERSION" $other_cargo_toml fi diff --git a/tensorflow/Cargo.toml b/tensorflow/Cargo.toml index 82b791353a..81aefe10cf 100644 --- a/tensorflow/Cargo.toml +++ b/tensorflow/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-tensorflow" -version = "0.20.7-pre" +version = "0.20.18" authors = ["Mathieu Poumeyrol "] license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -23,8 +23,8 @@ memmap2.workspace = true prost.workspace = true prost-types.workspace = true tensorflow = { workspace = true, optional = true } -tract-hir = { version = "=0.20.7-pre", path = "../hir" } -tract-pulse = { version = "=0.20.7-pre", path = "../pulse" } +tract-hir = { version = "=0.20.18", path = "../hir" } +tract-pulse = { version = "=0.20.18", path = "../pulse" } # [build-dependencies] # protobuf-src = "1.0.5+3.19.3" diff --git a/test-rt/infra/Cargo.toml b/test-rt/infra/Cargo.toml index 048f04ceaa..ab92fb67f7 100644 --- a/test-rt/infra/Cargo.toml +++ b/test-rt/infra/Cargo.toml @@ -11,4 +11,4 @@ itertools.workspace = true dyn-clone.workspace = true env_logger.workspace = true proptest.workspace = true -tract-core = { path = "../../core", version = "=0.20.7-pre" } +tract-core = { path = "../../core", version = "=0.20.18" } diff --git a/test-rt/suite-conv/Cargo.toml b/test-rt/suite-conv/Cargo.toml index ba42e088f2..36289dd37f 100644 --- a/test-rt/suite-conv/Cargo.toml +++ b/test-rt/suite-conv/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tract-core = { path = "../../core" } +tract-core = { path = "../../core" , version = "=0.20.18" } proptest.workspace = true infra = { path = "../infra" } diff --git a/test-rt/suite-onnx/Cargo.toml b/test-rt/suite-onnx/Cargo.toml index e40335338a..617ed81c00 100644 --- a/test-rt/suite-onnx/Cargo.toml +++ b/test-rt/suite-onnx/Cargo.toml @@ -15,9 +15,9 @@ lazy_static.workspace = true log.workspace = true prost.workspace = true infra = { path = "../infra" } -tract-core = { path = "../../core" } -tract-onnx = { path = "../../onnx" } -tract-hir = { path = "../../hir" } +tract-core = { path = "../../core" , version = "=0.20.18" } +tract-onnx = { path = "../../onnx" , version = "=0.20.18" } +tract-hir = { path = "../../hir" , version = "=0.20.18" } [features] onnx_1_4_1 = [] diff --git a/test-rt/test-conv-core/Cargo.toml b/test-rt/test-conv-core/Cargo.toml index 25ee76aaf9..27421aa4f5 100644 --- a/test-rt/test-conv-core/Cargo.toml +++ b/test-rt/test-conv-core/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tract-core = { path = "../../core" } +tract-core = { path = "../../core" , version = "=0.20.18" } [dev-dependencies] suite-conv = { path = "../suite-conv" } diff --git a/test-rt/test-onnx-core/Cargo.toml b/test-rt/test-onnx-core/Cargo.toml index c9fa5085c9..ac14bd875c 100644 --- a/test-rt/test-onnx-core/Cargo.toml +++ b/test-rt/test-onnx-core/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] lazy_static.workspace = true -tract-core = { path = "../../core", version = "=0.20.7-pre" } -tract-nnef = { path = "../../nnef", version = "=0.20.7-pre" } -tract-onnx = { path = "../../onnx", version = "=0.20.7-pre" } +tract-core = { path = "../../core", version = "=0.20.18" } +tract-nnef = { path = "../../nnef", version = "=0.20.18" } +tract-onnx = { path = "../../onnx", version = "=0.20.18" } suite-onnx = { path = "../suite-onnx" } [features] diff --git a/test-rt/test-onnx-core/debug-utils/Cargo.toml b/test-rt/test-onnx-core/debug-utils/Cargo.toml index d896f1c7e8..b1e9d29cc9 100644 --- a/test-rt/test-onnx-core/debug-utils/Cargo.toml +++ b/test-rt/test-onnx-core/debug-utils/Cargo.toml @@ -9,4 +9,4 @@ members = [] [dependencies] protobuf = "*" -tract-onnx = { path = "../../../onnx" , version = "=0.20.7-pre" } +tract-onnx = { path = "../../../onnx" , version = "=0.20.18" } diff --git a/test-rt/test-onnx-nnef-cycle/Cargo.toml b/test-rt/test-onnx-nnef-cycle/Cargo.toml index 1378a1ab6f..95f9b31d32 100644 --- a/test-rt/test-onnx-nnef-cycle/Cargo.toml +++ b/test-rt/test-onnx-nnef-cycle/Cargo.toml @@ -11,6 +11,6 @@ suite-onnx = { path = "../suite-onnx" } [dev-dependencies] lazy_static.workspace = true log.workspace = true -tract-nnef = { path = "../../nnef", version = "=0.20.7-pre" } -tract-onnx-opl = { path = "../../onnx-opl", version = "=0.20.7-pre" } +tract-nnef = { path = "../../nnef", version = "=0.20.18" } +tract-onnx-opl = { path = "../../onnx-opl", version = "=0.20.18" } suite-onnx = { path = "../suite-onnx" } diff --git a/test-rt/test-tflite/Cargo.toml b/test-rt/test-tflite/Cargo.toml index 227720a4d5..5322cb4e78 100644 --- a/test-rt/test-tflite/Cargo.toml +++ b/test-rt/test-tflite/Cargo.toml @@ -14,8 +14,8 @@ suite-conv = { path = "../suite-conv" } lazy_static.workspace = true log.workspace = true tflite.workspace = true -tract-tflite = { path = "../../tflite", version = "=0.20.7-pre" } -tract-onnx-opl = { path = "../../onnx-opl", version = "=0.20.7-pre" } +tract-tflite = { path = "../../tflite", version = "=0.20.18" } +tract-onnx-opl = { path = "../../onnx-opl", version = "=0.20.18" } infra = { path = "../infra" } suite-onnx = { path = "../suite-onnx" } suite-conv = { path = "../suite-conv" } diff --git a/tflite/Cargo.toml b/tflite/Cargo.toml index b8880782fb..6fae3e9741 100644 --- a/tflite/Cargo.toml +++ b/tflite/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tract-tflite" -version = "0.20.7-pre" +version = "0.20.18" authors = ["Mathieu Poumeyrol "] license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" @@ -10,4 +10,4 @@ edition = "2021" [dependencies] derive-new.workspace = true flatbuffers.workspace = true -tract-core = { version = "=0.20.7-pre", path = "../core" } +tract-core = { version = "=0.20.18", path = "../core" }