feat: Add ml model input and output shape to allow models run on entire tiles #1000
Conversation
Pull Request Test Coverage Report for Build 13195982647Details
💛 - Coveralls |
…r-shape-to-ml-model
…r-shape-to-ml-model
…r-shape-to-ml-model
jdroenner
changed the title
| ); | ||
| let session = load_onnx_model_from_metadata(&self.model_metadata)?; | ||
|
|
||
| // TODO: check @ initialize? |
There was a problem hiding this comment.
or: check when adding the model to Geo Engine? model fitting to the metadata is independent of the query
| .run(ort::inputs![input_name => samples].context(Ort)?) | ||
| .context(Ort)?; | ||
| let outputs = if self.model_metadata.input_is_single_pixel() { | ||
| let rows = width * height; |
| Ok(out) | ||
| } else if self.model_metadata.input_shape.yx_matches_tile_shape(&tile_shape){ | ||
| let samples = Array4::from_shape_vec((1, height, width, num_bands), pixels).expect( // y,x, attributes | ||
| "Array2 should be valid because it is created from a Vec with the correct size", |
| "Array2 should be valid because it is created from a Vec with the correct size", | ||
| ); | ||
|
|
||
| let input_name = &session.inputs[0].name; |
There was a problem hiding this comment.
the code starting here is the same for both cases, maybe refactor it to occur only once
There was a problem hiding this comment.
samples has a different type so i can not move it into one case. I can move it into a method but this will not be less code...
|
|
||
| Ok(out) | ||
| } else { | ||
| Err( |
There was a problem hiding this comment.
can this case even happen?
There was a problem hiding this comment.
it should not but if it happens i guess an error is better then paniic?
| @@ -347,7 +374,62 @@ mod tests { | |||
| }; | |||
| use ndarray::{Array1, Array2, arr2, array}; | |||
|
|
|||
| use super::*; | |||
| fn generate_model_metadata_from_onnx( | |||
There was a problem hiding this comment.
shouldn't this method itself be tested to generate the correct metadata for the individual onnx files?
| @@ -327,11 +346,19 @@ impl_no_data_value_zero!(i8, u8, i16, u16, i32, u32, i64, u64); | |||
|
|
|||
| #[cfg(test)] | |||
| mod tests { | |||
| use std::path::Path; | |||
There was a problem hiding this comment.
unrelated to this line: add a test with a 3 model?
| Ok(()) | ||
| } | ||
|
|
||
| pub fn try_onnx_tensor_to_ml_tensorshape_3d( |
There was a problem hiding this comment.
maybe test this method
| exe_context.tiling_specification().tile_size_in_pixels, | ||
| )?; | ||
| // initialize model | ||
| // TODO: re-use session accross queries? |
There was a problem hiding this comment.
there is no query happening? comment copy pasted?
CHANGELOG.mdif knowledge of this change could be valuable to users.Here is a brief summary of what I did: