refactor!: make metadata methods return Option<T>

The only error case occurs when the value is not present, so `Option<T>`s make more sense here.
This commit is contained in:
Carson M.
2025-08-14 16:41:57 -05:00
parent 9a29b40f2b
commit d269461e21
5 changed files with 42 additions and 33 deletions

View File

@@ -22,8 +22,8 @@ fn mnist_5() -> ort::Result<()> {
let input0_shape = {
let metadata = session.metadata()?;
assert_eq!(metadata.name()?, "CNTKGraph");
assert_eq!(metadata.producer()?, "CNTK");
assert_eq!(metadata.name().as_deref(), Some("CNTKGraph"));
assert_eq!(metadata.producer().as_deref(), Some("CNTK"));
let input0_shape = session.inputs[0].input_type.tensor_shape().expect("input0 to be a tensor type");
let output0_shape = session.outputs[0].output_type.tensor_shape().expect("output0 to be a tensor type");

View File

@@ -29,8 +29,8 @@ fn squeezenet_mushroom() -> ort::Result<()> {
let input0_shape = {
let metadata = session.metadata()?;
assert_eq!(metadata.name()?, "main_graph");
assert_eq!(metadata.producer()?, "pytorch");
assert_eq!(metadata.name().as_deref(), Some("main_graph"));
assert_eq!(metadata.producer().as_deref(), Some("pytorch"));
let input0_shape = session.inputs[0].input_type.tensor_shape().expect("input0 to be a tensor type");
let output0_shape = session.outputs[0].output_type.tensor_shape().expect("output0 to be a tensor type");

View File

@@ -61,8 +61,8 @@ fn upsample() -> ort::Result<()> {
{
let metadata = session.metadata()?;
assert_eq!(metadata.name()?, "tf2onnx");
assert_eq!(metadata.producer()?, "tf2onnx");
assert_eq!(metadata.name().as_deref(), Some("tf2onnx"));
assert_eq!(metadata.producer().as_deref(), Some("tf2onnx"));
assert_eq!(&**session.inputs[0].input_type.tensor_shape().expect("input0 to be a tensor type"), [-1, -1, -1, 3]);
assert_eq!(&**session.outputs[0].output_type.tensor_shape().expect("output0 to be a tensor type"), [-1, -1, -1, 3]);

View File

@@ -19,10 +19,10 @@ fn vectorizer() -> ort::Result<()> {
{
let metadata = session.metadata()?;
assert_eq!(metadata.producer()?, "skl2onnx");
assert_eq!(metadata.description()?, "test description");
assert_eq!(metadata.producer().as_deref(), Some("skl2onnx"));
assert_eq!(metadata.description().as_deref(), Some("test description"));
assert_eq!(metadata.custom_keys()?, ["custom_key"]);
assert_eq!(metadata.custom("custom_key")?.as_deref(), Some("custom_value"));
assert_eq!(metadata.custom("custom_key").as_deref(), Some("custom_value"));
}
let array = ndarray::CowArray::from(ndarray::Array::from_shape_vec((1,), vec!["document".to_owned()]).unwrap());