internal dependencies at workspace level

sonos · Dec 5, 2024 · a8e3a85 · a8e3a85
1 parent f38d93e
commit a8e3a85
Show file tree

Hide file tree

Showing 50 changed files with 106 additions and 106 deletions.
diff --git a/api/ffi/Cargo.toml b/api/ffi/Cargo.toml
@@ -23,5 +23,5 @@ anyhow.workspace = true
 flate2.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-tract-api = { path = ".." , version = "=0.21.8-pre" }
-tract-rs = { path = "../rs" , version = "=0.21.8-pre" }
+tract-api.workspace = true
+tract-rs.workspace = true
diff --git a/api/proxy/Cargo.toml b/api/proxy/Cargo.toml
@@ -17,8 +17,8 @@ anyhow.workspace = true
 boow.workspace = true
 home.workspace = true
 ndarray.workspace = true
-tract-api = { path = ".." , version = "=0.21.8-pre" }
-tract-proxy-sys = { path = "sys", version = "=0.21.8-pre" }
+tract-api.workspace = true
+tract-proxy-sys.workspace = true
 
 [dev-dependencies]
 reqwest.workspace = true

diff --git a/api/rs/Cargo.toml b/api/rs/Cargo.toml
@@ -18,13 +18,13 @@ boow.workspace = true
 flate2.workspace = true
 half.workspace = true
 ndarray.workspace = true
-tract-api = { path = ".." , version = "=0.21.8-pre" }
-tract-nnef = { path = "../../nnef/" , version = "=0.21.8-pre" }
-tract-onnx-opl = { path = "../../onnx-opl/" , version = "=0.21.8-pre" }
-tract-onnx = { path = "../../onnx/" , version = "=0.21.8-pre" }
-tract-extra = { path = "../../extra/" , version = "=0.21.8-pre" }
-tract-pulse = { path = "../../pulse/" , version = "=0.21.8-pre" }
-tract-libcli = { path = "../../libcli" , version = "=0.21.8-pre" }
+tract-api.workspace = true
+tract-nnef.workspace = true
+tract-onnx-opl.workspace = true
+tract-onnx.workspace = true
+tract-extra.workspace = true
+tract-pulse.workspace = true
+tract-libcli.workspace = true
 serde_json.workspace = true
 
 [dev-dependencies]

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -35,20 +35,20 @@ rustls.workspace = true
 scan_fmt.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-tract-linalg = { version = "=0.21.8-pre", path = "../linalg" }
-tract-core = { version = "=0.21.8-pre", path = "../core" }
-tract-hir = { version = "=0.21.8-pre", path = "../hir" }
-tract-nnef = { version = "=0.21.8-pre", path = "../nnef" }
-tract-libcli = { version = "=0.21.8-pre", path = "../libcli" }
-tract-extra = { optional = true, version = "=0.21.8-pre", path = "../extra" }
-tract-pulse-opl = { optional = true, version = "=0.21.8-pre", path = "../pulse-opl" }
-tract-pulse = { optional = true, version = "=0.21.8-pre", path = "../pulse" }
-tract-onnx = { optional = true, version = "=0.21.8-pre", path = "../onnx" }
-tract-tensorflow = { optional = true, version = "=0.21.8-pre", path = "../tensorflow" }
-tract-tflite = { optional = true, version = "=0.21.8-pre", path = "../tflite" }
+tract-linalg.workspace = true
+tract-core.workspace = true
+tract-hir.workspace = true
+tract-nnef.workspace = true
+tract-libcli.workspace = true
+tract-extra = { workspace = true, optional = true }
+tract-pulse = { workspace = true, optional = true }
+tract-pulse-opl = { workspace = true, optional = true }
+tract-onnx = { workspace = true, optional = true }
+tract-tensorflow = { workspace = true, optional = true }
+tract-tflite = { workspace = true, optional = true }
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
-tract-metal = { version = "=0.21.8-pre", path = "../metal" }
+tract-metal.workspace = true
 
 
 [features]

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -35,8 +35,8 @@ openblas-src = { workspace=true, optional = true }
 paste.workspace = true
 rustfft.workspace = true
 smallvec.workspace = true
