From 244e16a7abfabce9e606b950af349062df40e437 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Tue, 13 Dec 2022 13:51:36 +0100 Subject: [PATCH] [Version] Bump to 0.11.0.dev0 (#1682) upgrade version --- setup.py | 2 +- src/diffusers/__init__.py | 2 +- src/diffusers/pipelines/ddim/pipeline_ddim.py | 2 +- src/diffusers/pipelines/ddpm/pipeline_ddpm.py | 4 ++-- src/diffusers/schedulers/scheduling_ddim.py | 2 +- src/diffusers/schedulers/scheduling_ddim_flax.py | 2 +- src/diffusers/schedulers/scheduling_ddpm.py | 4 ++-- src/diffusers/schedulers/scheduling_ddpm_flax.py | 4 ++-- src/diffusers/schedulers/scheduling_dpmsolver_multistep.py | 2 +- .../schedulers/scheduling_dpmsolver_multistep_flax.py | 2 +- tests/pipelines/ddpm/test_ddpm.py | 2 +- tests/test_config.py | 2 +- tests/test_scheduler.py | 4 ++-- tests/test_scheduler_flax.py | 4 ++-- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/setup.py b/setup.py index 7b74d75372..f1aafd8565 100644 --- a/setup.py +++ b/setup.py @@ -218,7 +218,7 @@ install_requires = [ setup( name="diffusers", - version="0.10.2", # 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.11.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 5f028f4a00..a61024d9aa 100644 --- a/src/diffusers/__init__.py +++ b/src/diffusers/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.10.2" +__version__ = "0.11.0.dev0" from .configuration_utils import ConfigMixin from .onnx_utils import OnnxRuntimeModel diff --git a/src/diffusers/pipelines/ddim/pipeline_ddim.py b/src/diffusers/pipelines/ddim/pipeline_ddim.py index 873c7e97f0..f39f7f8d1f 100644 --- a/src/diffusers/pipelines/ddim/pipeline_ddim.py +++ b/src/diffusers/pipelines/ddim/pipeline_ddim.py @@ -82,7 +82,7 @@ class DDIMPipeline(DiffusionPipeline): ) deprecate( "generator.device == 'cpu'", - "0.11.0", + "0.12.0", message, ) generator = None diff --git a/src/diffusers/pipelines/ddpm/pipeline_ddpm.py b/src/diffusers/pipelines/ddpm/pipeline_ddpm.py index 114a38a5fe..191dbdfe43 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.11.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.12.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.11.0", + "0.12.0", message, ) generator = None diff --git a/src/diffusers/schedulers/scheduling_ddim.py b/src/diffusers/schedulers/scheduling_ddim.py index dd38bd63c2..d15c47ccd6 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.11.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.12.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 157321d468..d6ebfb1a8e 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.11.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.12.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 369db8b29e..d3b135cb0a 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.11.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.12.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.11.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.12.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 e716ea0aba..f9925485c7 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.11.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.12.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.11.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.12.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 b7d0838026..bd8aa61f66 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.11.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.12.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 a44070d1d2..8b25febef9 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.11.0", message, take_from=kwargs) + predict_epsilon = deprecate("predict_epsilon", "0.12.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 7d51cb37e0..e642f7852a 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.11.0", "remove") + deprecate("remove this test", "0.12.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 1aefbad4d1..bb01f2734a 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.11.0", "remove") + deprecate("remove this case", "0.12.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 efe1a3aa47..ba109bdf47 100755 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -642,12 +642,12 @@ class DDPMSchedulerTest(SchedulerCommonTest): self.check_over_configs(prediction_type=prediction_type) def test_deprecated_predict_epsilon(self): - deprecate("remove this test", "0.11.0", "remove") + deprecate("remove this test", "0.12.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.11.0", "remove") + deprecate("remove this test", "0.12.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 ac4f726e82..eb6981048a 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.11.0", "remove") + deprecate("remove this test", "0.12.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.11.0", "remove") + deprecate("remove this test", "0.12.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)