Skip to content

Commit 0bb3f2e

Browse files
authored
Export static shape for detection/instance-segmentation models (#4113)
* Add onnxruntime dependency and update dynamic axes in detection/inst-seg models
1 parent 046602d commit 0bb3f2e

File tree

11 files changed

+156
-139
lines changed

11 files changed

+156
-139
lines changed

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ dev = [
5555
"pytest-mock",
5656
"pytest-csv",
5757
"pytest-cov",
58+
"onnxruntime==1.20.0",
5859
]
5960

6061
docs = [

src/otx/algo/detection/atss.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def _exporter(self) -> OTXModelExporter:
183183
"input_names": ["image"],
184184
"output_names": ["boxes", "labels"],
185185
"dynamic_axes": {
186-
"image": {0: "batch", 2: "height", 3: "width"},
186+
"image": {0: "batch"},
187187
"boxes": {0: "batch", 1: "num_dets"},
188188
"labels": {0: "batch", 1: "num_dets"},
189189
},

src/otx/algo/detection/rtmdet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def _exporter(self) -> OTXModelExporter:
138138
"input_names": ["image"],
139139
"output_names": ["boxes", "labels"],
140140
"dynamic_axes": {
141-
"image": {0: "batch", 2: "height", 3: "width"},
141+
"image": {0: "batch"},
142142
"boxes": {0: "batch", 1: "num_dets"},
143143
"labels": {0: "batch", 1: "num_dets"},
144144
},

src/otx/algo/detection/ssd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ def _exporter(self) -> OTXModelExporter:
346346
"input_names": ["image"],
347347
"output_names": ["boxes", "labels"],
348348
"dynamic_axes": {
349-
"image": {0: "batch", 2: "height", 3: "width"},
349+
"image": {0: "batch"},
350350
"boxes": {0: "batch", 1: "num_dets"},
351351
"labels": {0: "batch", 1: "num_dets"},
352352
},

src/otx/algo/detection/yolov9.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def _exporter(self) -> OTXModelExporter:
125125
"export_params": True,
126126
"opset_version": 11,
127127
"dynamic_axes": {
128-
"image": {0: "batch", 2: "height", 3: "width"},
128+
"image": {0: "batch"},
129129
"boxes": {0: "batch", 1: "num_dets"},
130130
"labels": {0: "batch", 1: "num_dets"},
131131
},

src/otx/algo/detection/yolox.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def _exporter(self) -> OTXModelExporter:
158158
"export_params": True,
159159
"opset_version": 11,
160160
"dynamic_axes": {
161-
"image": {0: "batch", 2: "height", 3: "width"},
161+
"image": {0: "batch"},
162162
"boxes": {0: "batch", 1: "num_dets"},
163163
"labels": {0: "batch", 1: "num_dets"},
164164
},

src/otx/algo/instance_segmentation/maskdino.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def _exporter(self) -> OTXModelExporter:
190190
onnx_export_configuration={
191191
"input_names": ["image"],
192192
"dynamic_axes": {
193-
"image": {0: "batch", 2: "height", 3: "width"},
193+
"image": {0: "batch"},
194194
"boxes": {0: "batch", 1: "num_dets"},
195195
"labels": {0: "batch", 1: "num_dets"},
196196
"masks": {0: "batch", 1: "num_dets", 2: "height", 3: "width"},

src/otx/algo/instance_segmentation/maskrcnn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def _exporter(self) -> OTXModelExporter:
319319
"input_names": ["image"],
320320
"output_names": ["boxes", "labels", "masks"],
321321
"dynamic_axes": {
322-
"image": {0: "batch", 2: "height", 3: "width"},
322+
"image": {0: "batch"},
323323
"boxes": {0: "batch", 1: "num_dets"},
324324
"labels": {0: "batch", 1: "num_dets"},
325325
"masks": {0: "batch", 1: "num_dets", 2: "height", 3: "width"},

src/otx/algo/instance_segmentation/maskrcnn_tv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ def _exporter(self) -> OTXModelExporter:
214214
"input_names": ["image"],
215215
"output_names": ["boxes", "labels", "masks"],
216216
"dynamic_axes": {
217-
"image": {0: "batch", 2: "height", 3: "width"},
217+
"image": {0: "batch"},
218218
"boxes": {0: "batch", 1: "num_dets"},
219219
"labels": {0: "batch", 1: "num_dets"},
220220
"masks": {0: "batch", 1: "num_dets", 2: "height", 3: "width"},

src/otx/algo/instance_segmentation/rtmdet_inst.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def _exporter(self) -> OTXModelExporter:
122122
"input_names": ["image"],
123123
"output_names": ["boxes", "labels", "masks"],
124124
"dynamic_axes": {
125-
"image": {0: "batch", 2: "height", 3: "width"},
125+
"image": {0: "batch"},
126126
"boxes": {0: "batch", 1: "num_dets"},
127127
"labels": {0: "batch", 1: "num_dets"},
128128
"masks": {0: "batch", 1: "num_dets", 2: "height", 3: "width"},

0 commit comments

Comments
 (0)