-tract-linalg = { version = "=0.21.8-pre", path = "../linalg" }
-tract-data = { version = "=0.21.8-pre", path = "../data" }
+tract-linalg.workspace = true
+tract-data.workspace = true
 
 [features]
 default = [ ]

diff --git a/examples/face_detection_yolov8onnx_example/Cargo.toml b/examples/face_detection_yolov8onnx_example/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 anyhow.workspace = true
 clap = { version = "4.5.9", features = ["derive"] }
 image.workspace = true 
-tract-onnx = {path="../../onnx", version="=0.21.8-pre" }
+tract-onnx.workspace = true
diff --git a/examples/face_similarity_arcface_onnx/Cargo.toml b/examples/face_similarity_arcface_onnx/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 anyhow.workspace = true
 clap = { version = "4.5.9", features = ["derive"] }
 image.workspace = true 
-tract-onnx = {path="../../onnx", version="=0.21.8-pre" }
-tract-core = {path="../../core", version="=0.21.8-pre"}
+tract-onnx.workspace = true
+tract-core.workspace = true
 
diff --git a/examples/keras-tract-tf2/Cargo.toml b/examples/keras-tract-tf2/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 
-tract-core = { path = "../../core", version = "=0.21.8-pre" }
-tract-onnx = { path = "../../onnx", version = "=0.21.8-pre" }
+tract-core.workspace = true
+tract-onnx.workspace = true
 ndarray-npy.workspace = true
 
diff --git 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.21.8-pre", path = "../../nnef" }
+tract-nnef.workspace = true
diff --git 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.21.8-pre", path = "../../nnef" }
+tract-nnef.workspace = true
diff --git 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.21.8-pre" }
+tract-onnx.workspace = true
diff --git a/examples/pytorch-albert-v2/Cargo.toml b/examples/pytorch-albert-v2/Cargo.toml
@@ -13,4 +13,4 @@ ndarray.workspace = true
 tokenizers.workspace = true
 clap_builder = { version = "4.4" }
 clap_lex = { version = "0.7" }
-tract-onnx = { path = "../../onnx", version = "=0.21.8-pre" }
+tract-onnx.workspace = true
diff --git 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.21.8-pre" }
+tract-onnx.workspace = true
diff --git 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.21.8-pre" }
+tract-tensorflow.workspace = true
diff --git 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.21.8-pre" }
+tract-tflite.workspace = true
diff --git a/extra/Cargo.toml b/extra/Cargo.toml
@@ -15,8 +15,8 @@ rust-version = "1.75"
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-tract-nnef = { version = "=0.21.8-pre", path = "../nnef" }
-tract-pulse = { version = "=0.21.8-pre", path = "../pulse" }
+tract-nnef.workspace = true
+tract-pulse.workspace = true
 
 [dev-dependencies]
 criterion.workspace = true

diff --git a/harness/core-proptest-pulse/Cargo.toml b/harness/core-proptest-pulse/Cargo.toml
@@ -6,8 +6,8 @@ license = "MIT OR Apache-2.0"
 edition = "2021"
 
 [dependencies]
