Patch for diffusers 0.21.0 release (#229)

* patch * remove experimental flag * raise import error * update dev version * replace diffusers check
huggingface · Sep 14, 2023 · 3d4186a · 3d4186a
1 parent d3a67fa
commit 3d4186a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/optimum/exporters/neuron/convert.py b/optimum/exporters/neuron/convert.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 """Neuron compiled model check and export functions."""
 import copy
-import os
 import time
 from collections import OrderedDict
 from pathlib import Path
@@ -438,10 +437,6 @@ def export_neuronx(
     else:
         compiler_args = ["--auto-cast", "none"]
 
-    # WARNING: Enabled experimental parallel compilation
-    compiler_args.extend(["--enable-experimental-O1"])
-    compiler_args.extend(["--num-parallel-jobs", str(os.cpu_count())])
-
     # diffusers specific
     compiler_args = add_stable_diffusion_compiler_args(config, compiler_args)
 

diff --git a/optimum/neuron/modeling_diffusion.py b/optimum/neuron/modeling_diffusion.py
@@ -32,8 +32,6 @@
 from ..exporters.tasks import TasksManager
 from ..utils import is_diffusers_available
 from .modeling_base import NeuronBaseModel
-from .pipelines.diffusers.pipeline_stable_diffusion import StableDiffusionPipelineMixin
-from .pipelines.diffusers.pipeline_stable_diffusion_xl import StableDiffusionXLPipelineMixin
 from .utils import (
     DIFFUSION_MODEL_TEXT_ENCODER_2_NAME,
     DIFFUSION_MODEL_TEXT_ENCODER_NAME,
@@ -61,6 +59,9 @@
     from diffusers.schedulers.scheduling_utils import SCHEDULER_CONFIG_NAME
     from diffusers.utils import CONFIG_NAME, is_invisible_watermark_available
 
+    from .pipelines.diffusers.pipeline_stable_diffusion import StableDiffusionPipelineMixin
+    from .pipelines.diffusers.pipeline_stable_diffusion_xl import StableDiffusionXLPipelineMixin
+
 
 if TYPE_CHECKING:
     from ..exporters.neuron import NeuronConfig

diff --git a/optimum/neuron/pipelines/diffusers/pipeline_stable_diffusion.py b/optimum/neuron/pipelines/diffusers/pipeline_stable_diffusion.py
@@ -22,7 +22,7 @@
 from diffusers.loaders import LoraLoaderMixin, TextualInversionLoaderMixin
 from diffusers.pipelines.stable_diffusion import StableDiffusionPipelineOutput
 from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion import rescale_noise_cfg
-from diffusers.utils import randn_tensor
+from diffusers.utils.torch_utils import randn_tensor
 
 
 logger = logging.getLogger(__name__)

diff --git a/optimum/neuron/pipelines/diffusers/pipeline_stable_diffusion_xl.py b/optimum/neuron/pipelines/diffusers/pipeline_stable_diffusion_xl.py
@@ -20,7 +20,7 @@
 from diffusers.loaders import LoraLoaderMixin, TextualInversionLoaderMixin
 from diffusers.pipelines.stable_diffusion_xl import StableDiffusionXLPipelineOutput
 from diffusers.pipelines.stable_diffusion_xl.pipeline_stable_diffusion_xl import rescale_noise_cfg
-from diffusers.utils import randn_tensor
+from diffusers.utils.torch_utils import randn_tensor
 
 
 logger = logging.getLogger(__name__)

diff --git a/optimum/neuron/version.py b/optimum/neuron/version.py
@@ -12,4 +12,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "0.0.11.dev0"
+__version__ = "0.0.12.dev0"