diff --git a/examples/community/imagic_stable_diffusion.py b/examples/community/imagic_stable_diffusion.py index f044a1f568..2488675f59 100644 --- a/examples/community/imagic_stable_diffusion.py +++ b/examples/community/imagic_stable_diffusion.py @@ -185,7 +185,7 @@ class ImagicStableDiffusionPipeline(DiffusionPipeline): (nsfw) content, according to the `safety_checker`. """ message = "Please use `image` instead of `init_image`." - init_image = deprecate("init_image", "0.12.0", message, take_from=kwargs) + init_image = deprecate("init_image", "0.13.0", message, take_from=kwargs) image = init_image or image accelerator = Accelerator( diff --git a/examples/community/lpw_stable_diffusion.py b/examples/community/lpw_stable_diffusion.py index 7eb9c2a0a0..90a33074bf 100644 --- a/examples/community/lpw_stable_diffusion.py +++ b/examples/community/lpw_stable_diffusion.py @@ -759,7 +759,7 @@ class StableDiffusionLongPromptWeightingPipeline(StableDiffusionPipeline): (nsfw) content, according to the `safety_checker`. """ message = "Please use `image` instead of `init_image`." - init_image = deprecate("init_image", "0.12.0", message, take_from=kwargs) + init_image = deprecate("init_image", "0.13.0", message, take_from=kwargs) image = init_image or image # 0. Default height and width to unet diff --git a/examples/community/lpw_stable_diffusion_onnx.py b/examples/community/lpw_stable_diffusion_onnx.py index 22403132d4..58165dbd2a 100644 --- a/examples/community/lpw_stable_diffusion_onnx.py +++ b/examples/community/lpw_stable_diffusion_onnx.py @@ -746,7 +746,7 @@ class OnnxStableDiffusionLongPromptWeightingPipeline(OnnxStableDiffusionPipeline (nsfw) content, according to the `safety_checker`. """ message = "Please use `image` instead of `init_image`." - init_image = deprecate("init_image", "0.12.0", message, take_from=kwargs) + init_image = deprecate("init_image", "0.13.0", message, take_from=kwargs) image = init_image or image # 0. Default height and width to unet diff --git a/setup.py b/setup.py index 00f54f5246..248d2035b8 100644 --- a/setup.py +++ b/setup.py @@ -218,7 +218,7 @@ install_requires = [ setup( name="diffusers", - version="0.11.0", # expected format is one of x.y.z.dev0, or x.y.z.rc1 or x.y.z (no to dashes, yes to dots) + version="0.12.0.dev0", # expected format is one of x.y.z.dev0, or x.y.z.rc1 or x.y.z (no to dashes, yes to dots) description="Diffusers", long_description=open("README.md", "r", encoding="utf-8").read(), long_description_content_type="text/markdown", diff --git a/src/diffusers/__init__.py b/src/diffusers/__init__.py index 0cdd4d79c3..a357d3e948 100644 --- a/src/diffusers/__init__.py +++ b/src/diffusers/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.11.0" +__version__ = "0.12.0.dev0" from .configuration_utils import ConfigMixin from .onnx_utils import OnnxRuntimeModel diff --git a/src/diffusers/pipelines/alt_diffusion/pipeline_alt_diffusion_img2img.py b/src/diffusers/pipelines/alt_diffusion/pipeline_alt_diffusion_img2img.py index 61ee352d70..79c29a98c3 100644 --- a/src/diffusers/pipelines/alt_diffusion/pipeline_alt_diffusion_img2img.py +++ b/src/diffusers/pipelines/alt_diffusion/pipeline_alt_diffusion_img2img.py @@ -523,7 +523,7 @@ class AltDiffusionImg2ImgPipeline(DiffusionPipeline): (nsfw) content, according to the `safety_checker`. """ message = "Please use `image` instead of `init_image`." - init_image = deprecate("init_image", "0.12.0", message, take_from=kwargs) + init_image = deprecate("init_image", "0.13.0", message, take_from=kwargs) image = init_image or image # 1. Check inputs diff --git a/src/diffusers/pipelines/ddim/pipeline_ddim.py b/src/diffusers/pipelines/ddim/pipeline_ddim.py index 5de093db69..a3d4b589e7 100644 --- a/src/diffusers/pipelines/ddim/pipeline_ddim.py +++ b/src/diffusers/pipelines/ddim/pipeline_ddim.py @@ -87,7 +87,7 @@ class DDIMPipeline(DiffusionPipeline): ) deprecate( "generator.device == 'cpu'", - "0.12.0", + "0.13.0", message, ) generator = None diff --git a/src/diffusers/pipelines/ddpm/pipeline_ddpm.py b/src/diffusers/pipelines/ddpm/pipeline_ddpm.py index 5af29b0b90..123b4f844c 100644 --- a/src/diffusers/pipelines/ddpm/pipeline_ddpm.py +++ b/src/diffusers/pipelines/ddpm/pipeline_ddpm.py @@ -73,7 +73,7 @@ class DDPMPipeline(DiffusionPipeline): "Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler =" " DDPMScheduler.from_pretrained(, prediction_type='epsilon')`." ) - predict_epsilon = deprecate("predict_epsilon", "0.12.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.13.0", message, take_from=kwargs) if predict_epsilon is not None: new_config = dict(self.scheduler.config) @@ -88,7 +88,7 @@ class DDPMPipeline(DiffusionPipeline): ) deprecate( "generator.device == 'cpu'", - "0.12.0", + "0.13.0", message, ) generator = None diff --git a/src/diffusers/pipelines/latent_diffusion/pipeline_latent_diffusion_superresolution.py b/src/diffusers/pipelines/latent_diffusion/pipeline_latent_diffusion_superresolution.py index 6ccb025c41..a97d18c9fe 100644 --- a/src/diffusers/pipelines/latent_diffusion/pipeline_latent_diffusion_superresolution.py +++ b/src/diffusers/pipelines/latent_diffusion/pipeline_latent_diffusion_superresolution.py @@ -103,7 +103,7 @@ class LDMSuperResolutionPipeline(DiffusionPipeline): generated images. """ message = "Please use `image` instead of `init_image`." - init_image = deprecate("init_image", "0.12.0", message, take_from=kwargs) + init_image = deprecate("init_image", "0.13.0", message, take_from=kwargs) image = init_image or image if isinstance(image, PIL.Image.Image): diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_cycle_diffusion.py b/src/diffusers/pipelines/stable_diffusion/pipeline_cycle_diffusion.py index db1155c665..3e8917bd32 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_cycle_diffusion.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_cycle_diffusion.py @@ -565,7 +565,7 @@ class CycleDiffusionPipeline(DiffusionPipeline): (nsfw) content, according to the `safety_checker`. """ message = "Please use `image` instead of `init_image`." - init_image = deprecate("init_image", "0.12.0", message, take_from=kwargs) + init_image = deprecate("init_image", "0.13.0", message, take_from=kwargs) image = init_image or image # 1. Check inputs diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_img2img.py b/src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_img2img.py index 96276d6f5e..71b5fdbbeb 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_img2img.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_img2img.py @@ -311,7 +311,7 @@ class OnnxStableDiffusionImg2ImgPipeline(DiffusionPipeline): (nsfw) content, according to the `safety_checker`. """ message = "Please use `image` instead of `init_image`." - init_image = deprecate("init_image", "0.12.0", message, take_from=kwargs) + init_image = deprecate("init_image", "0.13.0", message, take_from=kwargs) image = init_image or image if isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_inpaint_legacy.py b/src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_inpaint_legacy.py index 1b25f04d67..d32586febb 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_inpaint_legacy.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_inpaint_legacy.py @@ -303,7 +303,7 @@ class OnnxStableDiffusionInpaintPipelineLegacy(DiffusionPipeline): (nsfw) content, according to the `safety_checker`. """ message = "Please use `image` instead of `init_image`." - init_image = deprecate("init_image", "0.12.0", message, take_from=kwargs) + init_image = deprecate("init_image", "0.13.0", message, take_from=kwargs) image = init_image or image if isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py index d337b59c93..2a7def75fa 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py @@ -528,7 +528,7 @@ class StableDiffusionImg2ImgPipeline(DiffusionPipeline): (nsfw) content, according to the `safety_checker`. """ message = "Please use `image` instead of `init_image`." - init_image = deprecate("init_image", "0.12.0", message, take_from=kwargs) + init_image = deprecate("init_image", "0.13.0", message, take_from=kwargs) image = init_image or image # 1. Check inputs diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint_legacy.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint_legacy.py index 797c32c198..429e2da286 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint_legacy.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint_legacy.py @@ -502,7 +502,7 @@ class StableDiffusionInpaintPipelineLegacy(DiffusionPipeline): (nsfw) content, according to the `safety_checker`. """ message = "Please use `image` instead of `init_image`." - init_image = deprecate("init_image", "0.12.0", message, take_from=kwargs) + init_image = deprecate("init_image", "0.13.0", message, take_from=kwargs) image = init_image or image # 1. Check inputs diff --git a/src/diffusers/schedulers/scheduling_ddim.py b/src/diffusers/schedulers/scheduling_ddim.py index d15c47ccd6..70cf226548 100644 --- a/src/diffusers/schedulers/scheduling_ddim.py +++ b/src/diffusers/schedulers/scheduling_ddim.py @@ -134,7 +134,7 @@ class DDIMScheduler(SchedulerMixin, ConfigMixin): "Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler =" " DDIMScheduler.from_pretrained(, prediction_type='epsilon')`." ) - predict_epsilon = deprecate("predict_epsilon", "0.12.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.13.0", message, take_from=kwargs) if predict_epsilon is not None: self.register_to_config(prediction_type="epsilon" if predict_epsilon else "sample") diff --git a/src/diffusers/schedulers/scheduling_ddim_flax.py b/src/diffusers/schedulers/scheduling_ddim_flax.py index d6ebfb1a8e..a6f7eace26 100644 --- a/src/diffusers/schedulers/scheduling_ddim_flax.py +++ b/src/diffusers/schedulers/scheduling_ddim_flax.py @@ -138,7 +138,7 @@ class FlaxDDIMScheduler(FlaxSchedulerMixin, ConfigMixin): "Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler =" " FlaxDDIMScheduler.from_pretrained(, prediction_type='epsilon')`." ) - predict_epsilon = deprecate("predict_epsilon", "0.12.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.13.0", message, take_from=kwargs) if predict_epsilon is not None: self.register_to_config(prediction_type="epsilon" if predict_epsilon else "sample") diff --git a/src/diffusers/schedulers/scheduling_ddpm.py b/src/diffusers/schedulers/scheduling_ddpm.py index d3b135cb0a..86edcb441f 100644 --- a/src/diffusers/schedulers/scheduling_ddpm.py +++ b/src/diffusers/schedulers/scheduling_ddpm.py @@ -126,7 +126,7 @@ class DDPMScheduler(SchedulerMixin, ConfigMixin): "Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler =" " DDPMScheduler.from_pretrained(, prediction_type='epsilon')`." ) - predict_epsilon = deprecate("predict_epsilon", "0.12.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.13.0", message, take_from=kwargs) if predict_epsilon is not None: self.register_to_config(prediction_type="epsilon" if predict_epsilon else "sample") @@ -256,7 +256,7 @@ class DDPMScheduler(SchedulerMixin, ConfigMixin): "Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler =" " DDPMScheduler.from_pretrained(, prediction_type='epsilon')`." ) - predict_epsilon = deprecate("predict_epsilon", "0.12.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.13.0", message, take_from=kwargs) if predict_epsilon is not None: new_config = dict(self.config) new_config["prediction_type"] = "epsilon" if predict_epsilon else "sample" diff --git a/src/diffusers/schedulers/scheduling_ddpm_flax.py b/src/diffusers/schedulers/scheduling_ddpm_flax.py index f9925485c7..84186546ed 100644 --- a/src/diffusers/schedulers/scheduling_ddpm_flax.py +++ b/src/diffusers/schedulers/scheduling_ddpm_flax.py @@ -132,7 +132,7 @@ class FlaxDDPMScheduler(FlaxSchedulerMixin, ConfigMixin): "Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler =" " FlaxDDPMScheduler.from_pretrained(, prediction_type='epsilon')`." ) - predict_epsilon = deprecate("predict_epsilon", "0.12.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.13.0", message, take_from=kwargs) if predict_epsilon is not None: self.register_to_config(prediction_type="epsilon" if predict_epsilon else "sample") @@ -239,7 +239,7 @@ class FlaxDDPMScheduler(FlaxSchedulerMixin, ConfigMixin): "Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler =" " FlaxDDPMScheduler.from_pretrained(, prediction_type='epsilon')`." ) - predict_epsilon = deprecate("predict_epsilon", "0.12.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.13.0", message, take_from=kwargs) if predict_epsilon is not None: new_config = dict(self.config) new_config["prediction_type"] = "epsilon" if predict_epsilon else "sample" diff --git a/src/diffusers/schedulers/scheduling_dpmsolver_multistep.py b/src/diffusers/schedulers/scheduling_dpmsolver_multistep.py index bd8aa61f66..939e30c5f3 100644 --- a/src/diffusers/schedulers/scheduling_dpmsolver_multistep.py +++ b/src/diffusers/schedulers/scheduling_dpmsolver_multistep.py @@ -143,7 +143,7 @@ class DPMSolverMultistepScheduler(SchedulerMixin, ConfigMixin): "Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler =" " DPMSolverMultistepScheduler.from_pretrained(, prediction_type='epsilon')`." ) - predict_epsilon = deprecate("predict_epsilon", "0.12.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.13.0", message, take_from=kwargs) if predict_epsilon is not None: self.register_to_config(prediction_type="epsilon" if predict_epsilon else "sample") diff --git a/src/diffusers/schedulers/scheduling_dpmsolver_multistep_flax.py b/src/diffusers/schedulers/scheduling_dpmsolver_multistep_flax.py index 8b25febef9..6bf389fa67 100644 --- a/src/diffusers/schedulers/scheduling_dpmsolver_multistep_flax.py +++ b/src/diffusers/schedulers/scheduling_dpmsolver_multistep_flax.py @@ -177,7 +177,7 @@ class FlaxDPMSolverMultistepScheduler(FlaxSchedulerMixin, ConfigMixin): "Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler =" " FlaxDPMSolverMultistepScheduler.from_pretrained(, prediction_type='epsilon')`." ) - predict_epsilon = deprecate("predict_epsilon", "0.12.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.13.0", message, take_from=kwargs) if predict_epsilon is not None: self.register_to_config(prediction_type="epsilon" if predict_epsilon else "sample") diff --git a/tests/pipelines/ddpm/test_ddpm.py b/tests/pipelines/ddpm/test_ddpm.py index e642f7852a..4652048d1a 100644 --- a/tests/pipelines/ddpm/test_ddpm.py +++ b/tests/pipelines/ddpm/test_ddpm.py @@ -67,7 +67,7 @@ class DDPMPipelineFastTests(unittest.TestCase): assert np.abs(image_from_tuple_slice.flatten() - expected_slice).max() < 1e-2 def test_inference_deprecated_predict_epsilon(self): - deprecate("remove this test", "0.12.0", "remove") + deprecate("remove this test", "0.13.0", "remove") unet = self.dummy_uncond_unet scheduler = DDPMScheduler(predict_epsilon=False) diff --git a/tests/test_config.py b/tests/test_config.py index bb01f2734a..1f8ef55abc 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -203,7 +203,7 @@ class ConfigTester(unittest.TestCase): ddpm_2 = DDPMScheduler.from_pretrained("google/ddpm-celebahq-256", beta_start=88) with CaptureLogger(logger) as cap_logger: - deprecate("remove this case", "0.12.0", "remove") + deprecate("remove this case", "0.13.0", "remove") ddpm_3 = DDPMScheduler.from_pretrained( "hf-internal-testing/tiny-stable-diffusion-torch", subfolder="scheduler", diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py index 8b27ab52e0..705a429bbc 100755 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -643,12 +643,12 @@ class DDPMSchedulerTest(SchedulerCommonTest): self.check_over_configs(prediction_type=prediction_type) def test_deprecated_predict_epsilon(self): - deprecate("remove this test", "0.12.0", "remove") + deprecate("remove this test", "0.13.0", "remove") for predict_epsilon in [True, False]: self.check_over_configs(predict_epsilon=predict_epsilon) def test_deprecated_epsilon(self): - deprecate("remove this test", "0.12.0", "remove") + deprecate("remove this test", "0.13.0", "remove") scheduler_class = self.scheduler_classes[0] scheduler_config = self.get_scheduler_config() diff --git a/tests/test_scheduler_flax.py b/tests/test_scheduler_flax.py index eb6981048a..40227c9ac4 100644 --- a/tests/test_scheduler_flax.py +++ b/tests/test_scheduler_flax.py @@ -626,12 +626,12 @@ class FlaxDDIMSchedulerTest(FlaxSchedulerCommonTest): self.check_over_configs(prediction_type=prediction_type) def test_deprecated_predict_epsilon(self): - deprecate("remove this test", "0.12.0", "remove") + deprecate("remove this test", "0.13.0", "remove") for predict_epsilon in [True, False]: self.check_over_configs(predict_epsilon=predict_epsilon) def test_deprecated_predict_epsilon_to_prediction_type(self): - deprecate("remove this test", "0.12.0", "remove") + deprecate("remove this test", "0.13.0", "remove") for scheduler_class in self.scheduler_classes: scheduler_config = self.get_scheduler_config(predict_epsilon=True) scheduler = scheduler_class.from_config(scheduler_config)