Refactor: encapsulate PartialShape::c_struct per review

Signed-off-by: khengari77 <khengari77@gmail.com>

Author: khengari77

crates/openvino/src/model.rs

@@ -97,7 +97,7 @@ impl Model {
     pub fn reshape_single_input(&mut self, partial_shape: &PartialShape) -> Result<()> {
         try_unsafe!(openvino_sys::ov_model_reshape_single_input(
             self.ptr,
-            partial_shape.c_struct
+            partial_shape.as_c_struct()
         ))
     }
 
@@ -111,67 +111,70 @@ impl Model {
         try_unsafe!(openvino_sys::ov_model_reshape_input_by_name(
             self.ptr,
             name.as_ptr(),
-            partial_shape.c_struct
+            partial_shape.as_c_struct()
         ))
     }
 
     /// Reshape the model with a list of (name, `partial_shape`) pairs.
-    pub fn reshape(&mut self, shapes: &[(&str, &PartialShape)]) -> Result<()> {
-        let mut c_names = Vec::with_capacity(shapes.len());
-        let mut c_shapes = Vec::with_capacity(shapes.len());
+    pub fn reshape(&mut self, partial_shapes: &[(&str, &PartialShape)]) -> Result<()> {
+        let mut c_names = Vec::with_capacity(partial_shapes.len());
+        let mut c_shapes = Vec::with_capacity(partial_shapes.len());
         // We must keep the CStrings alive until the FFI call is finished
-        let mut names_keep_alive = Vec::with_capacity(shapes.len());
+        let mut names_keep_alive = Vec::with_capacity(partial_shapes.len());
 
-        for (name, shape) in shapes {
+        for (name, partial_shape) in partial_shapes {
             let c_name = cstr!(*name);
             c_names.push(c_name.as_ptr());
             names_keep_alive.push(c_name);
-            c_shapes.push(shape.c_struct);
+            c_shapes.push(partial_shape.as_c_struct());
         }
 
         try_unsafe!(openvino_sys::ov_model_reshape(
             self.ptr,
             c_names.as_mut_ptr(),
             c_shapes.as_ptr(),
-            shapes.len()
+            partial_shapes.len()
         ))
     }
 
     /// Reshape the model using a list of (`port_index`, `partial_shape`) pairs.
-    pub fn reshape_by_port_indexes(&mut self, shapes: &[(usize, &PartialShape)]) -> Result<()> {
-        let mut c_indexes = Vec::with_capacity(shapes.len());
-        let mut c_shapes = Vec::with_capacity(shapes.len());
+    pub fn reshape_by_port_indexes(
+        &mut self,
+        partial_shapes: &[(usize, &PartialShape)],
+    ) -> Result<()> {
+        let mut c_indexes = Vec::with_capacity(partial_shapes.len());
+        let mut c_shapes = Vec::with_capacity(partial_shapes.len());
 
-        for (index, shape) in shapes {
+        for (index, partial_shape) in partial_shapes {
             c_indexes.push(*index);
-            c_shapes.push(shape.c_struct);
+            c_shapes.push(partial_shape.as_c_struct());
         }
 
         try_unsafe!(openvino_sys::ov_model_reshape_by_port_indexes(
             self.ptr,
             c_indexes.as_ptr(),
             c_shapes.as_ptr(),
-            shapes.len()
+            partial_shapes.len()
         ))
     }
 
     /// Reshape the model using a list of (Node/Port, `partial_shape`) pairs.
-    pub fn reshape_by_ports(&mut self, shapes: &[(&Node, &PartialShape)]) -> Result<()> {
-        let mut c_ports = Vec::with_capacity(shapes.len());
-        let mut c_shapes = Vec::with_capacity(shapes.len());
+    pub fn reshape_by_ports(&mut self, partial_shapes: &[(&Node, &PartialShape)]) -> Result<()> {
+        let mut c_ports = Vec::with_capacity(partial_shapes.len());
+        let mut c_shapes = Vec::with_capacity(partial_shapes.len());
 
-        for (node, shape) in shapes {
+        for (node, partial_shape) in partial_shapes {
             // ov_model_reshape_by_ports expects *const *const ov_output_port_t.
             // Node::as_ptr returns *mut ov_output_const_port_t.
             c_ports.push(node.as_ptr() as *const openvino_sys::ov_output_port_t);
-            c_shapes.push(shape.c_struct);
+            c_shapes.push(partial_shape.as_c_struct());
         }
 
         try_unsafe!(openvino_sys::ov_model_reshape_by_ports(
             self.ptr,
             c_ports.as_mut_ptr(),
             c_shapes.as_ptr(),
-            shapes.len()
+            partial_shapes.len()
         ))
     }
 }

crates/openvino/src/partial_shape.rs

@@ -10,7 +10,7 @@ use std::convert::TryInto;
 /// See
 /// [`ov_partial_shape_t`](https://docs.openvino.ai/2024/api/c_cpp_api/group__ov__partial__shape__c__api.html).
 pub struct PartialShape {
-    pub(crate) c_struct: ov_partial_shape_t,
+    c_struct: ov_partial_shape_t,
 }
 
 impl Drop for PartialShape {
@@ -28,6 +28,12 @@ impl PartialShape {
         Self { c_struct }
     }
 
+    /// Get the pointer to the underlying OpenVINO partial shape.
+    #[inline]
+    pub(crate) fn as_c_struct(&self) -> ov_partial_shape_t {
+        self.c_struct
+    }
+
     /// Create a new [`PartialShape`] with a static rank and dynamic dimensions.
     pub fn new(rank: i64, dimensions: &[Dimension]) -> Result<Self> {
         let mut partial_shape = ov_partial_shape_t {