Skip to content

Commit 37a39dd

Browse files
committed
update after migration on new pipeline style
1 parent ea19b9a commit 37a39dd

File tree

3 files changed

+155
-27
lines changed

3 files changed

+155
-27
lines changed

optimum/exporters/openvino/convert.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
from optimum.exporters.onnx.convert import export_tensorflow as export_tensorflow_onnx
3535
from optimum.exporters.utils import (
3636
_get_submodels_and_export_configs as _default_get_submodels_and_export_configs,
37+
)
38+
from optimum.exporters.utils import (
3739
get_diffusion_models_for_export,
3840
)
3941
from optimum.intel.utils.import_utils import (
@@ -621,6 +623,7 @@ def export_from_model(
621623

622624
if library_name == "diffusers":
623625
export_config, models_and_export_configs = get_diffusion_models_for_export_ext(model, exporter="openvino")
626+
stateful_submodels = False
624627
else:
625628
logging.disable(logging.INFO)
626629
export_config, models_and_export_configs, stateful_submodels = _get_submodels_and_export_configs(
@@ -636,7 +639,7 @@ def export_from_model(
636639
_variant="default",
637640
legacy=False,
638641
exporter="openvino",
639-
stateful=stateful
642+
stateful=stateful,
640643
)
641644
logging.disable(logging.NOTSET)
642645

@@ -954,7 +957,7 @@ def get_diffusion_models_for_export_ext(
954957

955958
# VAE Encoder https://github.com/huggingface/diffusers/blob/v0.11.1/src/diffusers/models/vae.py#L565
956959
vae_encoder = copy.deepcopy(pipeline.vae)
957-
vae_encoder.forward = lambda sample: {"latent_sample": vae_encoder.encode(x=sample)["latent_dist"].sample()}
960+
vae_encoder.forward = lambda sample: {"latent_parameters": vae_encoder.encode(x=sample)["latent_dist"].parameters}
958961
vae_config_constructor = TasksManager.get_exporter_config_constructor(
959962
model=vae_encoder,
960963
exporter=exporter,
@@ -1008,4 +1011,4 @@ def get_diffusion_models_for_export_ext(
10081011
export_config = export_config_constructor(text_encoder_3.config, int_dtype=int_dtype, float_dtype=float_dtype)
10091012
models_for_export["text_encoder_3"] = (text_encoder_3, export_config)
10101013

1011-
return None, models_for_export, False
1014+
return None, models_for_export

optimum/exporters/openvino/model_configs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
MistralOnnxConfig,
3535
MPTOnnxConfig,
3636
PhiOnnxConfig,
37+
UNetOnnxConfig,
3738
VisionOnnxConfig,
3839
)
3940
from optimum.exporters.tasks import TasksManager
@@ -1524,7 +1525,6 @@ def patch_model_for_export(
15241525
return InternVLChatImageEmbeddingModelPatcher(self, model, model_kwargs)
15251526

15261527

1527-
15281528
class PooledProjectionsDummyInputGenerator(DummyInputGenerator):
15291529
SUPPORTED_INPUT_NAMES = "pooled_projection"
15301530

0 commit comments

Comments
 (0)