Skip to content

Commit b4e6a74

Browse files
patrickvonplatenpatrickvonplaten
committed
save intermediate
1 parent 1997b90 commit b4e6a74

7 files changed

Lines changed: 68 additions & 47 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ fixup: modified_only_fixup extra_style_checks autogenerate_code repo-consistency
7474
# Make marked copies of snippets of codes conform to the original
7575

7676
fix-copies:
77-
python utils/check_copies.py --fix_and_overwrite
7877
python utils/check_table.py --fix_and_overwrite
7978
python utils/check_dummies.py --fix_and_overwrite
79+
python utils/check_copies.py --fix_and_overwrite
8080

8181
# Run tests for the library
8282

‎src/diffusers/__init__.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
# flake8: noqa
22
# There's no way to ignore "F401 '...' imported but unused" warnings in this
33
# module, but to preserve other warnings. So, don't check this module at all.
4+
from .utils import is_transformers_available
45

56
__version__ = "0.0.4"
67

78
from .modeling_utils import ModelMixin
89
from .models.unet import UNetModel
9-
from .models.unet_glide import GLIDESuperResUNetModel, GLIDETextToImageUNetModel, GLIDEUNetModel
1010
from .models.unet_grad_tts import UNetGradTTSModel
1111
from .models.unet_ldm import UNetLDMModel
1212
from .pipeline_utils import DiffusionPipeline
1313
from .pipelines import BDDM, DDIM, DDPM, GLIDE, PNDM, GradTTS, LatentDiffusion
1414
from .schedulers import DDIMScheduler, DDPMScheduler, GradTTSScheduler, PNDMScheduler, SchedulerMixin
1515
from .schedulers.classifier_free_guidance import ClassifierFreeGuidanceScheduler
16+
17+
if is_transformers_available():
18+
from .models.unet_glide import GLIDESuperResUNetModel, GLIDETextToImageUNetModel, GLIDEUNetModel
19+
else:
20+
from .utils.dummy_transformers_objects import *

‎src/diffusers/pipelines/__init__.py‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
from .pipeline_ddim import DDIM
33
from .pipeline_ddpm import DDPM
44
from .pipeline_grad_tts import GradTTS
5-
6-
7-
try:
8-
from .pipeline_glide import GLIDE
9-
except (NameError, ImportError):
10-
11-
class GLIDE:
12-
pass
13-
14-
5+
from .pipeline_glide import GLIDE
156
from .pipeline_latent_diffusion import LatentDiffusion
167
from .pipeline_pndm import PNDM

‎src/diffusers/utils/__init__.py‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
#!/usr/bin/env python
2-
# coding=utf-8
3-
4-
# flake8: noqa
5-
# There's no way to ignore "F401 '...' imported but unused" warnings in this
6-
# module, but to preserve other warnings. So, don't check this module at all.
7-
8-
import os
9-
101
# Copyright 2021 The HuggingFace Inc. team. All rights reserved.
112
#
123
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +12,10 @@
2112
# See the License for the specific language governing permissions and
2213
# limitations under the License.
2314
from requests.exceptions import HTTPError
15+
import importlib
16+
import importlib_metadata
17+
import os
18+
from .logging import logger
2419

2520

