no_preprocess

Author: mgumowsk

src/model_api/models/image_model.py

@@ -68,12 +68,18 @@ def __init__(self, inference_adapter: InferenceAdapter, configuration: dict = {}
         self.embedded_processing: bool
         self.labels: list[str]
 
-        self._is_dynamic = False
         self.nchw_layout = self.inputs[self.image_blob_name].layout == "NCHW"
         if self.nchw_layout:
             self.n, self.c, self.h, self.w = self.inputs[self.image_blob_name].shape
         else:
             self.n, self.h, self.w, self.c = self.inputs[self.image_blob_name].shape
+
+        self._is_dynamic = False
+        if self.h == -1 or self.w == -1 or self.n == -1:
+            self._is_dynamic = True
+            if self.n == -1:
+                self.n = 1
+
         self.resize = RESIZE_TYPES[self.resize_type]
         self.input_transform = InputTransform(
             self.reverse_input_channels,
@@ -84,7 +90,7 @@ def __init__(self, inference_adapter: InferenceAdapter, configuration: dict = {}
         layout = self.inputs[self.image_blob_name].layout
         if self.embedded_processing:
             self.h, self.w = self.orig_height, self.orig_width
-        else:
+        elif not self._is_dynamic:
             inference_adapter.embed_preprocessing(
                 layout=layout,
                 resize_mode=self.resize_type,
@@ -231,9 +237,13 @@ def _change_layout(self, image: np.ndarray) -> np.ndarray:
         Returns:
             - the image with layout aligned with the model layout
         """
+        h, w, c = image.shape if self._is_dynamic else (self.h, self.w, self.c)
+
+        # For fixed models, use the predefined dimensions
         if self.nchw_layout:
             image = image.transpose((2, 0, 1))  # HWC->CHW
-            image = image.reshape((1, self.c, self.h, self.w))
+            image = image.reshape((1, c, h, w))
         else:
-            image = image.reshape((1, self.h, self.w, self.c))
+            image = image.reshape((1, h, w, c))
+
         return image