-tract-core = { path = "../../core", version = "=0.21.8-pre" }
-tract-pulse = { path = "../../pulse", version = "=0.21.8-pre" }
+tract-core.workspace = true
+tract-pulse.workspace = true
 
 [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
@@ -7,5 +7,5 @@ edition = "2021"
 
 [dependencies]
 proptest.workspace = true
-tract-tensorflow = { path = "../../tensorflow", version = "=0.21.8-pre" }
-tract-onnx = { path = "../../onnx", version = "=0.21.8-pre" }
+tract-tensorflow.workspace = true
+tract-onnx.workspace = true
diff --git 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.21.8-pre", path = "../../core" }
-tract-nnef = { version = "=0.21.8-pre", path = "../../nnef" }
+tract-core.workspace = true
+tract-nnef.workspace = true
 
 [dev-dependencies]
 dinghy-test.workspace = true

diff --git 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.21.8-pre" }
+tract-onnx.workspace = true
 proptest = "1.0.0"
diff --git a/harness/tf-inceptionv3/Cargo.toml b/harness/tf-inceptionv3/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 image.workspace = true
-tract-tensorflow = { path = "../../tensorflow", version = "=0.21.8-pre" }
+tract-tensorflow.workspace = true
 
 [features]
 conform = [ "tract-tensorflow/conform" ]

diff --git a/harness/tf-mobilenet-v2/Cargo.toml b/harness/tf-mobilenet-v2/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 image.workspace = true
-tract-tensorflow = { path = "../../tensorflow", version = "=0.21.8-pre" }
+tract-tensorflow.workspace = true
 
 [dev-dependencies]
 dinghy-test.workspace = true
diff --git 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.21.8-pre" }
+tract-tensorflow.workspace = true
 
 [dev-dependencies]
 env_logger.workspace = true
diff --git 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.21.8-pre" }
+tract-tflite.workspace = true
 
 [dev-dependencies]
 dinghy-test.workspace = true
diff --git a/hir/Cargo.toml b/hir/Cargo.toml
@@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" }
 derive-new.workspace = true
 log.workspace = true
 
-tract-core = { version = "=0.21.8-pre", path = "../core" }
+tract-core.workspace = true
 
 [dev-dependencies]
 env_logger.workspace = true
diff --git a/libcli/Cargo.toml b/libcli/Cargo.toml
@@ -23,10 +23,10 @@ py_literal.workspace = true
 rand.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-tract-core = { version = "=0.21.8-pre", path = "../core" }
-tract-hir = { version = "=0.21.8-pre", path = "../hir" }
-tract-onnx = { version = "=0.21.8-pre", path = "../onnx", optional = true }
-tract-tflite = { version = "=0.21.8-pre", path = "../tflite", optional = true }
+tract-core.workspace = true
+tract-hir.workspace = true
+tract-onnx = { workspace = true, optional = true }
+tract-tflite.workspace = true
 
 [features]
 # hir = ["tract-hir"]

diff --git a/linalg/Cargo.toml b/linalg/Cargo.toml
@@ -25,7 +25,7 @@ num-traits.workspace = true
 paste.workspace = true
 rayon.workspace = true
 scan_fmt.workspace = true
-tract-data = { version = "=0.21.8-pre", path = "../data" }
+tract-data.workspace = true
 
 [build-dependencies]
 cc.workspace = true

diff --git a/linalg/cost_model/Cargo.toml b/linalg/cost_model/Cargo.toml
@@ -15,5 +15,5 @@ colorous = "1.0.6"
 nu-ansi-term = "0.50"
 pbr = "1"
 readings-probe = "0.1.4"
-tract-linalg = { path="../../linalg", version = "=0.21.8-pre" }
-tract-data = { path="../../data", version = "=0.21.8-pre" }
+tract-linalg.workspace = true
+tract-data.workspace = true
diff --git 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.21.8-pre" }
-tract-linalg = { path = "../../linalg", version = "=0.21.8-pre" }
+tract-data.workspace = true
+tract-linalg.workspace = true
 
 
 [features]

diff --git a/metal/Cargo.toml b/metal/Cargo.toml
@@ -28,7 +28,7 @@ metal.workspace = true
 paste.workspace = true
 objc = { version = "0.2.7" }
 num-traits.workspace = true
-tract-core = { version = "=0.21.8-pre", path = "../core" }
+tract-core.workspace = true
 
 [features]
 default = [ ]

diff --git a/nnef/Cargo.toml b/nnef/Cargo.toml
@@ -21,7 +21,7 @@ nom.workspace = true
 tar.workspace = true
 flate2 = { workspace = true, optional = true }
 walkdir.workspace = true
-tract-core = { version = "=0.21.8-pre", path = "../core" }
+tract-core.workspace = true
 
 [dev-dependencies]
 temp-dir = "0.1.11"

diff --git a/nnef/cli/Cargo.toml b/nnef/cli/Cargo.toml
@@ -19,6 +19,6 @@ anyhow.workspace = true
 env_logger.workspace = true
 log.workspace = true
 structopt.workspace = true
-tract-nnef = { version = "=0.21.8-pre", path = "../../nnef" }
-tract-pulse = { version = "=0.21.8-pre", path = "../../pulse" }
-tract-onnx-opl = { version = "=0.21.8-pre", path = "../../onnx-opl" }
+tract-nnef.workspace = true
+tract-pulse.workspace = true
+tract-onnx-opl.workspace = true
diff --git a/nnef/nnef-resources/Cargo.toml b/nnef/nnef-resources/Cargo.toml
@@ -22,6 +22,6 @@ serde_json.workspace = true
 serde.workspace = true
 anyhow.workspace = true
 nom.workspace = true
-tract-nnef = { version = "=0.21.8-pre", path = "../../nnef" }
+tract-nnef.workspace = true
 
 
diff --git a/onnx-opl/Cargo.toml b/onnx-opl/Cargo.toml
@@ -19,7 +19,7 @@ log.workspace = true
 rand.workspace = true
 rand_distr.workspace = true
 rustfft.workspace = true
-tract-nnef = { version = "=0.21.8-pre", path = "../nnef" }
+tract-nnef.workspace = true
 
 [dev-dependencies]
 env_logger.workspace = true

diff --git a/onnx/Cargo.toml b/onnx/Cargo.toml
@@ -25,9 +25,9 @@ memmap2.workspace = true
 num-integer.workspace = true
 prost.workspace = true
 smallvec.workspace = true
-tract-nnef = { version = "=0.21.8-pre", path = "../nnef" }
-tract-hir = { version = "=0.21.8-pre", path = "../hir" }
-tract-onnx-opl = { version = "=0.21.8-pre", path = "../onnx-opl" }
+tract-nnef.workspace = true
+tract-hir.workspace = true
+tract-onnx-opl.workspace = true
 
 [dev-dependencies]
 env_logger.workspace = true

diff --git a/pulse-opl/Cargo.toml b/pulse-opl/Cargo.toml
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
 [dependencies]
 downcast-rs.workspace = true
 lazy_static.workspace = true
-tract-nnef = { version = "=0.21.8-pre", path = "../nnef" }
+tract-nnef.workspace = true
 
 [features]
 complex = [ "tract-nnef/complex" ]
diff --git a/pulse/Cargo.toml b/pulse/Cargo.toml
@@ -17,5 +17,5 @@ maintenance = { status = "actively-developed" }
 downcast-rs.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-tract-pulse-opl = { version = "=0.21.8-pre", path = "../pulse-opl" }
+tract-pulse-opl.workspace = true
 
diff --git a/tensorflow/Cargo.toml b/tensorflow/Cargo.toml
@@ -23,8 +23,8 @@ memmap2.workspace = true
 prost.workspace = true
 prost-types.workspace = true
 tensorflow = { workspace = true, optional = true }
-tract-hir = { version = "=0.21.8-pre", path = "../hir" }
-tract-pulse = { version = "=0.21.8-pre", path = "../pulse" }
+tract-hir.workspace = true
+tract-pulse.workspace = true
 
 # [build-dependencies]
 # protobuf-src = "1.0.5+3.19.3"

diff --git a/test-rt/infra/Cargo.toml b/test-rt/infra/Cargo.toml
@@ -12,7 +12,7 @@ dyn-clone.workspace = true
 env_logger.workspace = true
 itertools.workspace = true
 lazy_static.workspace = true
-tract-core = { path = "../../core", version = "=0.21.8-pre" }
+tract-core.workspace = true
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 proptest.workspace = true

diff --git 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" , version = "=0.21.8-pre" }
-tract-onnx = { path = "../../onnx" , version = "=0.21.8-pre" }
-tract-hir = { path = "../../hir" , version = "=0.21.8-pre" }
+tract-core.workspace = true
+tract-onnx.workspace = true
+tract-hir.workspace = true
 
 [features]
 onnx_1_4_1 = []