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
80bc0c0c
Unverified
Commit
80bc0c0c
authored
Apr 11, 2023
by
Will Berman
Committed by
GitHub
Apr 11, 2023
Browse files
config fixes (#3060)
parent
091a0582
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
12 deletions
+15
-12
examples/community/sd_text2img_k_diffusion.py
examples/community/sd_text2img_k_diffusion.py
+1
-1
src/diffusers/pipelines/audio_diffusion/pipeline_audio_diffusion.py
...ers/pipelines/audio_diffusion/pipeline_audio_diffusion.py
+3
-3
src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_k_diffusion.py
...stable_diffusion/pipeline_stable_diffusion_k_diffusion.py
+1
-1
tests/pipelines/audio_diffusion/test_audio_diffusion.py
tests/pipelines/audio_diffusion/test_audio_diffusion.py
+10
-7
No files found.
examples/community/sd_text2img_k_diffusion.py
View file @
80bc0c0c
...
@@ -105,7 +105,7 @@ class StableDiffusionPipeline(DiffusionPipeline):
...
@@ -105,7 +105,7 @@ class StableDiffusionPipeline(DiffusionPipeline):
)
)
model
=
ModelWrapper
(
unet
,
scheduler
.
alphas_cumprod
)
model
=
ModelWrapper
(
unet
,
scheduler
.
alphas_cumprod
)
if
scheduler
.
prediction_type
==
"v_prediction"
:
if
scheduler
.
config
.
prediction_type
==
"v_prediction"
:
self
.
k_diffusion_model
=
CompVisVDenoiser
(
model
)
self
.
k_diffusion_model
=
CompVisVDenoiser
(
model
)
else
:
else
:
self
.
k_diffusion_model
=
CompVisDenoiser
(
model
)
self
.
k_diffusion_model
=
CompVisDenoiser
(
model
)
...
...
src/diffusers/pipelines/audio_diffusion/pipeline_audio_diffusion.py
View file @
80bc0c0c
...
@@ -60,9 +60,9 @@ class AudioDiffusionPipeline(DiffusionPipeline):
...
@@ -60,9 +60,9 @@ class AudioDiffusionPipeline(DiffusionPipeline):
input_module
=
self
.
vqvae
if
self
.
vqvae
is
not
None
else
self
.
unet
input_module
=
self
.
vqvae
if
self
.
vqvae
is
not
None
else
self
.
unet
# For backwards compatibility
# For backwards compatibility
sample_size
=
(
sample_size
=
(
(
input_module
.
sample_size
,
input_module
.
sample_size
)
(
input_module
.
config
.
sample_size
,
input_module
.
config
.
sample_size
)
if
type
(
input_module
.
sample_size
)
==
int
if
type
(
input_module
.
config
.
sample_size
)
==
int
else
input_module
.
sample_size
else
input_module
.
config
.
sample_size
)
)
return
sample_size
return
sample_size
...
...
src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_k_diffusion.py
View file @
80bc0c0c
...
@@ -113,7 +113,7 @@ class StableDiffusionKDiffusionPipeline(DiffusionPipeline, TextualInversionLoade
...
@@ -113,7 +113,7 @@ class StableDiffusionKDiffusionPipeline(DiffusionPipeline, TextualInversionLoade
self
.
vae_scale_factor
=
2
**
(
len
(
self
.
vae
.
config
.
block_out_channels
)
-
1
)
self
.
vae_scale_factor
=
2
**
(
len
(
self
.
vae
.
config
.
block_out_channels
)
-
1
)
model
=
ModelWrapper
(
unet
,
scheduler
.
alphas_cumprod
)
model
=
ModelWrapper
(
unet
,
scheduler
.
alphas_cumprod
)
if
scheduler
.
prediction_type
==
"v_prediction"
:
if
scheduler
.
config
.
prediction_type
==
"v_prediction"
:
self
.
k_diffusion_model
=
CompVisVDenoiser
(
model
)
self
.
k_diffusion_model
=
CompVisVDenoiser
(
model
)
else
:
else
:
self
.
k_diffusion_model
=
CompVisDenoiser
(
model
)
self
.
k_diffusion_model
=
CompVisDenoiser
(
model
)
...
...
tests/pipelines/audio_diffusion/test_audio_diffusion.py
View file @
80bc0c0c
...
@@ -115,8 +115,11 @@ class PipelineFastTests(unittest.TestCase):
...
@@ -115,8 +115,11 @@ class PipelineFastTests(unittest.TestCase):
output
=
pipe
(
generator
=
generator
,
steps
=
4
,
return_dict
=
False
)
output
=
pipe
(
generator
=
generator
,
steps
=
4
,
return_dict
=
False
)
image_from_tuple
=
output
[
0
][
0
]
image_from_tuple
=
output
[
0
][
0
]
assert
audio
.
shape
==
(
1
,
(
self
.
dummy_unet
.
sample_size
[
1
]
-
1
)
*
mel
.
hop_length
)
assert
audio
.
shape
==
(
1
,
(
self
.
dummy_unet
.
config
.
sample_size
[
1
]
-
1
)
*
mel
.
hop_length
)
assert
image
.
height
==
self
.
dummy_unet
.
sample_size
[
0
]
and
image
.
width
==
self
.
dummy_unet
.
sample_size
[
1
]
assert
(
image
.
height
==
self
.
dummy_unet
.
config
.
sample_size
[
0
]
and
image
.
width
==
self
.
dummy_unet
.
config
.
sample_size
[
1
]
)
image_slice
=
np
.
frombuffer
(
image
.
tobytes
(),
dtype
=
"uint8"
)[:
10
]
image_slice
=
np
.
frombuffer
(
image
.
tobytes
(),
dtype
=
"uint8"
)[:
10
]
image_from_tuple_slice
=
np
.
frombuffer
(
image_from_tuple
.
tobytes
(),
dtype
=
"uint8"
)[:
10
]
image_from_tuple_slice
=
np
.
frombuffer
(
image_from_tuple
.
tobytes
(),
dtype
=
"uint8"
)[:
10
]
expected_slice
=
np
.
array
([
69
,
255
,
255
,
255
,
0
,
0
,
77
,
181
,
12
,
127
])
expected_slice
=
np
.
array
([
69
,
255
,
255
,
255
,
0
,
0
,
77
,
181
,
12
,
127
])
...
@@ -133,14 +136,14 @@ class PipelineFastTests(unittest.TestCase):
...
@@ -133,14 +136,14 @@ class PipelineFastTests(unittest.TestCase):
pipe
.
set_progress_bar_config
(
disable
=
None
)
pipe
.
set_progress_bar_config
(
disable
=
None
)
np
.
random
.
seed
(
0
)
np
.
random
.
seed
(
0
)
raw_audio
=
np
.
random
.
uniform
(
-
1
,
1
,
((
dummy_vqvae_and_unet
[
0
].
sample_size
[
1
]
-
1
)
*
mel
.
hop_length
,))
raw_audio
=
np
.
random
.
uniform
(
-
1
,
1
,
((
dummy_vqvae_and_unet
[
0
].
config
.
sample_size
[
1
]
-
1
)
*
mel
.
hop_length
,))
generator
=
torch
.
Generator
(
device
=
device
).
manual_seed
(
42
)
generator
=
torch
.
Generator
(
device
=
device
).
manual_seed
(
42
)
output
=
pipe
(
raw_audio
=
raw_audio
,
generator
=
generator
,
start_step
=
5
,
steps
=
10
)
output
=
pipe
(
raw_audio
=
raw_audio
,
generator
=
generator
,
start_step
=
5
,
steps
=
10
)
image
=
output
.
images
[
0
]
image
=
output
.
images
[
0
]
assert
(
assert
(
image
.
height
==
self
.
dummy_vqvae_and_unet
[
0
].
sample_size
[
0
]
image
.
height
==
self
.
dummy_vqvae_and_unet
[
0
].
config
.
sample_size
[
0
]
and
image
.
width
==
self
.
dummy_vqvae_and_unet
[
0
].
sample_size
[
1
]
and
image
.
width
==
self
.
dummy_vqvae_and_unet
[
0
].
config
.
sample_size
[
1
]
)
)
image_slice
=
np
.
frombuffer
(
image
.
tobytes
(),
dtype
=
"uint8"
)[:
10
]
image_slice
=
np
.
frombuffer
(
image
.
tobytes
(),
dtype
=
"uint8"
)[:
10
]
expected_slice
=
np
.
array
([
120
,
117
,
110
,
109
,
138
,
167
,
138
,
148
,
132
,
121
])
expected_slice
=
np
.
array
([
120
,
117
,
110
,
109
,
138
,
167
,
138
,
148
,
132
,
121
])
...
@@ -183,8 +186,8 @@ class PipelineIntegrationTests(unittest.TestCase):
...
@@ -183,8 +186,8 @@ class PipelineIntegrationTests(unittest.TestCase):
audio
=
output
.
audios
[
0
]
audio
=
output
.
audios
[
0
]
image
=
output
.
images
[
0
]
image
=
output
.
images
[
0
]
assert
audio
.
shape
==
(
1
,
(
pipe
.
unet
.
sample_size
[
1
]
-
1
)
*
pipe
.
mel
.
hop_length
)
assert
audio
.
shape
==
(
1
,
(
pipe
.
unet
.
config
.
sample_size
[
1
]
-
1
)
*
pipe
.
mel
.
hop_length
)
assert
image
.
height
==
pipe
.
unet
.
sample_size
[
0
]
and
image
.
width
==
pipe
.
unet
.
sample_size
[
1
]
assert
image
.
height
==
pipe
.
unet
.
config
.
sample_size
[
0
]
and
image
.
width
==
pipe
.
unet
.
config
.
sample_size
[
1
]
image_slice
=
np
.
frombuffer
(
image
.
tobytes
(),
dtype
=
"uint8"
)[:
10
]
image_slice
=
np
.
frombuffer
(
image
.
tobytes
(),
dtype
=
"uint8"
)[:
10
]
expected_slice
=
np
.
array
([
151
,
167
,
154
,
144
,
122
,
134
,
121
,
105
,
70
,
26
])
expected_slice
=
np
.
array
([
151
,
167
,
154
,
144
,
122
,
134
,
121
,
105
,
70
,
26
])
...
...
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