Unverified Commit a7ca03aa authored by Patrick von Platen's avatar Patrick von Platen Committed by GitHub
Browse files

Replace flake8 with ruff and update black (#2279)

* before running make style

* remove left overs from flake8

* finish

* make fix-copies

* final fix

* more fixes
parent f5ccffec
...@@ -21,7 +21,6 @@ from pathlib import Path ...@@ -21,7 +21,6 @@ from pathlib import Path
from typing import Optional, Union from typing import Optional, Union
import numpy as np import numpy as np
from huggingface_hub import hf_hub_download from huggingface_hub import hf_hub_download
from ..utils import ONNX_EXTERNAL_WEIGHTS_NAME, ONNX_WEIGHTS_NAME, is_onnx_available, logging from ..utils import ONNX_EXTERNAL_WEIGHTS_NAME, ONNX_WEIGHTS_NAME, is_onnx_available, logging
......
...@@ -2,7 +2,6 @@ from dataclasses import dataclass ...@@ -2,7 +2,6 @@ from dataclasses import dataclass
from typing import List, Optional, Union from typing import List, Optional, Union
import numpy as np import numpy as np
import PIL import PIL
from PIL import Image from PIL import Image
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
# limitations under the License. # limitations under the License.
import torch import torch
from torch import nn from torch import nn
from transformers import CLIPPreTrainedModel, CLIPVisionModel from transformers import CLIPPreTrainedModel, CLIPVisionModel
from ...models.attention import BasicTransformerBlock from ...models.attention import BasicTransformerBlock
......
...@@ -16,11 +16,11 @@ import inspect ...@@ -16,11 +16,11 @@ import inspect
from typing import Callable, List, Optional, Union from typing import Callable, List, Optional, Union
import numpy as np import numpy as np
import PIL
import torch import torch
from transformers import CLIPFeatureExtractor
import PIL
from diffusers.utils import is_accelerate_available from diffusers.utils import is_accelerate_available
from transformers import CLIPFeatureExtractor
from ...models import AutoencoderKL, UNet2DConditionModel from ...models import AutoencoderKL, UNet2DConditionModel
from ...schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler from ...schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler
......
...@@ -19,9 +19,8 @@ import inspect ...@@ -19,9 +19,8 @@ import inspect
import os import os
from typing import Any, Dict, List, Optional, Union from typing import Any, Dict, List, Optional, Union
import numpy as np
import flax import flax
import numpy as np
import PIL import PIL
from flax.core.frozen_dict import FrozenDict from flax.core.frozen_dict import FrozenDict
from huggingface_hub import snapshot_download from huggingface_hub import snapshot_download
......
...@@ -22,15 +22,15 @@ from pathlib import Path ...@@ -22,15 +22,15 @@ from pathlib import Path
from typing import Any, Callable, Dict, List, Optional, Union from typing import Any, Callable, Dict, List, Optional, Union
import numpy as np import numpy as np
import torch
import diffusers
import PIL import PIL
import torch
from huggingface_hub import model_info, snapshot_download from huggingface_hub import model_info, snapshot_download
from packaging import version from packaging import version
from PIL import Image from PIL import Image
from tqdm.auto import tqdm from tqdm.auto import tqdm
import diffusers
from ..configuration_utils import ConfigMixin from ..configuration_utils import ConfigMixin
from ..models.modeling_utils import _LOW_CPU_MEM_USAGE_DEFAULT from ..models.modeling_utils import _LOW_CPU_MEM_USAGE_DEFAULT
from ..schedulers.scheduling_utils import SCHEDULER_CONFIG_NAME from ..schedulers.scheduling_utils import SCHEDULER_CONFIG_NAME
......
# flake8: noqa
from .pipeline_pndm import PNDMPipeline from .pipeline_pndm import PNDMPipeline
...@@ -16,9 +16,8 @@ ...@@ -16,9 +16,8 @@
from typing import List, Optional, Tuple, Union from typing import List, Optional, Tuple, Union
import numpy as np import numpy as np
import torch
import PIL import PIL
import torch
from ...models import UNet2DModel from ...models import UNet2DModel
from ...schedulers import RePaintScheduler from ...schedulers import RePaintScheduler
......
# flake8: noqa
from .pipeline_score_sde_ve import ScoreSdeVePipeline from .pipeline_score_sde_ve import ScoreSdeVePipeline
...@@ -2,7 +2,6 @@ from dataclasses import dataclass ...@@ -2,7 +2,6 @@ from dataclasses import dataclass
from typing import List, Optional, Union from typing import List, Optional, Union
import numpy as np import numpy as np
import PIL import PIL
from PIL import Image from PIL import Image
......
...@@ -18,9 +18,10 @@ import os ...@@ -18,9 +18,10 @@ import os
import re import re
import tempfile import tempfile
import requests
import torch import torch
from transformers import AutoFeatureExtractor, BertTokenizerFast, CLIPTextModel, CLIPTokenizer, CLIPVisionConfig
import requests
from diffusers import ( from diffusers import (
AutoencoderKL, AutoencoderKL,
DDIMScheduler, DDIMScheduler,
...@@ -37,7 +38,6 @@ from diffusers import ( ...@@ -37,7 +38,6 @@ from diffusers import (
from diffusers.pipelines.latent_diffusion.pipeline_latent_diffusion import LDMBertConfig, LDMBertModel from diffusers.pipelines.latent_diffusion.pipeline_latent_diffusion import LDMBertConfig, LDMBertModel
from diffusers.pipelines.paint_by_example import PaintByExampleImageEncoder, PaintByExamplePipeline from diffusers.pipelines.paint_by_example import PaintByExampleImageEncoder, PaintByExamplePipeline
from diffusers.pipelines.stable_diffusion import StableDiffusionSafetyChecker from diffusers.pipelines.stable_diffusion import StableDiffusionSafetyChecker
from transformers import AutoFeatureExtractor, BertTokenizerFast, CLIPTextModel, CLIPTokenizer, CLIPVisionConfig
from ...utils import is_omegaconf_available, is_safetensors_available from ...utils import is_omegaconf_available, is_safetensors_available
from ...utils.import_utils import BACKENDS_MAPPING from ...utils.import_utils import BACKENDS_MAPPING
......
...@@ -16,13 +16,13 @@ import inspect ...@@ -16,13 +16,13 @@ import inspect
from typing import Callable, List, Optional, Union from typing import Callable, List, Optional, Union
import numpy as np import numpy as np
import torch
import PIL import PIL
from diffusers.utils import is_accelerate_available import torch
from packaging import version from packaging import version
from transformers import CLIPFeatureExtractor, CLIPTextModel, CLIPTokenizer from transformers import CLIPFeatureExtractor, CLIPTextModel, CLIPTokenizer
from diffusers.utils import is_accelerate_available
from ...configuration_utils import FrozenDict from ...configuration_utils import FrozenDict
from ...models import AutoencoderKL, UNet2DConditionModel from ...models import AutoencoderKL, UNet2DConditionModel
from ...schedulers import DDIMScheduler from ...schedulers import DDIMScheduler
......
...@@ -16,10 +16,9 @@ import warnings ...@@ -16,10 +16,9 @@ import warnings
from functools import partial from functools import partial
from typing import Dict, List, Optional, Union from typing import Dict, List, Optional, Union
import numpy as np
import jax import jax
import jax.numpy as jnp import jax.numpy as jnp
import numpy as np
from flax.core.frozen_dict import FrozenDict from flax.core.frozen_dict import FrozenDict
from flax.jax_utils import unreplicate from flax.jax_utils import unreplicate
from flax.training.common_utils import shard from flax.training.common_utils import shard
......
...@@ -16,10 +16,9 @@ import warnings ...@@ -16,10 +16,9 @@ import warnings
from functools import partial from functools import partial
from typing import Dict, List, Optional, Union from typing import Dict, List, Optional, Union
import numpy as np
import jax import jax
import jax.numpy as jnp import jax.numpy as jnp
import numpy as np
from flax.core.frozen_dict import FrozenDict from flax.core.frozen_dict import FrozenDict
from flax.jax_utils import unreplicate from flax.jax_utils import unreplicate
from flax.training.common_utils import shard from flax.training.common_utils import shard
......
...@@ -16,10 +16,9 @@ import warnings ...@@ -16,10 +16,9 @@ import warnings
from functools import partial from functools import partial
from typing import Dict, List, Optional, Union from typing import Dict, List, Optional, Union
import numpy as np
import jax import jax
import jax.numpy as jnp import jax.numpy as jnp
import numpy as np
from flax.core.frozen_dict import FrozenDict from flax.core.frozen_dict import FrozenDict
from flax.jax_utils import unreplicate from flax.jax_utils import unreplicate
from flax.training.common_utils import shard from flax.training.common_utils import shard
......
...@@ -17,7 +17,6 @@ from typing import Callable, List, Optional, Union ...@@ -17,7 +17,6 @@ from typing import Callable, List, Optional, Union
import numpy as np import numpy as np
import torch import torch
from transformers import CLIPFeatureExtractor, CLIPTokenizer from transformers import CLIPFeatureExtractor, CLIPTokenizer
from ...configuration_utils import FrozenDict from ...configuration_utils import FrozenDict
......
...@@ -16,9 +16,8 @@ import inspect ...@@ -16,9 +16,8 @@ import inspect
from typing import Callable, List, Optional, Union from typing import Callable, List, Optional, Union
import numpy as np import numpy as np
import torch
import PIL import PIL
import torch
from transformers import CLIPFeatureExtractor, CLIPTokenizer from transformers import CLIPFeatureExtractor, CLIPTokenizer
from ...configuration_utils import FrozenDict from ...configuration_utils import FrozenDict
......
...@@ -16,9 +16,8 @@ import inspect ...@@ -16,9 +16,8 @@ import inspect
from typing import Callable, List, Optional, Union from typing import Callable, List, Optional, Union
import numpy as np import numpy as np
import torch
import PIL import PIL
import torch
from transformers import CLIPFeatureExtractor, CLIPTokenizer from transformers import CLIPFeatureExtractor, CLIPTokenizer
from ...configuration_utils import FrozenDict from ...configuration_utils import FrozenDict
......
...@@ -2,9 +2,8 @@ import inspect ...@@ -2,9 +2,8 @@ import inspect
from typing import Callable, List, Optional, Union from typing import Callable, List, Optional, Union
import numpy as np import numpy as np
import torch
import PIL import PIL
import torch
from transformers import CLIPFeatureExtractor, CLIPTokenizer from transformers import CLIPFeatureExtractor, CLIPTokenizer
from ...configuration_utils import FrozenDict from ...configuration_utils import FrozenDict
......
...@@ -16,7 +16,6 @@ import inspect ...@@ -16,7 +16,6 @@ import inspect
from typing import Any, Callable, Dict, List, Optional, Union from typing import Any, Callable, Dict, List, Optional, Union
import torch import torch
from packaging import version from packaging import version
from transformers import CLIPFeatureExtractor, CLIPTextModel, CLIPTokenizer from transformers import CLIPFeatureExtractor, CLIPTextModel, CLIPTokenizer
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment