diff --git a/Cargo.lock b/Cargo.lock index df169f4..5c2cb88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler" @@ -415,9 +415,9 @@ dependencies = [ [[package]] name = "rten" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c272639fd7727a7e8d21dc25b9b674c9021dcd4b663f7425b522b377aaadedd3" +checksum = "a9c949933c1227e10b0a6ee4e348f47f9715a667804648040872dc0e8cecba4e" dependencies = [ "flatbuffers", "num_cpus", @@ -432,33 +432,33 @@ dependencies = [ [[package]] name = "rten-imageproc" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e91b2ce3738cd5b7d38abb2a69007b9032402be65eca7074264a587a6334f0f" +checksum = "fa140b1c0f2c82f04b87ae637ef86d04cc04b8ea7c834c63c74464699d76c7b3" dependencies = [ "rten-tensor", ] [[package]] name = "rten-simd" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e491fbae05cf42d15fa282fe4a9ef2e32a8d088b267764412e71b39015bdcd50" +checksum = "110b90ce15adb254df4887e113ec9114722b9d948f3fb0aeb3722dc141bad085" [[package]] name = "rten-tensor" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3537b3a982a7e5ed5d0487a6c708f5d89c1fd418830fd136c12fd9cffa7a85f2" +checksum = "4e6d026e4576b49c6cebbfd26c09d494452820d5794e57583d604f657b146595" dependencies = [ "smallvec", ] [[package]] name = "rten-vecmath" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a5fd718507ec51e7ecdf050a19fa02afecfcdbb7e03f0e75eb09a7607fb2cb" +checksum = "74b929b6ab9102ecfb7bec50ca5ed7cb5613635cbbb641ea4098737b9ad9826d" dependencies = [ "rten-simd", ] diff --git a/Cargo.toml b/Cargo.toml index 2ee81f5..6414303 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,6 @@ members = [ ] [workspace.dependencies] -rten = { version = "0.14.0" } -rten-imageproc = { version = "0.14.0" } -rten-tensor = { version = "0.14.0" } +rten = { version = "0.15.0" } +rten-imageproc = { version = "0.15.0" } +rten-tensor = { version = "0.15.0" } diff --git a/ocrs/src/lib.rs b/ocrs/src/lib.rs index 6da27bf..6eedf47 100644 --- a/ocrs/src/lib.rs +++ b/ocrs/src/lib.rs @@ -310,10 +310,11 @@ mod tests { Dimension::Fixed(200), Dimension::Fixed(100), ]), + None, ); gb.add_input(input_id); - let output_id = gb.add_value("output", None); + let output_id = gb.add_value("output", None, None); gb.add_output(output_id); let bias = Tensor::from_scalar(0.5); @@ -353,11 +354,12 @@ mod tests { Dimension::Fixed(output_columns), Dimension::Symbolic("seq".to_string()), ]), + None, ); gb.add_input(input_id); // MaxPool to scale width by 1/4: NCHW => NCHW/4 - let pool_out = gb.add_value("max_pool_out", None); + let pool_out = gb.add_value("max_pool_out", None, None); gb.add_operator( "max_pool", OpType::MaxPool(MaxPool { @@ -372,7 +374,7 @@ mod tests { // Squeeze to remove the channel dim: NCHW/4 => NHW/4 let squeeze_axes = Tensor::from_vec(vec![1]); let squeeze_axes_id = gb.add_constant(squeeze_axes.view()); - let squeeze_out = gb.add_value("squeeze_out", None); + let squeeze_out = gb.add_value("squeeze_out", None, None); gb.add_operator( "squeeze", OpType::Squeeze, @@ -381,7 +383,7 @@ mod tests { ); // Transpose: NHW/4 => W/4NH - let transpose_out = gb.add_value("transpose_out", None); + let transpose_out = gb.add_value("transpose_out", None, None); gb.add_operator( "transpose", OpType::Transpose(Transpose {