Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add k_dpmpp_2_a and k_dpmpp_2 solvers options #1389

Merged
merged 11 commits into from
Nov 30, 2022
Merged

add k_dpmpp_2_a and k_dpmpp_2 solvers options #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
74b71fe
add k_dpmpp_2_a and k_dpmpp_2 solvers options
victorca25 Nov 5, 2022
3e2b818
Merge branch 'development' into dpmpp_test_dev
victorca25 Nov 5, 2022
a30f360
Merge branch 'development' into dpmpp_test_dev
victorca25 Nov 20, 2022
9db6185
Merge branch 'development' into dpmpp_test_dev
victorca25 Nov 22, 2022
ae86347
Merge branch 'development' into dpmpp_test_dev
victorca25 Nov 23, 2022
293b202
Merge branch 'development' into dpmpp_test_dev
victorca25 Nov 24, 2022
e3f2987
Merge branch 'development' into dpmpp_test_dev
victorca25 Nov 26, 2022
edae33e
Merge branch 'development' into dpmpp_test_dev
victorca25 Nov 27, 2022
f695fff
Merge branch 'development' into dpmpp_test_dev
lstein Nov 28, 2022
365613f
Merge branch 'development' into dpmpp_test_dev
lstein Nov 30, 2022
279299a
update frontend
lstein Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions backend/modules/parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"ddim",
"k_dpm_2_a",
"k_dpm_2",
"k_dpmpp_2_a",
"k_dpmpp_2",
"k_euler_a",
"k_euler",
"k_heun",
Expand Down
623 changes: 0 additions & 623 deletions frontend/dist/assets/index.2b7cd976.js
View file
Open in desktop

This file was deleted.

501 changes: 0 additions & 501 deletions frontend/dist/assets/index.678a45f6.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion frontend/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>InvokeAI - A Stable Diffusion Toolkit</title>
<link rel="shortcut icon" type="icon" href="./assets/favicon.0d253ced.ico" />
<script type="module" crossorigin src="./assets/index.2b7cd976.js"></script>
<script type="module" crossorigin src="./assets/index.f1b8da92.js"></script>
<link rel="stylesheet" href="./assets/index.f999e69e.css">
</head>

Expand Down
2 changes: 2 additions & 0 deletions frontend/src/app/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export const SAMPLERS: Array<string> = [
'k_lms',
'k_dpm_2',
'k_dpm_2_a',
'k_dpmpp_2',
'k_dpmpp_2_a',
'k_euler',
'k_euler_a',
'k_heun',
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/app/invokeai.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export declare type CommonGeneratedImageMetadata = {
| 'ddim'
| 'k_dpm_2_a'
| 'k_dpm_2'
| 'k_dpmpp_2_a'
| 'k_dpmpp_2'
| 'k_euler_a'
| 'k_euler'
| 'k_heun'
Expand Down
6 changes: 5 additions & 1 deletion ldm/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def new_func(*args, **kw):
safety_checker:bool = activate safety checker [False]

# this value is sticky and maintained between generation calls
sampler_name:str = ['ddim', 'k_dpm_2_a', 'k_dpm_2', 'k_euler_a', 'k_euler', 'k_heun', 'k_lms', 'plms'] // k_lms
sampler_name:str = ['ddim', 'k_dpm_2_a', 'k_dpm_2', 'k_dpmpp_2', 'k_dpmpp_2_a', 'k_euler_a', 'k_euler', 'k_heun', 'k_lms', 'plms'] // k_lms

# these are deprecated - use conf and model instead
weights = path to model weights ('models/ldm/stable-diffusion-v1/model.ckpt')
Expand Down Expand Up @@ -974,6 +974,10 @@ def _set_sampler(self):
self.sampler = KSampler(self.model, 'dpm_2_ancestral', device=self.device)
elif self.sampler_name == 'k_dpm_2':
self.sampler = KSampler(self.model, 'dpm_2', device=self.device)
elif self.sampler_name == 'k_dpmpp_2_a':
self.sampler = KSampler(self.model, 'dpmpp_2s_ancestral', device=self.device)
elif self.sampler_name == 'k_dpmpp_2':
self.sampler = KSampler(self.model, 'dpmpp_2m', device=self.device)
elif self.sampler_name == 'k_euler_a':
self.sampler = KSampler(self.model, 'euler_ancestral', device=self.device)
elif self.sampler_name == 'k_euler':
Expand Down
2 changes: 2 additions & 0 deletions ldm/invoke/args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@
'ddim',
'k_dpm_2_a',
'k_dpm_2',
'k_dpmpp_2_a',
'k_dpmpp_2',
'k_euler_a',
'k_euler',
'k_heun',
Expand Down
2 changes: 1 addition & 1 deletion ldm/models/diffusion/ddpm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,7 +1490,7 @@ def p_losses(self, x_start, cond, t, noise=None):
)
loss_dict.update({f'{prefix}/loss_simple': loss_simple.mean()})

logvar_t = self.logvar[t].to(self.device)
logvar_t = self.logvar[t.item()].to(self.device)
loss = loss_simple / torch.exp(logvar_t) + logvar_t
# loss = loss_simple / torch.exp(self.logvar) + self.logvar
if self.learn_logvar:
Expand Down
2 changes: 2 additions & 0 deletions scripts/legacy_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,8 @@ def write_log_message(results, log_path):
'ddim',
'k_dpm_2_a',
'k_dpm_2',
'k_dpmpp_2_a',
'k_dpmpp_2',
'k_euler_a',
'k_euler',
'k_heun',
Expand Down
2 changes: 2 additions & 0 deletions static/dream_web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ <h1>Stable Diffusion Dream Server</h1>
<option value="k_lms" selected>KLMS</option>
<option value="k_dpm_2">KDPM_2</option>
<option value="k_dpm_2_a">KDPM_2A</option>
<option value="k_dpmpp_2">KDPMPP_2</option>
<option value="k_dpmpp_2_a">KDPMPP_2A</option>
<option value="k_euler">KEULER</option>
<option value="k_euler_a">KEULER_A</option>
<option value="k_heun">KHEUN</option>
Expand Down
2 changes: 2 additions & 0 deletions static/legacy_web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ <h1>Stable Diffusion Dream Server</h1>
<option value="k_lms" selected>KLMS</option>
<option value="k_dpm_2">KDPM_2</option>
<option value="k_dpm_2_a">KDPM_2A</option>
<option value="k_dpmpp_2">KDPMPP_2</option>
<option value="k_dpmpp_2_a">KDPMPP_2A</option>
<option value="k_euler">KEULER</option>
<option value="k_euler_a">KEULER_A</option>
<option value="k_heun">KHEUN</option>
Expand Down