2621
hf_cache_home = os.path.expanduser(
@@ -36,6 +31,18 @@
3631
HF_MODULES_CACHE = os.getenv("HF_MODULES_CACHE", os.path.join(hf_cache_home, "modules"))
3732

3833

34+
_transformers_available = importlib.util.find_spec("transformers") is not None
35+
try:
36+
_transformers_version = importlib_metadata.version("transformers")
37+
logger.debug(f"Successfully imported transformers version {_transformers_version}")
38+
except importlib_metadata.PackageNotFoundError:
39+
_transformers_available = False
40+
41+
42+
def is_transformers_available():
43+
return _transformers_available
44+
45+
3946
class RepositoryNotFoundError(HTTPError):
4047
"""
4148
Raised when trying to access a hf.co URL with an invalid repository name, or with a private repo name the user does

‎src/diffusers/utils/dummy_transformers_objects.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# This file is autogenerated by the command `make fix-copies`, do not edit.
2+
# flake8: noqa
3+
from ..utils import DummyObject, requires_backends
4+
5+
6+
class GLIDESuperResUNetModel(metaclass=DummyObject):
7+
_backends = ["transformers"]
8+
9+
def __init__(self, *args, **kwargs):
10+
requires_backends(self, ["transformers"])
11+
12+
13+
class GLIDETextToImageUNetModel(metaclass=DummyObject):
14+
_backends = ["transformers"]
15+
16+
def __init__(self, *args, **kwargs):
17+
requires_backends(self, ["transformers"])
18+
19+
20+
class GLIDEUNetModel(metaclass=DummyObject):
21+
_backends = ["transformers"]
22+
23+
def __init__(self, *args, **kwargs):
24+
requires_backends(self, ["transformers"])

‎utils/check_dummies.py‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
# All paths are set with the intent you should run this script from the root of the repo with the command
2222
# python utils/check_dummies.py
23-
PATH_TO_TRANSFORMERS = "src/transformers"
23+
PATH_TO_DIFFUSERS = "src/diffusers"
2424

2525
# Matches is_xxx_available()
26-
_re_backend = re.compile(r"is\_([a-z_]*)_available()")
26+
_re_backend = re.compile(r"if is\_([a-z_]*)_available\(\)")
2727
# Matches from xxx import bla
2828
_re_single_line_import = re.compile(r"\s+from\s+\S*\s+import\s+([^\(\s].*)\n")
2929
_re_test_backend = re.compile(r"^\s+if\s+not\s+is\_[a-z]*\_available\(\)")
@@ -50,36 +50,30 @@ def {0}(*args, **kwargs):
5050

5151
def find_backend(line):
5252
"""Find one (or multiple) backend in a code line of the init."""
53-
if _re_test_backend.search(line) is None:
53+
backends = _re_backend.findall(line)
54+
if len(backends) == 0:
5455
return None
55-
backends = [b[0] for b in _re_backend.findall(line)]
56-
backends.sort()
57-
return "_and_".join(backends)
56+
57+
return backends[0]
5858

5959

6060
def read_init():
6161
"""Read the init and extracts PyTorch, TensorFlow, SentencePiece and Tokenizers objects."""
62-
with open(os.path.join(PATH_TO_TRANSFORMERS, "__init__.py"), "r", encoding="utf-8", newline="\n") as f:
62+
with open(os.path.join(PATH_TO_DIFFUSERS, "__init__.py"), "r", encoding="utf-8", newline="\n") as f:
6363
lines = f.readlines()
6464

6565
# Get to the point we do the actual imports for type checking
6666
line_index = 0
67-
while not lines[line_index].startswith("if TYPE_CHECKING"):
68-
line_index += 1
69-
7067
backend_specific_objects = {}
7168
# Go through the end of the file
7269
while line_index < len(lines):
7370
# If the line is an if is_backend_available, we grab all objects associated.
7471
backend = find_backend(lines[line_index])
7572
if backend is not None:
76-
while not lines[line_index].startswith(" else:"):
77-
line_index += 1
78-
line_index += 1
79-
8073
objects = []
74+
line_index += 1
8175
# Until we unindent, add backend objects to the list
82-
while len(lines[line_index]) <= 1 or lines[line_index].startswith(" " * 8):
76+
while not lines[line_index].startswith("else:"):
8377
line = lines[line_index]
8478
single_line_import_search = _re_single_line_import.search(line)
8579
if single_line_import_search is not None:
@@ -129,7 +123,7 @@ def check_dummies(overwrite=False):
129123
short_names = {"torch": "pt"}
130124

131125
# Locate actual dummy modules and read their content.
132-
path = os.path.join(PATH_TO_TRANSFORMERS, "utils")
126+
path = os.path.join(PATH_TO_DIFFUSERS, "utils")
133127
dummy_file_paths = {
134128
backend: os.path.join(path, f"dummy_{short_names.get(backend, backend)}_objects.py")
135129
for backend in dummy_files.keys()
@@ -147,15 +141,15 @@ def check_dummies(overwrite=False):
147141
if dummy_files[backend] != actual_dummies[backend]:
148142
if overwrite:
149143
print(
150-
f"Updating transformers.utils.dummy_{short_names.get(backend, backend)}_objects.py as the main "
144+
f"Updating diffusers.utils.dummy_{short_names.get(backend, backend)}_objects.py as the main "
151145
"__init__ has new objects."
152146
)
153147
with open(dummy_file_paths[backend], "w", encoding="utf-8", newline="\n") as f:
154148
f.write(dummy_files[backend])
155149
else:
156150
raise ValueError(
157151
"The main __init__ has objects that are not present in "
158-
f"transformers.utils.dummy_{short_names.get(backend, backend)}_objects.py. Run `make fix-copies` "
152+
f"diffusers.utils.dummy_{short_names.get(backend, backend)}_objects.py. Run `make fix-copies` "
159153
"to fix this."
160154
)
161155

‎utils/check_table.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
# All paths are set with the intent you should run this script from the root of the repo with the command
2424
# python utils/check_table.py
25-
TRANSFORMERS_PATH = "src/transformers"
25+
TRANSFORMERS_PATH = "src/diffusers"
2626
PATH_TO_DOCS = "docs/source/en"
2727
REPO_PATH = "."
2828

@@ -62,13 +62,13 @@ def _find_text_in_file(filename, start_prompt, end_prompt):
6262
_re_pt_models = re.compile(r"(.*)(?:Model|Encoder|Decoder|ForConditionalGeneration)")
6363

6464

65-
# This is to make sure the transformers module imported is the one in the repo.
65+
# This is to make sure the diffusers module imported is the one in the repo.
6666
spec = importlib.util.spec_from_file_location(
67-
"transformers",
67+
"diffusers",
6868
os.path.join(TRANSFORMERS_PATH, "__init__.py"),
6969
submodule_search_locations=[TRANSFORMERS_PATH],
7070
)
71-
transformers_module = spec.loader.load_module()
71+
diffusers_module = spec.loader.load_module()
7272

7373

7474
# Thanks to https://stackoverflow.com/questions/29916065/how-to-do-camelcase-split-in-python
@@ -88,10 +88,10 @@ def _center_text(text, width):
8888
def get_model_table_from_auto_modules():
8989
"""Generates an up-to-date model table from the content of the auto modules."""
9090
# Dictionary model names to config.
91-
config_maping_names = transformers_module.models.auto.configuration_auto.CONFIG_MAPPING_NAMES
91+
config_maping_names = diffusers_module.models.auto.configuration_auto.CONFIG_MAPPING_NAMES
9292
model_name_to_config = {
9393
name: config_maping_names[code]
94-
for code, name in transformers_module.MODEL_NAMES_MAPPING.items()
94+
for code, name in diffusers_module.MODEL_NAMES_MAPPING.items()
9595
if code in config_maping_names
9696
}
9797
model_name_to_prefix = {name: config.replace("ConfigMixin", "") for name, config in model_name_to_config.items()}
@@ -103,8 +103,8 @@ def get_model_table_from_auto_modules():
103103
tf_models = collections.defaultdict(bool)
104104
flax_models = collections.defaultdict(bool)
105105

106-
# Let's lookup through all transformers object (once).
107-
for attr_name in dir(transformers_module):
106+
# Let's lookup through all diffusers object (once).
107+
for attr_name in dir(diffusers_module):
108108
lookup_dict = None
109109
if attr_name.endswith("Tokenizer"):
110110
lookup_dict = slow_tokenizers

0 commit comments

Comments
 (0)