fix tmp dir saving (#959)

huggingface · Oct 22, 2024 · 966c8c2 · 966c8c2
1 parent dcb49ea
commit 966c8c2
Show file tree

Hide file tree

Showing 14 changed files with 324 additions and 45 deletions.
diff --git a/optimum/exporters/openvino/convert.py b/optimum/exporters/openvino/convert.py
@@ -206,6 +206,7 @@ def export_tensorflow(
         ov_config=ov_config,
         library_name=library_name,
     )
+    del ov_model
     return input_names, output_names, True
 
 
@@ -268,6 +269,7 @@ def export_pytorch_via_onnx(
         ov_config=ov_config,
         library_name=library_name,
     )
+    del ov_model
     return input_names, output_names, True
 
 
@@ -442,6 +444,7 @@ def ts_patched_forward(*args, **kwargs):
             library_name=library_name,
         )
         clear_class_registry()
+        del ov_model
         del model
         gc.collect()
     return input_names, output_names, False

diff --git a/optimum/intel/openvino/modeling_base.py b/optimum/intel/openvino/modeling_base.py
@@ -16,7 +16,7 @@
 import os
 import warnings
 from pathlib import Path
-from tempfile import TemporaryDirectory, gettempdir
+from tempfile import gettempdir
 from typing import Dict, Optional, Union
 
 import openvino
@@ -41,6 +41,7 @@
     ONNX_WEIGHTS_NAME,
     OV_TO_PT_TYPE,
     OV_XML_FILE_NAME,
+    TemporaryDirectory,
     _print_compiled_model_properties,
     model_has_dynamic_inputs,
 )

diff --git a/optimum/intel/openvino/modeling_base_seq2seq.py b/optimum/intel/openvino/modeling_base_seq2seq.py
@@ -15,7 +15,6 @@
 import logging
 import os
 from pathlib import Path
-from tempfile import TemporaryDirectory
 from typing import Dict, Optional, Union
 
 import openvino
@@ -36,6 +35,7 @@
     OV_DECODER_NAME,
     OV_DECODER_WITH_PAST_NAME,
     OV_ENCODER_NAME,
+    TemporaryDirectory,
 )
 
 

diff --git a/optimum/intel/openvino/modeling_decoder.py b/optimum/intel/openvino/modeling_decoder.py
@@ -15,7 +15,6 @@
 import logging
 import os
 from pathlib import Path
-from tempfile import TemporaryDirectory
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Tuple, Union
 
 import numpy as np
@@ -50,6 +49,7 @@
     ONNX_WEIGHTS_NAME,
     OV_XML_FILE_NAME,
     STR_TO_OV_TYPE,
+    TemporaryDirectory,
     get_export_transformers_version,
     model_has_dynamic_inputs,
 )

diff --git a/optimum/intel/openvino/modeling_diffusion.py b/optimum/intel/openvino/modeling_diffusion.py
@@ -21,7 +21,7 @@
 from collections import OrderedDict
 from copy import deepcopy
 from pathlib import Path
-from tempfile import TemporaryDirectory, gettempdir
+from tempfile import gettempdir
 from typing import Any, Dict, Optional, Union
 
 import numpy as np
@@ -70,6 +70,7 @@
     ONNX_WEIGHTS_NAME,
     OV_TO_PT_TYPE,
     OV_XML_FILE_NAME,
+    TemporaryDirectory,
     _print_compiled_model_properties,
     model_has_dynamic_inputs,
     np_to_pt_generators,

diff --git a/optimum/intel/openvino/modeling_open_clip.py b/optimum/intel/openvino/modeling_open_clip.py
@@ -16,7 +16,6 @@
 import logging
 import os
 from pathlib import Path
-from tempfile import TemporaryDirectory
 from typing import Dict, Optional, Union
 
 import numpy as np
@@ -39,6 +38,7 @@
 from ..utils.modeling_utils import _find_files_matching_pattern, _OpenClipForZeroShotImageClassification
 from .configuration import OVConfig, OVWeightQuantizationConfig
 from .modeling import MODEL_START_DOCSTRING, OVModel
+from .utils import TemporaryDirectory
 
 
 logger = logging.getLogger(__name__)

diff --git a/optimum/intel/openvino/modeling_visual_language.py b/optimum/intel/openvino/modeling_visual_language.py
@@ -2,7 +2,6 @@
 import os
 import warnings
 from pathlib import Path
-from tempfile import TemporaryDirectory
 from typing import Dict, Optional, Tuple, Union
 
 import numpy as np
@@ -19,6 +18,7 @@
 from .configuration import OVConfig, OVWeightQuantizationConfig
 from .modeling_base import OVBaseModel, OVModelPart
 from .modeling_decoder import CausalLMOutputWithPast, OVModelForCausalLM
+from .utils import TemporaryDirectory
 
 
 logger = logging.getLogger(__name__)