From c0e5c19ab286cf3f1c99fd209926681f23dce4e2 Mon Sep 17 00:00:00 2001 From: Andrea Frigido Date: Thu, 20 Jul 2023 18:33:53 +0100 Subject: [PATCH] Update license field following SPDX 2.1 license expression standard --- cli/Cargo.toml | 2 +- core/Cargo.toml | 2 +- data/Cargo.toml | 2 +- examples/jupyter-keras-tract-tf1/Cargo.toml | 2 +- examples/jupyter-keras-tract-tf2/Cargo.toml | 2 +- examples/nnef-dump-mobilenet-v2/Cargo.toml | 2 +- examples/nnef-mobilenet-v2/Cargo.toml | 2 +- examples/onnx-mobilenet-v2/Cargo.toml | 2 +- examples/pytorch-resnet/Cargo.toml | 2 +- examples/tensorflow-mobilenet-v2/Cargo.toml | 2 +- examples/tflite-mobilenet-v3/Cargo.toml | 2 +- ffi/Cargo.toml | 2 +- harness/core-proptest-pulse/Cargo.toml | 2 +- harness/lstm-proptest-onnx-vs-tf/Cargo.toml | 2 +- harness/nnef-inceptionv3/Cargo.toml | 2 +- harness/tf-inceptionv3/Cargo.toml | 2 +- harness/tf-mobilenet-v2/Cargo.toml | 2 +- harness/tf-moz-deepspeech/Cargo.toml | 2 +- hir/Cargo.toml | 2 +- libcli/Cargo.toml | 2 +- linalg/Cargo.toml | 2 +- nnef/Cargo.toml | 2 +- nnef/nnef-resources/Cargo.toml | 2 +- onnx-opl/Cargo.toml | 2 +- onnx/Cargo.toml | 2 +- pulse-opl/Cargo.toml | 2 +- pulse/Cargo.toml | 2 +- tensorflow/Cargo.toml | 2 +- test-rt/test-onnx-core/Cargo.toml | 2 +- tflite/Cargo.toml | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f9800ab620..58ca4ae1ae 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -2,7 +2,7 @@ name = "tract" version = "0.20.7-pre" authors = [ "Romain Liautaud ", "Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" keywords = [ "TensorFlow", "NeuralNetworks" ] diff --git a/core/Cargo.toml b/core/Cargo.toml index 52aeb9ff6e..7dcf496cbe 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tract-core" version = "0.20.7-pre" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" diff --git a/data/Cargo.toml b/data/Cargo.toml index c29695743a..05a95cc563 100644 --- a/data/Cargo.toml +++ b/data/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tract-data" version = "0.20.7-pre" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" diff --git a/examples/jupyter-keras-tract-tf1/Cargo.toml b/examples/jupyter-keras-tract-tf1/Cargo.toml index 6e81c7d704..c3438b8e59 100644 --- a/examples/jupyter-keras-tract-tf1/Cargo.toml +++ b/examples/jupyter-keras-tract-tf1/Cargo.toml @@ -2,7 +2,7 @@ name = "jupyter-keras-tract-tf1" version = "0.20.7-pre" authors = ["Matthew Alhonte "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/jupyter-keras-tract-tf2/Cargo.toml b/examples/jupyter-keras-tract-tf2/Cargo.toml index 2cd98b5e0d..675b3d2009 100644 --- a/examples/jupyter-keras-tract-tf2/Cargo.toml +++ b/examples/jupyter-keras-tract-tf2/Cargo.toml @@ -2,7 +2,7 @@ name = "jupyter-keras-tract-tf2" version = "0.20.7-pre" authors = ["Matthew Alhonte "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/nnef-dump-mobilenet-v2/Cargo.toml b/examples/nnef-dump-mobilenet-v2/Cargo.toml index fd3ec637c7..2667e53402 100644 --- a/examples/nnef-dump-mobilenet-v2/Cargo.toml +++ b/examples/nnef-dump-mobilenet-v2/Cargo.toml @@ -2,7 +2,7 @@ name = "example-dump-nnef-mobilenet-v2" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" [dependencies] diff --git a/examples/nnef-mobilenet-v2/Cargo.toml b/examples/nnef-mobilenet-v2/Cargo.toml index 10423b0354..fe2f2e2ed6 100644 --- a/examples/nnef-mobilenet-v2/Cargo.toml +++ b/examples/nnef-mobilenet-v2/Cargo.toml @@ -2,7 +2,7 @@ name = "example-nnef-mobilenet-v2" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" [dependencies] diff --git a/examples/onnx-mobilenet-v2/Cargo.toml b/examples/onnx-mobilenet-v2/Cargo.toml index 3cb6db1e36..61e2827d0b 100644 --- a/examples/onnx-mobilenet-v2/Cargo.toml +++ b/examples/onnx-mobilenet-v2/Cargo.toml @@ -2,7 +2,7 @@ name = "example-onnx-mobilenet-v2" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" [dependencies] diff --git a/examples/pytorch-resnet/Cargo.toml b/examples/pytorch-resnet/Cargo.toml index 0c18d63e95..4e6954c8f4 100644 --- a/examples/pytorch-resnet/Cargo.toml +++ b/examples/pytorch-resnet/Cargo.toml @@ -2,7 +2,7 @@ name = "example-pytorch-resnet" version = "0.20.7-pre" authors = ["Teddy Koker "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/tensorflow-mobilenet-v2/Cargo.toml b/examples/tensorflow-mobilenet-v2/Cargo.toml index af0452bc18..0f6f05e4f8 100644 --- a/examples/tensorflow-mobilenet-v2/Cargo.toml +++ b/examples/tensorflow-mobilenet-v2/Cargo.toml @@ -2,7 +2,7 @@ name = "example-tensorflow-mobilenet-v2" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" [dependencies] diff --git a/examples/tflite-mobilenet-v3/Cargo.toml b/examples/tflite-mobilenet-v3/Cargo.toml index 90fa5d4c82..526404bf99 100644 --- a/examples/tflite-mobilenet-v3/Cargo.toml +++ b/examples/tflite-mobilenet-v3/Cargo.toml @@ -2,7 +2,7 @@ name = "example-tflite-mobilenet-v3" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" [dependencies] diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml index a346281ea6..8288ef5031 100644 --- a/ffi/Cargo.toml +++ b/ffi/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tract-ffi" version = "0.20.7-pre" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" diff --git a/harness/core-proptest-pulse/Cargo.toml b/harness/core-proptest-pulse/Cargo.toml index 53b9ea1151..7e168342eb 100644 --- a/harness/core-proptest-pulse/Cargo.toml +++ b/harness/core-proptest-pulse/Cargo.toml @@ -2,7 +2,7 @@ name = "core-proptest-pulse" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" [dependencies] diff --git a/harness/lstm-proptest-onnx-vs-tf/Cargo.toml b/harness/lstm-proptest-onnx-vs-tf/Cargo.toml index 41a164f8ec..8494472a44 100644 --- a/harness/lstm-proptest-onnx-vs-tf/Cargo.toml +++ b/harness/lstm-proptest-onnx-vs-tf/Cargo.toml @@ -2,7 +2,7 @@ name = "lstm-proptest-onnx-vs-tf" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" [dependencies] diff --git a/harness/nnef-inceptionv3/Cargo.toml b/harness/nnef-inceptionv3/Cargo.toml index aa49427309..c9beddf682 100644 --- a/harness/nnef-inceptionv3/Cargo.toml +++ b/harness/nnef-inceptionv3/Cargo.toml @@ -2,7 +2,7 @@ name = "nnef-inceptionv3" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" [dependencies] diff --git a/harness/tf-inceptionv3/Cargo.toml b/harness/tf-inceptionv3/Cargo.toml index 6f6bde67f6..a82a4cd1f7 100644 --- a/harness/tf-inceptionv3/Cargo.toml +++ b/harness/tf-inceptionv3/Cargo.toml @@ -2,7 +2,7 @@ name = "tf-inceptionv3" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" [dependencies] image.workspace = true diff --git a/harness/tf-mobilenet-v2/Cargo.toml b/harness/tf-mobilenet-v2/Cargo.toml index 7717013605..2d3c5a216e 100644 --- a/harness/tf-mobilenet-v2/Cargo.toml +++ b/harness/tf-mobilenet-v2/Cargo.toml @@ -2,7 +2,7 @@ name = "tf-mobilenet-v2" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" [dependencies] image.workspace = true diff --git a/harness/tf-moz-deepspeech/Cargo.toml b/harness/tf-moz-deepspeech/Cargo.toml index e5ca436a3e..ef8bd10af3 100644 --- a/harness/tf-moz-deepspeech/Cargo.toml +++ b/harness/tf-moz-deepspeech/Cargo.toml @@ -3,7 +3,7 @@ name = "tf-moz-deepspeech" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] edition = "2021" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" [dependencies] log.workspace = true diff --git a/hir/Cargo.toml b/hir/Cargo.toml index b18c39fd19..cea6490ef6 100644 --- a/hir/Cargo.toml +++ b/hir/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tract-hir" version = "0.20.7-pre" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" diff --git a/libcli/Cargo.toml b/libcli/Cargo.toml index 6ce94f2d7a..53727df8d8 100644 --- a/libcli/Cargo.toml +++ b/libcli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tract-libcli" version = "0.20.7-pre" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" diff --git a/linalg/Cargo.toml b/linalg/Cargo.toml index 23e5a7f254..0b4b5f3514 100644 --- a/linalg/Cargo.toml +++ b/linalg/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tract-linalg" version = "0.20.7-pre" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" diff --git a/nnef/Cargo.toml b/nnef/Cargo.toml index 6413d928e2..ace53e811a 100644 --- a/nnef/Cargo.toml +++ b/nnef/Cargo.toml @@ -2,7 +2,7 @@ name = "tract-nnef" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" keywords = [ "NeuralNetworks", "NNEF" ] diff --git a/nnef/nnef-resources/Cargo.toml b/nnef/nnef-resources/Cargo.toml index 42a89d22d2..864b30eb03 100644 --- a/nnef/nnef-resources/Cargo.toml +++ b/nnef/nnef-resources/Cargo.toml @@ -5,7 +5,7 @@ authors = [ "Mathieu Poumeyrol ", "Hubert de La Jonquière " ] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" keywords = [ "NeuralNetworks", "NNEF" ] diff --git a/onnx-opl/Cargo.toml b/onnx-opl/Cargo.toml index e65462f60a..22aa251648 100644 --- a/onnx-opl/Cargo.toml +++ b/onnx-opl/Cargo.toml @@ -2,7 +2,7 @@ name = "tract-onnx-opl" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" keywords = [ "TensorFlow", "NeuralNetworks", "ONNX" ] diff --git a/onnx/Cargo.toml b/onnx/Cargo.toml index 1b0bf79fcd..ace2e5b1b9 100644 --- a/onnx/Cargo.toml +++ b/onnx/Cargo.toml @@ -2,7 +2,7 @@ name = "tract-onnx" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" keywords = [ "TensorFlow", "NeuralNetworks", "ONNX" ] diff --git a/pulse-opl/Cargo.toml b/pulse-opl/Cargo.toml index 6449e4705e..7cfc0a1637 100644 --- a/pulse-opl/Cargo.toml +++ b/pulse-opl/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tract-pulse-opl" version = "0.20.7-pre" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" diff --git a/pulse/Cargo.toml b/pulse/Cargo.toml index f1013a1d95..2f50beb56e 100644 --- a/pulse/Cargo.toml +++ b/pulse/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tract-pulse" version = "0.20.7-pre" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["Mathieu Poumeyrol "] description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" diff --git a/tensorflow/Cargo.toml b/tensorflow/Cargo.toml index 9755931361..82b791353a 100644 --- a/tensorflow/Cargo.toml +++ b/tensorflow/Cargo.toml @@ -2,7 +2,7 @@ name = "tract-tensorflow" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" keywords = [ "TensorFlow", "NeuralNetworks", "ONNX" ] diff --git a/test-rt/test-onnx-core/Cargo.toml b/test-rt/test-onnx-core/Cargo.toml index 358e6e3f42..c9fa5085c9 100644 --- a/test-rt/test-onnx-core/Cargo.toml +++ b/test-rt/test-onnx-core/Cargo.toml @@ -2,7 +2,7 @@ name = "test-onnx-core" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" [dependencies] diff --git a/tflite/Cargo.toml b/tflite/Cargo.toml index d860119db7..bea8c7969f 100644 --- a/tflite/Cargo.toml +++ b/tflite/Cargo.toml @@ -2,7 +2,7 @@ name = "tract-tflite" version = "0.20.7-pre" authors = ["Mathieu Poumeyrol "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference" repository = "https://github.com/snipsco/tract" edition = "2021"