Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
chenpangpang
diffusers
Commits
244e16a7
Unverified
Commit
244e16a7
authored
Dec 13, 2022
by
Patrick von Platen
Committed by
GitHub
Dec 13, 2022
Browse files
[Version] Bump to 0.11.0.dev0 (#1682)
upgrade version
parent
b345c74d
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
19 additions
and
19 deletions
+19
-19
setup.py
setup.py
+1
-1
src/diffusers/__init__.py
src/diffusers/__init__.py
+1
-1
src/diffusers/pipelines/ddim/pipeline_ddim.py
src/diffusers/pipelines/ddim/pipeline_ddim.py
+1
-1
src/diffusers/pipelines/ddpm/pipeline_ddpm.py
src/diffusers/pipelines/ddpm/pipeline_ddpm.py
+2
-2
src/diffusers/schedulers/scheduling_ddim.py
src/diffusers/schedulers/scheduling_ddim.py
+1
-1
src/diffusers/schedulers/scheduling_ddim_flax.py
src/diffusers/schedulers/scheduling_ddim_flax.py
+1
-1
src/diffusers/schedulers/scheduling_ddpm.py
src/diffusers/schedulers/scheduling_ddpm.py
+2
-2
src/diffusers/schedulers/scheduling_ddpm_flax.py
src/diffusers/schedulers/scheduling_ddpm_flax.py
+2
-2
src/diffusers/schedulers/scheduling_dpmsolver_multistep.py
src/diffusers/schedulers/scheduling_dpmsolver_multistep.py
+1
-1
src/diffusers/schedulers/scheduling_dpmsolver_multistep_flax.py
...ffusers/schedulers/scheduling_dpmsolver_multistep_flax.py
+1
-1
tests/pipelines/ddpm/test_ddpm.py
tests/pipelines/ddpm/test_ddpm.py
+1
-1
tests/test_config.py
tests/test_config.py
+1
-1
tests/test_scheduler.py
tests/test_scheduler.py
+2
-2
tests/test_scheduler_flax.py
tests/test_scheduler_flax.py
+2
-2
No files found.
setup.py
View file @
244e16a7
...
@@ -218,7 +218,7 @@ install_requires = [
...
@@ -218,7 +218,7 @@ install_requires = [
setup
(
setup
(
name
=
"diffusers"
,
name
=
"diffusers"
,
version
=
"0.1
0.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.1
1.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"
,
description
=
"Diffusers"
,
long_description
=
open
(
"README.md"
,
"r"
,
encoding
=
"utf-8"
).
read
(),
long_description
=
open
(
"README.md"
,
"r"
,
encoding
=
"utf-8"
).
read
(),
long_description_content_type
=
"text/markdown"
,
long_description_content_type
=
"text/markdown"
,
...
...
src/diffusers/__init__.py
View file @
244e16a7
__version__
=
"0.1
0.2
"
__version__
=
"0.1
1.0.dev0
"
from
.configuration_utils
import
ConfigMixin
from
.configuration_utils
import
ConfigMixin
from
.onnx_utils
import
OnnxRuntimeModel
from
.onnx_utils
import
OnnxRuntimeModel
...
...
src/diffusers/pipelines/ddim/pipeline_ddim.py
View file @
244e16a7
...
@@ -82,7 +82,7 @@ class DDIMPipeline(DiffusionPipeline):
...
@@ -82,7 +82,7 @@ class DDIMPipeline(DiffusionPipeline):
)
)
deprecate
(
deprecate
(
"generator.device == 'cpu'"
,
"generator.device == 'cpu'"
,
"0.1
1
.0"
,
"0.1
2
.0"
,
message
,
message
,
)
)
generator
=
None
generator
=
None
...
...
src/diffusers/pipelines/ddpm/pipeline_ddpm.py
View file @
244e16a7
...
@@ -73,7 +73,7 @@ class DDPMPipeline(DiffusionPipeline):
...
@@ -73,7 +73,7 @@ class DDPMPipeline(DiffusionPipeline):
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
" DDPMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
" DDPMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
)
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
1
.0"
,
message
,
take_from
=
kwargs
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
2
.0"
,
message
,
take_from
=
kwargs
)
if
predict_epsilon
is
not
None
:
if
predict_epsilon
is
not
None
:
new_config
=
dict
(
self
.
scheduler
.
config
)
new_config
=
dict
(
self
.
scheduler
.
config
)
...
@@ -88,7 +88,7 @@ class DDPMPipeline(DiffusionPipeline):
...
@@ -88,7 +88,7 @@ class DDPMPipeline(DiffusionPipeline):
)
)
deprecate
(
deprecate
(
"generator.device == 'cpu'"
,
"generator.device == 'cpu'"
,
"0.1
1
.0"
,
"0.1
2
.0"
,
message
,
message
,
)
)
generator
=
None
generator
=
None
...
...
src/diffusers/schedulers/scheduling_ddim.py
View file @
244e16a7
...
@@ -134,7 +134,7 @@ class DDIMScheduler(SchedulerMixin, ConfigMixin):
...
@@ -134,7 +134,7 @@ class DDIMScheduler(SchedulerMixin, ConfigMixin):
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
" DDIMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
" DDIMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
)
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
1
.0"
,
message
,
take_from
=
kwargs
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
2
.0"
,
message
,
take_from
=
kwargs
)
if
predict_epsilon
is
not
None
:
if
predict_epsilon
is
not
None
:
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
...
...
src/diffusers/schedulers/scheduling_ddim_flax.py
View file @
244e16a7
...
@@ -138,7 +138,7 @@ class FlaxDDIMScheduler(FlaxSchedulerMixin, ConfigMixin):
...
@@ -138,7 +138,7 @@ class FlaxDDIMScheduler(FlaxSchedulerMixin, ConfigMixin):
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
" FlaxDDIMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
" FlaxDDIMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
)
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
1
.0"
,
message
,
take_from
=
kwargs
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
2
.0"
,
message
,
take_from
=
kwargs
)
if
predict_epsilon
is
not
None
:
if
predict_epsilon
is
not
None
:
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
...
...
src/diffusers/schedulers/scheduling_ddpm.py
View file @
244e16a7
...
@@ -126,7 +126,7 @@ class DDPMScheduler(SchedulerMixin, ConfigMixin):
...
@@ -126,7 +126,7 @@ class DDPMScheduler(SchedulerMixin, ConfigMixin):
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
" DDPMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
" DDPMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
)
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
1
.0"
,
message
,
take_from
=
kwargs
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
2
.0"
,
message
,
take_from
=
kwargs
)
if
predict_epsilon
is
not
None
:
if
predict_epsilon
is
not
None
:
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
...
@@ -256,7 +256,7 @@ class DDPMScheduler(SchedulerMixin, ConfigMixin):
...
@@ -256,7 +256,7 @@ class DDPMScheduler(SchedulerMixin, ConfigMixin):
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
" DDPMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
" DDPMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
)
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
1
.0"
,
message
,
take_from
=
kwargs
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
2
.0"
,
message
,
take_from
=
kwargs
)
if
predict_epsilon
is
not
None
:
if
predict_epsilon
is
not
None
:
new_config
=
dict
(
self
.
config
)
new_config
=
dict
(
self
.
config
)
new_config
[
"prediction_type"
]
=
"epsilon"
if
predict_epsilon
else
"sample"
new_config
[
"prediction_type"
]
=
"epsilon"
if
predict_epsilon
else
"sample"
...
...
src/diffusers/schedulers/scheduling_ddpm_flax.py
View file @
244e16a7
...
@@ -132,7 +132,7 @@ class FlaxDDPMScheduler(FlaxSchedulerMixin, ConfigMixin):
...
@@ -132,7 +132,7 @@ class FlaxDDPMScheduler(FlaxSchedulerMixin, ConfigMixin):
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
" FlaxDDPMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
" FlaxDDPMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
)
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
1
.0"
,
message
,
take_from
=
kwargs
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
2
.0"
,
message
,
take_from
=
kwargs
)
if
predict_epsilon
is
not
None
:
if
predict_epsilon
is
not
None
:
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
...
@@ -239,7 +239,7 @@ class FlaxDDPMScheduler(FlaxSchedulerMixin, ConfigMixin):
...
@@ -239,7 +239,7 @@ class FlaxDDPMScheduler(FlaxSchedulerMixin, ConfigMixin):
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
" FlaxDDPMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
" FlaxDDPMScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
)
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
1
.0"
,
message
,
take_from
=
kwargs
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
2
.0"
,
message
,
take_from
=
kwargs
)
if
predict_epsilon
is
not
None
:
if
predict_epsilon
is
not
None
:
new_config
=
dict
(
self
.
config
)
new_config
=
dict
(
self
.
config
)
new_config
[
"prediction_type"
]
=
"epsilon"
if
predict_epsilon
else
"sample"
new_config
[
"prediction_type"
]
=
"epsilon"
if
predict_epsilon
else
"sample"
...
...
src/diffusers/schedulers/scheduling_dpmsolver_multistep.py
View file @
244e16a7
...
@@ -143,7 +143,7 @@ class DPMSolverMultistepScheduler(SchedulerMixin, ConfigMixin):
...
@@ -143,7 +143,7 @@ class DPMSolverMultistepScheduler(SchedulerMixin, ConfigMixin):
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
" DPMSolverMultistepScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
" DPMSolverMultistepScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
)
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
1
.0"
,
message
,
take_from
=
kwargs
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
2
.0"
,
message
,
take_from
=
kwargs
)
if
predict_epsilon
is
not
None
:
if
predict_epsilon
is
not
None
:
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
...
...
src/diffusers/schedulers/scheduling_dpmsolver_multistep_flax.py
View file @
244e16a7
...
@@ -177,7 +177,7 @@ class FlaxDPMSolverMultistepScheduler(FlaxSchedulerMixin, ConfigMixin):
...
@@ -177,7 +177,7 @@ class FlaxDPMSolverMultistepScheduler(FlaxSchedulerMixin, ConfigMixin):
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
"Please make sure to instantiate your scheduler with `prediction_type` instead. E.g. `scheduler ="
" FlaxDPMSolverMultistepScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
" FlaxDPMSolverMultistepScheduler.from_pretrained(<model_id>, prediction_type='epsilon')`."
)
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
1
.0"
,
message
,
take_from
=
kwargs
)
predict_epsilon
=
deprecate
(
"predict_epsilon"
,
"0.1
2
.0"
,
message
,
take_from
=
kwargs
)
if
predict_epsilon
is
not
None
:
if
predict_epsilon
is
not
None
:
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
self
.
register_to_config
(
prediction_type
=
"epsilon"
if
predict_epsilon
else
"sample"
)
...
...
tests/pipelines/ddpm/test_ddpm.py
View file @
244e16a7
...
@@ -67,7 +67,7 @@ class DDPMPipelineFastTests(unittest.TestCase):
...
@@ -67,7 +67,7 @@ class DDPMPipelineFastTests(unittest.TestCase):
assert
np
.
abs
(
image_from_tuple_slice
.
flatten
()
-
expected_slice
).
max
()
<
1e-2
assert
np
.
abs
(
image_from_tuple_slice
.
flatten
()
-
expected_slice
).
max
()
<
1e-2
def
test_inference_deprecated_predict_epsilon
(
self
):
def
test_inference_deprecated_predict_epsilon
(
self
):
deprecate
(
"remove this test"
,
"0.1
1
.0"
,
"remove"
)
deprecate
(
"remove this test"
,
"0.1
2
.0"
,
"remove"
)
unet
=
self
.
dummy_uncond_unet
unet
=
self
.
dummy_uncond_unet
scheduler
=
DDPMScheduler
(
predict_epsilon
=
False
)
scheduler
=
DDPMScheduler
(
predict_epsilon
=
False
)
...
...
tests/test_config.py
View file @
244e16a7
...
@@ -203,7 +203,7 @@ class ConfigTester(unittest.TestCase):
...
@@ -203,7 +203,7 @@ class ConfigTester(unittest.TestCase):
ddpm_2
=
DDPMScheduler
.
from_pretrained
(
"google/ddpm-celebahq-256"
,
beta_start
=
88
)
ddpm_2
=
DDPMScheduler
.
from_pretrained
(
"google/ddpm-celebahq-256"
,
beta_start
=
88
)
with
CaptureLogger
(
logger
)
as
cap_logger
:
with
CaptureLogger
(
logger
)
as
cap_logger
:
deprecate
(
"remove this case"
,
"0.1
1
.0"
,
"remove"
)
deprecate
(
"remove this case"
,
"0.1
2
.0"
,
"remove"
)
ddpm_3
=
DDPMScheduler
.
from_pretrained
(
ddpm_3
=
DDPMScheduler
.
from_pretrained
(
"hf-internal-testing/tiny-stable-diffusion-torch"
,
"hf-internal-testing/tiny-stable-diffusion-torch"
,
subfolder
=
"scheduler"
,
subfolder
=
"scheduler"
,
...
...
tests/test_scheduler.py
View file @
244e16a7
...
@@ -642,12 +642,12 @@ class DDPMSchedulerTest(SchedulerCommonTest):
...
@@ -642,12 +642,12 @@ class DDPMSchedulerTest(SchedulerCommonTest):
self
.
check_over_configs
(
prediction_type
=
prediction_type
)
self
.
check_over_configs
(
prediction_type
=
prediction_type
)
def
test_deprecated_predict_epsilon
(
self
):
def
test_deprecated_predict_epsilon
(
self
):
deprecate
(
"remove this test"
,
"0.1
1
.0"
,
"remove"
)
deprecate
(
"remove this test"
,
"0.1
2
.0"
,
"remove"
)
for
predict_epsilon
in
[
True
,
False
]:
for
predict_epsilon
in
[
True
,
False
]:
self
.
check_over_configs
(
predict_epsilon
=
predict_epsilon
)
self
.
check_over_configs
(
predict_epsilon
=
predict_epsilon
)
def
test_deprecated_epsilon
(
self
):
def
test_deprecated_epsilon
(
self
):
deprecate
(
"remove this test"
,
"0.1
1
.0"
,
"remove"
)
deprecate
(
"remove this test"
,
"0.1
2
.0"
,
"remove"
)
scheduler_class
=
self
.
scheduler_classes
[
0
]
scheduler_class
=
self
.
scheduler_classes
[
0
]
scheduler_config
=
self
.
get_scheduler_config
()
scheduler_config
=
self
.
get_scheduler_config
()
...
...
tests/test_scheduler_flax.py
View file @
244e16a7
...
@@ -626,12 +626,12 @@ class FlaxDDIMSchedulerTest(FlaxSchedulerCommonTest):
...
@@ -626,12 +626,12 @@ class FlaxDDIMSchedulerTest(FlaxSchedulerCommonTest):
self
.
check_over_configs
(
prediction_type
=
prediction_type
)
self
.
check_over_configs
(
prediction_type
=
prediction_type
)
def
test_deprecated_predict_epsilon
(
self
):
def
test_deprecated_predict_epsilon
(
self
):
deprecate
(
"remove this test"
,
"0.1
1
.0"
,
"remove"
)
deprecate
(
"remove this test"
,
"0.1
2
.0"
,
"remove"
)
for
predict_epsilon
in
[
True
,
False
]:
for
predict_epsilon
in
[
True
,
False
]:
self
.
check_over_configs
(
predict_epsilon
=
predict_epsilon
)
self
.
check_over_configs
(
predict_epsilon
=
predict_epsilon
)
def
test_deprecated_predict_epsilon_to_prediction_type
(
self
):
def
test_deprecated_predict_epsilon_to_prediction_type
(
self
):
deprecate
(
"remove this test"
,
"0.1
1
.0"
,
"remove"
)
deprecate
(
"remove this test"
,
"0.1
2
.0"
,
"remove"
)
for
scheduler_class
in
self
.
scheduler_classes
:
for
scheduler_class
in
self
.
scheduler_classes
:
scheduler_config
=
self
.
get_scheduler_config
(
predict_epsilon
=
True
)
scheduler_config
=
self
.
get_scheduler_config
(
predict_epsilon
=
True
)
scheduler
=
scheduler_class
.
from_config
(
scheduler_config
)
scheduler
=
scheduler_class
.
from_config
(
scheduler_config
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment