bump tract compatibility (#60)

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+- Upgrade to compatibility with tract 0.21.7 and above.
+
 ## [0.6.1] - 2024-10-31
 - Upgrade `time` to solve incompatibility with Rust 1.80.0
 - Add upper bound for tract at 0.21.6 due to breaking upstream change

Cargo.toml

@@ -13,7 +13,7 @@ exclude = [ "benchmarks/perf-test" ]
 resolver = "2"
 
 [workspace.dependencies]
-tract-core = { version = "0.21,<0.21.6" }
-tract-hir = { version = "0.21,<0.21.6" }
-tract-nnef = { version = "0.21,<0.21.6" }
-tract-onnx =  { version = "0.21,<0.21.6" }
+tract-core = { version = "0.21" }
+tract-hir = { version = "0.21" }
+tract-nnef = { version = "0.21" }
+tract-onnx =  { version = "0.21" }

crates/cervo-core/src/inferer/helpers.rs

@@ -14,7 +14,7 @@ pub(super) fn build_symbolic_model(
     inputs: &[(String, Vec<usize>)],
 ) -> TractResult<(Symbol, TypedModel)> {
     model.set_output_fact(0, Default::default())?;
-    let symbol = model.symbol_table.sym("N");
+    let symbol = model.symbols.sym("N");
     for (idx, (_name, shape)) in inputs.iter().enumerate() {
         let mut full_shape = tvec!(symbol.to_dim());
 
@@ -48,14 +48,14 @@ pub(super) fn build_model<D: ToDim>(
 
 pub(super) fn build_symbolic_typed(model: &mut TypedModel) -> TractResult<Symbol> {
     model.declutter()?;
-    Ok(model.symbol_table.sym("N"))
+    Ok(model.symbols.sym("N"))
 }
 
 pub(super) fn build_typed<D: ToDim>(
     model: TypedModel,
     batch_dim: D,
 ) -> TractResult<TypedSimplePlan<TypedModel>> {
-    let symbol = model.symbol_table.sym("N");
+    let symbol = model.symbols.sym("N");
     let model = model.concretize_dims(
         &SymbolValues::default().with(&symbol, batch_dim.to_dim().to_i64().unwrap()),
     )?;

crates/cervo-onnx/src/lib.rs

@@ -91,7 +91,7 @@ pub fn to_nnef(reader: &mut dyn Read, batch_size: Option<usize>) -> Result<Vec<u
     let mut model = model_for_reader(reader)?;
 
     model.set_output_fact(0, Default::default())?;
-    let symbol = model.symbol_table.sym("N");
+    let symbol = model.symbols.sym("N");
     let input_outlets = model.input_outlets()?.to_vec();
 
     let batch = batch_size