[bug] Add out of the box support for deployment_directories (#1131)

* Add out of the box support for deployment_directories

* Remove dir --> model_path translation as model_to_path handles it now

* use model_to_path in openpif pipeline

src/deepsparse/image_classification/pipelines.py

@@ -16,7 +16,6 @@
 Image classification pipeline
 """
 import json
-from pathlib import Path
 from typing import Dict, List, Optional, Tuple, Type, Union
 
 import numpy
@@ -135,11 +134,6 @@ class properties into an inference ready onnx file to be compiled by the
 
         :return: file path to the ONNX file for the engine to compile
         """
-
-        model_path_: Path = Path(self.model_path)
-        if model_path_.is_dir():
-            return model_to_path(str(model_path_ / "model.onnx"))
-
         return model_to_path(self.model_path)
 
     def process_inputs(self, inputs: ImageClassificationInput) -> List[numpy.ndarray]:

src/deepsparse/open_pif_paf/pipelines.py

@@ -28,6 +28,7 @@
     OpenPifPafOutput,
 )
 from deepsparse.pipeline import Pipeline
+from deepsparse.utils import model_to_path
 from deepsparse.yolact.utils import preprocess_array
 from openpifpaf import decoder, network
 
@@ -100,7 +101,7 @@ class properties into an inference ready onnx file to be compiled by the
 
         :return: file path to the ONNX file for the engine to compile
         """
-        return self.model_path
+        return model_to_path(self.model_path)
 
     def process_inputs(self, inputs: OpenPifPafInput) -> List[numpy.ndarray]:
 

src/deepsparse/utils/onnx.py

@@ -16,6 +16,7 @@
 import logging
 import os
 import tempfile
+from pathlib import Path
 from tempfile import NamedTemporaryFile
 from typing import List, Optional, Tuple, Union
 
@@ -96,9 +97,10 @@ def translate_onnx_type_to_numpy(tensor_type: int):
 def model_to_path(model: Union[str, Model, File]) -> str:
     """
     Deals with the various forms a model can take. Either an ONNX file,
-    a SparseZoo model stub prefixed by 'zoo:', a SparseZoo Model object,
-    or a SparseZoo ONNX File object that defines the neural network. Noting
-    the model will be downloaded automatically if a SparseZoo stub is passed
+    a directory containing model.onnx, a SparseZoo model stub prefixed by
+    'zoo:', a SparseZoo Model object, or a SparseZoo ONNX File object that
+    defines the neural network. Noting the model will be downloaded automatically
+    if a SparseZoo stub is passed
 
     :param model: Either a local str path or SparseZoo stub to the model. Can
         also be a sparsezoo.Model or sparsezoo.File object
@@ -126,6 +128,10 @@ def model_to_path(model: Union[str, Model, File]) -> str:
     if not os.path.exists(model):
         raise ValueError("model path must exist: given {}".format(model))
 
+    model_path = Path(model)
+    if model_path.is_dir():
+        return str(model_path / "model.onnx")
+
     return model