Skip to content

Commit 0abee08

Browse files
committed
sampler, and similar images in ui
1 parent 2a49a2b commit 0abee08

File tree

5 files changed

+199
-120
lines changed

5 files changed

+199
-120
lines changed

backends/stable_diffusion/diffusionbee_backend.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ def process_opt(d, generator):
132132
input_image=d['input_image'],
133133
tdict_path=tdict_path,
134134
mode=model_mode,
135+
scheduler=d['scheduler'],
135136
mask_image=d['mask_image'],
136137
input_image_strength=(float(d['img_strength'])),
137138
)
@@ -169,6 +170,7 @@ def callback(state="" , progress=-1):
169170

170171
default_d = { "W" : 512 , "H" : 512, "num_imgs":1 , "ddim_steps" : 25 ,
171172
"scale" : 7.5, "batch_size":1 , "input_image" : None, "img_strength": 0.5
173+
, "scheduler":"ddim"
172174
, "negative_prompt" : "" , "mask_image" : None, "model_id": 0 , "custom_model_path":None}
173175

174176

backends/stable_diffusion/stable_diffusion.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
else:
3939
from fake_interface import ModelInterface
4040

41-
# from diffusers import LMSDiscreteScheduler, PNDMScheduler, DDIMScheduler
4241
from schedulers.scheduling_ddim import DDIMScheduler
4342
from schedulers.scheduling_lms_discrete import LMSDiscreteScheduler
4443
from schedulers.scheduling_pndm import PNDMScheduler
@@ -357,8 +356,8 @@ def get_unet_out(self, sd_run):
357356
text_emb_combined = np.concatenate([sd_run.unconditional_context , sd_run.context ])
358357

359358
o = self.model.run_unet(unet_inp=latent_combined, time_emb=temb_combined, text_emb=text_emb_combined )
360-
sd_run.predicted_unconditional_latent = o[0:1]
361-
sd_run.predicted_latent = o[1:2]
359+
sd_run.predicted_unconditional_latent = o[0: o.shape[0]//2 ]
360+
sd_run.predicted_latent = o[o.shape[0]//2 :]
362361
else:
363362
sd_run.predicted_unconditional_latent = self.model.run_unet(unet_inp=latent_model_input, time_emb=t_emb, text_emb=sd_run.unconditional_context )
364363
sd_run.predicted_latent = self.model.run_unet(unet_inp=latent_model_input, time_emb=t_emb, text_emb=sd_run.context)

electron_app/src/components/History.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export default {
144144
145145
get_box_params_dict(box){
146146
let r = {};
147-
let vals = {"seed" : "Seed" , "guidence_scale" : "Scale" , "dif_steps":"Steps" , "inp_img_strength" : "Image Strength" , "img_w":"Img Width" , "img_h": "Img Height" , "negative_prompt" : "Negative Prompt" , "model_version":"model_version"}
147+
let vals = {"seed" : "Seed" , "guidence_scale" : "Scale" , "dif_steps":"Steps" , "inp_img_strength" : "Image Strength" , "img_w":"Img Width" , "img_h": "Img Height" , "negative_prompt" : "Negative Prompt" , "model_version":"model_version", "selected_sampler":"Sampler" , "use_soft_seed":"Similar Imgs"}
148148
for(let k in vals)
149149
if( box[k])
150150
r[vals[k]] = box[k];

electron_app/src/components/ImgGenerate.vue

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<div class="l_button button_medium button_colored" style="float:right ; " @click="generate_from_prompt">Generate</div>
2626

27-
<SDOptionsDropdown :options_model_values="this_object" :elements_hidden="[ 'inp_img_strength' ]"> </SDOptionsDropdown>
27+
<SDOptionsDropdown :options_model_values="this_object" :elements_extra="['sampler' , 'use_soft_seed']" :elements_hidden="[ 'inp_img_strength' ]"> </SDOptionsDropdown>
2828

2929
<div style="float:right; margin-top: -5px; " >
3030
<b-dropdown id="dropdown-form" variant="link" ref="dropdown" toggle-class="text-decoration-none" no-caret >
@@ -163,10 +163,12 @@ export default {
163163
backend_error : "",
164164
done_percentage : -1,
165165
is_stopping : false,
166+
use_soft_seed:"No",
166167
modifiers : require("../modifiers.json"),
167168
is_negative_prompt_avail : false,
168169
negative_prompt : "",
169-
selected_model : 'Default'
170+
selected_model : 'Default',
171+
selected_sampler : 'ddim',
170172
};
171173
172174
},
@@ -194,7 +196,8 @@ export default {
194196
scale : this.guidence_scale ,
195197
ddim_steps : this.dif_steps,
196198
num_imgs : this.num_imgs ,
197-
batch_size : this.batch_size
199+
batch_size : this.batch_size ,
200+
scheduler: this.selected_sampler,
198201
}
199202
200203
if(this.selected_model && this.selected_model != "Default" && this.app_state.app_data.custom_models[this.selected_model] ){
@@ -205,6 +208,9 @@ export default {
205208
if(this.is_negative_prompt_avail)
206209
params['negative_prompt'] = this.negative_prompt;
207210
211+
if(this.use_soft_seed == 'Yes')
212+
params['soft_seed'] = 1
213+
208214
let that = this;
209215
210216
if(this.prompt.trim() == ""){
@@ -226,7 +232,8 @@ export default {
226232
if(!(that.app_state.app_data.history[history_key])){
227233
let p = {
228234
"prompt":that.prompt , "seed": seed, "img_w":that.img_w , "img_h":that.img_h , "key":history_key , "imgs" : [],
229-
"guidence_scale" : that.guidence_scale , "dif_steps" : that.dif_steps
235+
"guidence_scale" : that.guidence_scale , "dif_steps" : that.dif_steps , "use_soft_seed" : that.use_soft_seed,
236+
"selected_sampler" : that.selected_sampler
230237
}
231238
if(that.stable_diffusion.model_version)
232239
p['model_version'] = that.stable_diffusion.model_version;
@@ -279,6 +286,7 @@ export default {
279286
Seed :this.computed_seed,
280287
Scale : this.guidence_scale ,
281288
Steps : this.dif_steps ,
289+
sampler_name : "bee" + this.selected_sampler,
282290
model_version: this.stable_diffusion.model_version
283291
}
284292
if(this.is_negative_prompt_avail)

0 commit comments

Comments
 (0)