Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ORTOptimizer for the model type Segformer #1820

Merged
merged 7 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions optimum/onnxruntime/modeling_ort.py
Original file line number Diff line number Diff line change
Expand Up @@ -1746,13 +1746,18 @@ class ORTModelForSemanticSegmentation(ORTModel):
checkpoint="optimum/segformer-b0-finetuned-ade-512-512",
)
)
def forward(self, **kwargs):
use_torch = isinstance(next(iter(kwargs.values())), torch.Tensor)
def forward(
self,
pixel_values: Union[torch.Tensor, np.ndarray],
**kwargs,
):
use_torch = isinstance(pixel_values, torch.Tensor)
self.raise_on_numpy_input_io_binding(use_torch)

if self.device.type == "cuda" and self.use_io_binding:
io_binding = IOBindingHelper.prepare_io_binding(
self,
pixel_values,
**kwargs,
ordered_input_names=self._ordered_input_names,
)
Expand All @@ -1769,7 +1774,7 @@ def forward(self, **kwargs):
# converts output to namedtuple for pipelines post-processing
return SemanticSegmenterOutput(logits=outputs["logits"])
else:
onnx_inputs = self._prepare_onnx_inputs(use_torch=use_torch, **kwargs)
onnx_inputs = self._prepare_onnx_inputs(use_torch=use_torch, pixel_values=pixel_values, **kwargs)

# run inference
onnx_outputs = self.model.run(None, onnx_inputs)
Expand Down
1 change: 1 addition & 0 deletions optimum/onnxruntime/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ class ORTConfigManager:
"nystromformer": "bert",
"pegasus": "bert",
"roberta": "bert",
"segformer": "vit",
"t5": "bert",
"vit": "vit",
"whisper": "bart",
Expand Down
15 changes: 14 additions & 1 deletion optimum/utils/normalized_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,19 @@ class NormalizedVisionConfig(NormalizedConfig):
INPUT_SIZE = "input_size"


class NormalizedSegformerConfig(NormalizedVisionConfig):
NUM_ATTENTION_HEADS = "num_attention_heads"
HIDDEN_SIZE = "hidden_sizes"

# If the attribute is a list, return 0
# 0 means let the optimizer infer the correct value based on the model graph
def __getattr__(self, attr_name):
attr_value = super().__getattr__(attr_name)
if isinstance(attr_value, list):
attr_value = 0
return attr_value


class NormalizedTextAndVisionConfig(NormalizedTextConfig, NormalizedVisionConfig):
TEXT_CONFIG = None
VISION_CONFIG = None
Expand Down Expand Up @@ -203,7 +216,6 @@ class NormalizedConfigManager:
'owlvit',
'perceiver',
'roformer',
'segformer',
'squeezebert',
'table-transformer',
"""
Expand Down Expand Up @@ -256,6 +268,7 @@ class NormalizedConfigManager:
"regnet": NormalizedVisionConfig,
"resnet": NormalizedVisionConfig,
"roberta": NormalizedTextConfig,
"segformer": NormalizedSegformerConfig,
"speech-to-text": SpeechToTextLikeNormalizedTextConfig,
"splinter": NormalizedTextConfig,
"t5": T5LikeNormalizedTextConfig,
Expand Down
2 changes: 2 additions & 0 deletions tests/onnxruntime/test_optimization.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
AutoOptimizationConfig,
ORTConfig,
ORTModelForImageClassification,
ORTModelForSemanticSegmentation,
ORTModelForSequenceClassification,
ORTOptimizer,
)
Expand Down Expand Up @@ -171,6 +172,7 @@ def test_compare_original_seq2seq_model_with_optimized_model(self, model_cls, mo

# Contribution note: Please add test models in alphabetical order. Find test models here: https://huggingface.co/hf-internal-testing.
SUPPORTED_IMAGE_ARCHITECTURES_WITH_MODEL_ID = (
(ORTModelForSemanticSegmentation, "hf-internal-testing/tiny-random-segformer"),
(ORTModelForImageClassification, "hf-internal-testing/tiny-random-vit"),
)

Expand Down