Skip to content

Commit ff1f987

Browse files
sayakpaulsayakpaul
authored
Merge branch 'main' into fix-lfs-pointer-problems
2 parents b510083 + 6abf752 commit ff1f987

18 files changed

Lines changed: 39 additions & 39 deletions

‎src/diffusers/models/attention_flax.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class FlaxAttention(nn.Module):
157157

158158
def setup(self):
159159
logger.warning(
160-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
160+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
161161
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
162162
)
163163

@@ -288,7 +288,7 @@ class FlaxBasicTransformerBlock(nn.Module):
288288

289289
def setup(self):
290290
logger.warning(
291-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
291+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
292292
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
293293
)
294294

@@ -381,7 +381,7 @@ class FlaxTransformer2DModel(nn.Module):
381381

382382
def setup(self):
383383
logger.warning(
384-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
384+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
385385
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
386386
)
387387

@@ -475,7 +475,7 @@ class FlaxFeedForward(nn.Module):
475475

476476
def setup(self):
477477
logger.warning(
478-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
478+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
479479
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
480480
)
481481

@@ -510,7 +510,7 @@ class FlaxGEGLU(nn.Module):
510510

511511
def setup(self):
512512
logger.warning(
513-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
513+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
514514
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
515515
)
516516

‎src/diffusers/models/controlnets/controlnet_flax.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class FlaxControlNetConditioningEmbedding(nn.Module):
5252

5353
def setup(self) -> None:
5454
logger.warning(
55-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
55+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
5656
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
5757
)
5858

@@ -191,7 +191,7 @@ def init_weights(self, rng: jax.Array) -> FrozenDict:
191191

192192
def setup(self) -> None:
193193
logger.warning(
194-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
194+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
195195
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
196196
)
197197

‎src/diffusers/models/embeddings_flax.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class FlaxTimestepEmbedding(nn.Module):
8282
"""
8383

8484
logger.warning(
85-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
85+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
8686
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
8787
)
8888

@@ -115,7 +115,7 @@ class FlaxTimesteps(nn.Module):
115115
freq_shift: float = 1
116116

117117
logger.warning(
118-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
118+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
119119
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
120120
)
121121

‎src/diffusers/models/modeling_flax_utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ def from_pretrained(
285285
```
286286
"""
287287
logger.warning(
288-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
288+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
289289
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
290290
)
291291
config = kwargs.pop("config", None)

‎src/diffusers/models/resnet_flax.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class FlaxUpsample2D(nn.Module):
2727

2828
def setup(self):
2929
logger.warning(
30-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
30+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
3131
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
3232
)
3333

@@ -56,7 +56,7 @@ class FlaxDownsample2D(nn.Module):
5656

5757
def setup(self):
5858
logger.warning(
59-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
59+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
6060
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
6161
)
6262

@@ -84,7 +84,7 @@ class FlaxResnetBlock2D(nn.Module):
8484

8585
def setup(self):
8686
logger.warning(
87-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
87+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
8888
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
8989
)
9090

‎src/diffusers/models/unets/unet_2d_blocks_flax.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class FlaxCrossAttnDownBlock2D(nn.Module):
6565

6666
def setup(self):
6767
logger.warning(
68-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
68+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
6969
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
7070
)
7171

@@ -145,7 +145,7 @@ class FlaxDownBlock2D(nn.Module):
145145

146146
def setup(self):
147147
logger.warning(
148-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
148+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
149149
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
150150
)
151151

@@ -223,7 +223,7 @@ class FlaxCrossAttnUpBlock2D(nn.Module):
223223

224224
def setup(self):
225225
logger.warning(
226-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
226+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
227227
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
228228
)
229229

@@ -308,7 +308,7 @@ class FlaxUpBlock2D(nn.Module):
308308

309309
def setup(self):
310310
logger.warning(
311-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
311+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
312312
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
313313
)
314314

@@ -381,7 +381,7 @@ class FlaxUNetMidBlock2DCrossAttn(nn.Module):
381381

382382
def setup(self):
383383
logger.warning(
384-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
384+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
385385
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
386386
)
387387

‎src/diffusers/models/unets/unet_2d_condition_flax.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def init_weights(self, rng: jax.Array) -> FrozenDict:
166166

167167
def setup(self) -> None:
168168
logger.warning(
169-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
169+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
170170
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
171171
)
172172

‎src/diffusers/models/vae_flax.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class FlaxUpsample2D(nn.Module):
7676

7777
def setup(self):
7878
logger.warning(
79-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
79+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
8080
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
8181
)
8282
self.conv = nn.Conv(
@@ -114,7 +114,7 @@ class FlaxDownsample2D(nn.Module):
114114

115115
def setup(self):
116116
logger.warning(
117-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
117+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
118118
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
119119
)
120120

@@ -161,7 +161,7 @@ class FlaxResnetBlock2D(nn.Module):
161161

162162
def setup(self):
163163
logger.warning(
164-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
164+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
165165
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
166166
)
167167

@@ -238,7 +238,7 @@ class FlaxAttentionBlock(nn.Module):
238238

239239
def setup(self):
240240
logger.warning(
241-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
241+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
242242
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
243243
)
244244

@@ -324,7 +324,7 @@ class FlaxDownEncoderBlock2D(nn.Module):
324324

325325
def setup(self):
326326
logger.warning(
327-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
327+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
328328
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
329329
)
330330

@@ -386,7 +386,7 @@ class FlaxUpDecoderBlock2D(nn.Module):
386386

387387
def setup(self):
388388
logger.warning(
389-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
389+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
390390
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
391391
)
392392

@@ -445,7 +445,7 @@ class FlaxUNetMidBlock2D(nn.Module):
445445

446446
def setup(self):
447447
logger.warning(
448-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
448+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
449449
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
450450
)
451451

@@ -541,7 +541,7 @@ class FlaxEncoder(nn.Module):
541541

542542
def setup(self):
543543
logger.warning(
544-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
544+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
545545
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
546546
)
547547

@@ -658,7 +658,7 @@ class FlaxDecoder(nn.Module):
658658

659659
def setup(self):
660660
logger.warning(
661-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
661+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
662662
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
663663
)
664664

@@ -835,7 +835,7 @@ class FlaxAutoencoderKL(nn.Module, FlaxModelMixin, ConfigMixin):
835835

836836
def setup(self):
837837
logger.warning(
838-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
838+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
839839
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
840840
)
841841

‎src/diffusers/pipelines/pipeline_flax_utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ def from_pretrained(cls, pretrained_model_name_or_path: str | os.PathLike | None
309309
```
310310
"""
311311
logger.warning(
312-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
312+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
313313
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
314314
)
315315

‎src/diffusers/schedulers/scheduling_ddim_flax.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def __init__(
129129
dtype: jnp.dtype = jnp.float32,
130130
):
131131
logger.warning(
132-
"Flax classes are deprecated and will be removed in Diffusers v1.0.0. We "
132+
"Flax classes are deprecated and will be removed in Diffusers v0.40.0. We "
133133
"recommend migrating to PyTorch classes or pinning your version of Diffusers."
134134
)
135135
self.dtype = dtype

0 commit comments

Comments
 (0)