Update ElementType and ResizeAlgorithm enums (#99)

* update enums, add resize algorithm enum

* implement From trait for element_type

* clippy warning fix

* remove  for element_type

* cargo fmt fix

Author: rahulchaphalkar

crates/openvino/src/element_type.rs

@@ -1,77 +1,47 @@
 /// `ElementType` represents the type of elements that a tensor can hold. See [`ElementType`](https://docs.openvino.ai/2023.3/api/c_cpp_api/group__ov__base__c__api.html#_CPPv417ov_element_type_e).
-#[derive(Debug)]
+#[derive(Eq, PartialEq, Copy, Clone, Debug)]
 #[repr(u32)]
 pub enum ElementType {
     /// An undefined element type.
-    Undefined = 0,
+    Undefined = openvino_sys::ov_element_type_e_UNDEFINED,
     /// A dynamic element type.
-    Dynamic = 1,
+    Dynamic = openvino_sys::ov_element_type_e_DYNAMIC,
     /// A boolean element type.
-    Boolean = 2,
+    Boolean = openvino_sys::ov_element_type_e_OV_BOOLEAN,
     /// A Bf16 element type.
-    Bf16 = 3,
+    Bf16 = openvino_sys::ov_element_type_e_BF16,
     /// A F16 element type.
-    F16 = 4,
+    F16 = openvino_sys::ov_element_type_e_F16,
     /// A F32 element type.
-    F32 = 5,
+    F32 = openvino_sys::ov_element_type_e_F32,
     /// A F64 element type.
-    F64 = 6,
+    F64 = openvino_sys::ov_element_type_e_F64,
     /// A 4-bit integer element type.
-    I4 = 7,
+    I4 = openvino_sys::ov_element_type_e_I4,
     /// An 8-bit integer element type.
-    I8 = 8,
+    I8 = openvino_sys::ov_element_type_e_I8,
     /// A 16-bit integer element type.
-    I16 = 9,
+    I16 = openvino_sys::ov_element_type_e_I16,
     /// A 32-bit integer element type.
-    I32 = 10,
+    I32 = openvino_sys::ov_element_type_e_I32,
     /// A 64-bit integer element type.
-    I64 = 11,
+    I64 = openvino_sys::ov_element_type_e_I64,
     /// An 1-bit unsigned integer element type.
-    U1 = 12,
+    U1 = openvino_sys::ov_element_type_e_U1,
     /// An 4-bit unsigned integer element type.
-    U4 = 13,
+    U4 = openvino_sys::ov_element_type_e_U4,
     /// An 8-bit unsigned integer element type.
-    U8 = 14,
+    U8 = openvino_sys::ov_element_type_e_U8,
     /// A 16-bit unsigned integer element type.
-    U16 = 15,
+    U16 = openvino_sys::ov_element_type_e_U16,
     /// A 32-bit unsigned integer element type.
-    U32 = 16,
+    U32 = openvino_sys::ov_element_type_e_U32,
     /// A 64-bit unsigned integer element type.
-    U64 = 17,
+    U64 = openvino_sys::ov_element_type_e_U64,
     /// NF4 element type.
-    NF4 = 18,
+    NF4 = openvino_sys::ov_element_type_e_NF4,
     /// F8E4M3 element type.
-    F8E4M3 = 19,
+    F8E4M3 = openvino_sys::ov_element_type_e_F8E4M3,
     /// F8E5M3 element type.
-    F8E5M3 = 20,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use openvino_sys::*;
-
-    #[test]
-    fn check_discriminant_values() {
-        assert_eq!(ov_element_type_e_UNDEFINED, ElementType::Undefined as u32);
-        assert_eq!(ov_element_type_e_U1, ElementType::U1 as u32);
-        assert_eq!(ov_element_type_e_U4, ElementType::U4 as u32);
-        assert_eq!(ov_element_type_e_U8, ElementType::U8 as u32);
-        assert_eq!(ov_element_type_e_U16, ElementType::U16 as u32);
-        assert_eq!(ov_element_type_e_U32, ElementType::U32 as u32);
-        assert_eq!(ov_element_type_e_U64, ElementType::U64 as u32);
-        assert_eq!(ov_element_type_e_I4, ElementType::I4 as u32);
-        assert_eq!(ov_element_type_e_I8, ElementType::I8 as u32);
-        assert_eq!(ov_element_type_e_I16, ElementType::I16 as u32);
-        assert_eq!(ov_element_type_e_I32, ElementType::I32 as u32);
-        assert_eq!(ov_element_type_e_I64, ElementType::I64 as u32);
-        assert_eq!(ov_element_type_e_F16, ElementType::F16 as u32);
-        assert_eq!(ov_element_type_e_F32, ElementType::F32 as u32);
-        assert_eq!(ov_element_type_e_F64, ElementType::F64 as u32);
-        assert_eq!(ov_element_type_e_OV_BOOLEAN, ElementType::Boolean as u32);
-        assert_eq!(ov_element_type_e_DYNAMIC, ElementType::Dynamic as u32);
-        assert_eq!(ov_element_type_e_NF4, ElementType::NF4 as u32);
-        assert_eq!(ov_element_type_e_F8E4M3, ElementType::F8E4M3 as u32);
-        assert_eq!(ov_element_type_e_F8E5M3, ElementType::F8E5M3 as u32);
-    }
+    F8E5M3 = openvino_sys::ov_element_type_e_F8E5M3,
 }

crates/openvino/src/lib.rs

@@ -36,6 +36,7 @@ mod partial_shape;
 pub mod prepostprocess;
 mod rank;
 mod request;
+mod resize_algorithm;
 mod shape;
 mod tensor;
 mod util;
@@ -50,6 +51,7 @@ pub use node::Node;
 pub use partial_shape::PartialShape;
 pub use rank::Rank;
 pub use request::InferRequest;
+pub use resize_algorithm::ResizeAlgorithm;
 pub use shape::Shape;
 pub use tensor::Tensor;
 

crates/openvino/src/prepostprocess.rs

@@ -4,7 +4,7 @@
 //!
 //! ```
 //!
-//! # use openvino::{prepostprocess, Core, ElementType, Layout, Shape, Tensor};
+//! # use openvino::{prepostprocess, Core, ElementType, Layout, Shape, Tensor, ResizeAlgorithm};
 //! # use std::fs;
 //! # let mut core = Core::new().expect("to instantiate the OpenVINO library");
 //! # let mut model = core.read_model_from_file(
@@ -24,13 +24,14 @@
 //! input_tensor_info.preprocess_input_tensor_set_from(&tensor).expect("to set tensor from");
 //! input_tensor_info.preprocess_input_tensor_set_layout(&Layout::new("NHWC").expect("to create a new layout")).expect("to set layout");
 //! let mut preprocess_steps = input_info.get_preprocess_steps().expect("to get preprocess steps");
-//! preprocess_steps.preprocess_steps_resize(0).expect("to resize");
+//! preprocess_steps.preprocess_steps_resize(ResizeAlgorithm::Linear).expect("to resize");
 //! let model_info = input_info.get_model_info().expect("to get model info");
 //! model_info.model_info_set_layout(&Layout::new("NCHW").expect("to create a new layout")).expect("to set layout");
 //! let new_model = pre_post_process.build_new_model().expect("to build new model with above prepostprocess steps");
 //! ```
 use crate::{
-    cstr, drop_using_function, layout::Layout, try_unsafe, util::Result, ElementType, Model, Tensor,
+    cstr, drop_using_function, layout::Layout, try_unsafe, util::Result, ElementType, Model,
+    ResizeAlgorithm, Tensor,
 };
 use openvino_sys::{
     ov_preprocess_input_info_free, ov_preprocess_input_info_get_model_info,
@@ -219,8 +220,11 @@ impl PrePostProcess {
 
 impl PreProcessSteps {
     /// Resizes data in tensor.
-    pub fn preprocess_steps_resize(&mut self, resize_algo: u32) -> Result<()> {
-        try_unsafe!(ov_preprocess_preprocess_steps_resize(self.ptr, resize_algo,))?;
+    pub fn preprocess_steps_resize(&mut self, resize_algo: ResizeAlgorithm) -> Result<()> {
+        try_unsafe!(ov_preprocess_preprocess_steps_resize(
+            self.ptr,
+            resize_algo as u32,
+        ))?;
 
         Ok(())
     }

crates/openvino/src/resize_algorithm.rs

@@ -0,0 +1,11 @@
+/// Interpolation mode when resizing during preprocess steps.
+#[derive(Copy, Clone, Debug)]
+#[repr(u32)]
+pub enum ResizeAlgorithm {
+    /// Linear interpolation
+    Linear = openvino_sys::ov_preprocess_resize_algorithm_e_RESIZE_LINEAR,
+    /// Cubic interpolation
+    Cubic = openvino_sys::ov_preprocess_resize_algorithm_e_RESIZE_CUBIC,
+    /// Nearest neighbor interpolation
+    Nearest = openvino_sys::ov_preprocess_resize_algorithm_e_RESIZE_NEAREST,
+}

crates/openvino/tests/classify-alexnet.rs

@@ -5,7 +5,7 @@ mod util;
 
 use anyhow::Ok;
 use fixtures::alexnet::Fixture;
-use openvino::{prepostprocess, Core, ElementType, Layout, Shape, Tensor};
+use openvino::{prepostprocess, Core, ElementType, Layout, ResizeAlgorithm, Shape, Tensor};
 use std::fs;
 use util::{Prediction, Predictions};
 
@@ -36,7 +36,7 @@ fn classify_alexnet() -> anyhow::Result<()> {
     input_tensor_info.preprocess_input_tensor_set_from(&tensor)?;
     input_tensor_info.preprocess_input_tensor_set_layout(&Layout::new("NHWC")?)?;
     let mut preprocess_steps = input_info.get_preprocess_steps()?;
-    preprocess_steps.preprocess_steps_resize(0)?;
+    preprocess_steps.preprocess_steps_resize(ResizeAlgorithm::Linear)?;
     let model_info = input_info.get_model_info()?;
     model_info.model_info_set_layout(&Layout::new("NCHW")?)?;
     let output_info = pre_post_process.get_output_info_by_index(0)?;

crates/openvino/tests/classify-inception.rs

@@ -5,7 +5,7 @@ mod util;
 
 use anyhow::Ok;
 use fixtures::inception::Fixture;
-use openvino::{prepostprocess, Core, ElementType, Layout, Shape, Tensor};
+use openvino::{prepostprocess, Core, ElementType, Layout, ResizeAlgorithm, Shape, Tensor};
 use std::fs;
 use util::{Prediction, Predictions};
 
@@ -36,7 +36,7 @@ fn classify_inception() -> anyhow::Result<()> {
     input_tensor_info.preprocess_input_tensor_set_from(&tensor)?;
     input_tensor_info.preprocess_input_tensor_set_layout(&Layout::new("NHWC")?)?;
     let mut preprocess_steps = input_info.get_preprocess_steps()?;
-    preprocess_steps.preprocess_steps_resize(0)?;
+    preprocess_steps.preprocess_steps_resize(ResizeAlgorithm::Linear)?;
     let model_info = input_info.get_model_info()?;
     model_info.model_info_set_layout(&Layout::new("NCHW")?)?;
     let new_model = pre_post_process.build_new_model()?;

crates/openvino/tests/classify-mobilenet.rs

@@ -5,7 +5,7 @@ mod fixtures;
 mod util;
 
 use fixtures::mobilenet::Fixture;
-use openvino::{prepostprocess, Core, ElementType, Layout, Shape, Tensor};
+use openvino::{prepostprocess, Core, ElementType, Layout, ResizeAlgorithm, Shape, Tensor};
 use std::fs;
 use util::{Prediction, Predictions};
 
@@ -36,7 +36,7 @@ fn classify_mobilenet() -> anyhow::Result<()> {
     input_tensor_info.preprocess_input_tensor_set_from(&tensor)?;
     input_tensor_info.preprocess_input_tensor_set_layout(&Layout::new("NHWC")?)?;
     let mut preprocess_steps = input_info.get_preprocess_steps()?;
-    preprocess_steps.preprocess_steps_resize(0)?;
+    preprocess_steps.preprocess_steps_resize(ResizeAlgorithm::Linear)?;
     let model_info = input_info.get_model_info()?;
     model_info.model_info_set_layout(&Layout::new("NCHW")?)?;
     let output_info = pre_post_process.get_output_info_by_index(0)?;