fix circular imports

Author: eaidova

optimum/exporters/openvino/__main__.py

@@ -27,10 +27,11 @@
 from optimum.utils import DEFAULT_DUMMY_SHAPES
 from optimum.utils.save_utils import maybe_save_preprocessors
 
-from ...intel.openvino.utils import OV_XML_FILE_NAME
 from .convert import export_models
 
 
+OV_XML_FILE_NAME = "openvino_model.xml"
+
 logger = logging.getLogger(__name__)
 
 if is_torch_available():
@@ -219,6 +220,7 @@ def main_export(
         custom_onnx_configs=custom_onnx_configs if custom_onnx_configs is not None else {},
         custom_architecture=custom_architecture,
         fn_get_submodels=fn_get_submodels,
+        _variant="default",
     )
 
     if not is_stable_diffusion:

optimum/exporters/openvino/convert.py

@@ -30,8 +30,8 @@
 from optimum.exporters.onnx.convert import export_tensorflow as export_tensorflow_onnx
 from optimum.utils import is_diffusers_available
 
-from ...intel.openvino.utils import OV_XML_FILE_NAME
 from .utils import (
+    OV_XML_FILE_NAME,
     clear_class_registry,
     flattenize_inputs,
     get_input_shapes,

optimum/exporters/openvino/utils.py

@@ -29,6 +29,9 @@
     from diffusers import ModelMixin
 
 
+OV_XML_FILE_NAME = "openvino_model.xml"
+
+
 def is_torch_model(model: Union["PreTrainedModel", "ModelMixin"]):
     """
     Checks whether the model is a torch model.

optimum/intel/utils/modeling_utils.py

@@ -102,7 +102,7 @@ def patch_decoder_attention_mask(model: "PreTrainedModel"):
     Returns:
         model with applied patch
     """
-    if model.config.model_type == "bloom":
+    if model.config.model_type in {"bloom", "mpt"}:
         model.transformer._prepare_attn_mask = _prepare_attn_mask
     elif model.config.model_type == "llama":
         model.model._prepare_decoder_attention_mask = _prepare_decoder_attention_mask