Skip to content

Commit 47e1744

Browse files
stduhpfstduhpf
committed
server: use new naming convention
1 parent febe7b5 commit 47e1744

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

‎examples/server/frontend.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,12 @@ R"xxx(
288288
</div>
289289
<div class="line">
290290
<div class="input-group">
291-
<label for="vae_on_cpu">VAE on CPU:</label>
292-
<input type="checkbox" id="vae_on_cpu" class="param-input">
291+
<label for="keep_vae_on_cpu">VAE on CPU:</label>
292+
<input type="checkbox" id="keep_vae_on_cpu" class="param-input">
293293
</div>
294294
<div class="input-group">
295-
<label for="clip_on_cpu">Clip on CPU:</label>
296-
<input type="checkbox" id="clip_on_cpu" class="param-input">
295+
<label for="keep_clip_on_cpu">Clip on CPU:</label>
296+
<input type="checkbox" id="keep_clip_on_cpu" class="param-input">
297297
</div>
298298
</div>
299299
<div class="line">
@@ -581,8 +581,8 @@ R"xxx(
581581
document.getElementById('seed').value = data.generation_params.seed;
582582
document.getElementById('batch_count').value = data.generation_params.batch_count;
583583
document.getElementById('schedule_method').value = data.context_params.schedule;
584-
document.getElementById('vae_on_cpu').checked = data.context_params.vae_on_cpu;
585-
document.getElementById('clip_on_cpu').checked = data.context_params.clip_on_cpu;
584+
document.getElementById('keep_vae_on_cpu').checked = data.context_params.keep_vae_on_cpu;
585+
document.getElementById('keep_clip_on_cpu').checked = data.context_params.keep_clip_on_cpu;
586586
document.getElementById('vae_tiling').checked = data.context_params.vae_tiling;
587587
document.getElementById('tae_decode').checked = !(data.taesd_preview);
588588
if (data.generation_params.preview_method) {
@@ -620,8 +620,8 @@ R"xxx(
620620
const t5xxl = document.getElementById('t5xxl').value;
621621
const vae = document.getElementById('vae').value;
622622
const tae = document.getElementById('tae').value;
623-
const vae_on_cpu = document.getElementById('vae_on_cpu').checked;
624-
const clip_on_cpu = document.getElementById('clip_on_cpu').checked;
623+
const keep_vae_on_cpu = document.getElementById('keep_vae_on_cpu').checked;
624+
const keep_clip_on_cpu = document.getElementById('keep_clip_on_cpu').checked;
625625
const vae_tiling = document.getElementById('vae_tiling').checked;
626626
const tae_decode = document.getElementById('tae_decode').checked;
627627
const preview_mode = document.getElementById('preview_mode').value;
@@ -648,8 +648,8 @@ R"xxx(
648648
...(t5xxl && { t5xxl: t5xxl }),
649649
...(vae && { vae: vae }),
650650
...(tae && { tae: tae }),
651-
... { vae_on_cpu: vae_on_cpu },
652-
... { clip_on_cpu: clip_on_cpu },
651+
... { keep_vae_on_cpu: keep_vae_on_cpu },
652+
... { keep_clip_on_cpu: keep_clip_on_cpu },
653653
... { vae_tiling: vae_tiling },
654654
... { tae_decode: tae_decode },
655655
...(preview_mode && { preview_mode: preview_mode }),

‎examples/server/main.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct SDCtxParams {
4545
std::string vae_path;
4646
std::string taesd_path;
4747

48-
std::string controlnet_path;
48+
std::string control_net_path;
4949
std::string lora_model_dir;
5050
std::string embeddings_path;
5151
std::string stacked_id_embeddings_path;
@@ -59,9 +59,9 @@ struct SDCtxParams {
5959
rng_type_t rng_type = CUDA_RNG;
6060
schedule_t schedule = DEFAULT;
6161

62-
bool control_net_cpu = false;
63-
bool clip_on_cpu = false;
64-
bool vae_on_cpu = false;
62+
bool keep_control_net_on_cpu = false;
63+
bool keep_clip_on_cpu = false;
64+
bool keep_vae_on_cpu = false;
6565

6666
bool diffusion_flash_attn = false;
6767
};
@@ -135,7 +135,7 @@ void print_params(SDParams params) {
135135
printf(" diffusion_model_path: %s\n", params.ctxParams.diffusion_model_path.c_str());
136136
printf(" vae_path: %s\n", params.ctxParams.vae_path.c_str());
137137
printf(" taesd_path: %s\n", params.ctxParams.taesd_path.c_str());
138-
printf(" controlnet_path: %s\n", params.ctxParams.controlnet_path.c_str());
138+
printf(" control_net_path: %s\n", params.ctxParams.control_net_path.c_str());
139139
printf(" embeddings_path: %s\n", params.ctxParams.embeddings_path.c_str());
140140
printf(" stacked_id_embeddings_path: %s\n", params.ctxParams.stacked_id_embeddings_path.c_str());
141141
printf(" input_id_images_path: %s\n", params.input_id_images_path.c_str());
@@ -144,9 +144,9 @@ void print_params(SDParams params) {
144144
printf(" output_path: %s\n", params.output_path.c_str());
145145
printf(" init_img: %s\n", params.input_path.c_str());
146146
printf(" control_image: %s\n", params.control_image_path.c_str());
147-
printf(" clip on cpu: %s\n", params.ctxParams.clip_on_cpu ? "true" : "false");
148-
printf(" controlnet cpu: %s\n", params.ctxParams.control_net_cpu ? "true" : "false");
149-
printf(" vae decoder on cpu:%s\n", params.ctxParams.vae_on_cpu ? "true" : "false");
147+
printf(" clip on cpu: %s\n", params.ctxParams.keep_clip_on_cpu ? "true" : "false");
148+
printf(" control_net cpu: %s\n", params.ctxParams.keep_control_net_on_cpu ? "true" : "false");
149+
printf(" vae decoder on cpu:%s\n", params.ctxParams.keep_vae_on_cpu ? "true" : "false");
150150
printf(" diffusion flash attention:%s\n", params.ctxParams.diffusion_flash_attn ? "true" : "false");
151151
printf(" strength(control): %.2f\n", params.lastRequest.control_strength);
152152
printf(" prompt: %s\n", params.lastRequest.prompt.c_str());
@@ -224,7 +224,7 @@ void print_usage(int argc, const char* argv[]) {
224224
printf(" --diffusion-fa use flash attention in the diffusion model (for low vram)\n");
225225
printf(" Might lower quality, since it implies converting k and v to f16.\n");
226226
printf(" This might crash if it is not supported by the backend.\n");
227-
printf(" --control-net-cpu keep controlnet in cpu (for low vram)\n");
227+
printf(" --control-net-cpu keep control_net in cpu (for low vram)\n");
228228
printf(" --canny apply canny preprocessor (edge detection)\n");
229229
printf(" --color Colors the logging tags according to level\n");
230230
printf(" -v, --verbose print extra info\n");
@@ -291,7 +291,7 @@ void parse_args(int argc, const char** argv, SDParams& params) {
291291
invalid_arg = true;
292292
break;
293293
}
294-
params.ctxParams.controlnet_path = argv[i];
294+
params.ctxParams.control_net_path = argv[i];
295295
} else if (arg == "--upscale-model") {
296296
if (++i >= argc) {
297297
invalid_arg = true;
@@ -440,13 +440,13 @@ void parse_args(int argc, const char** argv, SDParams& params) {
440440
} else if (arg == "--vae-tiling") {
441441
params.ctxParams.vae_tiling = true;
442442
} else if (arg == "--control-net-cpu") {
443-
params.ctxParams.control_net_cpu = true;
443+
params.ctxParams.keep_control_net_on_cpu = true;
444444
} else if (arg == "--normalize-input") {
445445
params.lastRequest.normalize_input = true;
446446
} else if (arg == "--clip-on-cpu") {
447-
params.ctxParams.clip_on_cpu = true; // will slow down get_learned_condiotion but necessary for low MEM GPUs
447+
params.ctxParams.keep_clip_on_cpu = true; // will slow down get_learned_condiotion but necessary for low MEM GPUs
448448
} else if (arg == "--vae-on-cpu") {
449-
params.ctxParams.vae_on_cpu = true; // will slow down latent decoding but necessary for low MEM GPUs
449+
params.ctxParams.keep_vae_on_cpu = true; // will slow down latent decoding but necessary for low MEM GPUs
450450
} else if (arg == "--diffusion-fa") {
451451
params.ctxParams.diffusion_flash_attn = true; // can reduce MEM significantly
452452
} else if (arg == "-b" || arg == "--batch-count") {
@@ -819,17 +819,17 @@ bool parseJsonPrompt(std::string json_str, SDParams* params) {
819819
}
820820

821821
try {
822-
bool vae_cpu = payload["vae_on_cpu"];
823-
if (params->ctxParams.vae_on_cpu != vae_cpu) {
824-
params->ctxParams.vae_on_cpu = vae_cpu;
822+
bool vae_cpu = payload["keep_vae_on_cpu"];
823+
if (params->ctxParams.keep_vae_on_cpu != vae_cpu) {
824+
params->ctxParams.keep_vae_on_cpu = vae_cpu;
825825
updatectx = true;
826826
}
827827
} catch (...) {
828828
}
829829
try {
830-
bool clip_cpu = payload["clip_on_cpu"];
831-
if (params->ctxParams.clip_on_cpu != clip_cpu) {
832-
params->ctxParams.clip_on_cpu = clip_cpu;
830+
bool clip_cpu = payload["keep_clip_on_cpu"];
831+
if (params->ctxParams.keep_clip_on_cpu != clip_cpu) {
832+
params->ctxParams.keep_clip_on_cpu = clip_cpu;
833833
updatectx = true;
834834
}
835835
} catch (...) {
@@ -1140,7 +1140,7 @@ void start_server(SDParams params) {
11401140
params.ctxParams.diffusion_model_path.c_str(),
11411141
params.ctxParams.vae_path.c_str(),
11421142
params.ctxParams.taesd_path.c_str(),
1143-
params.ctxParams.controlnet_path.c_str(),
1143+
params.ctxParams.control_net_path.c_str(),
11441144
params.ctxParams.lora_model_dir.c_str(),
11451145
params.ctxParams.embeddings_path.c_str(),
11461146
params.ctxParams.stacked_id_embeddings_path.c_str(),
@@ -1151,9 +1151,9 @@ void start_server(SDParams params) {
11511151
params.ctxParams.wtype,
11521152
params.ctxParams.rng_type,
11531153
params.ctxParams.schedule,
1154-
params.ctxParams.clip_on_cpu,
1155-
params.ctxParams.control_net_cpu,
1156-
params.ctxParams.vae_on_cpu,
1154+
params.ctxParams.keep_clip_on_cpu,
1155+
params.ctxParams.keep_control_net_on_cpu,
1156+
params.ctxParams.keep_vae_on_cpu,
11571157
params.ctxParams.diffusion_flash_attn,
11581158
true, false, 1};
11591159
sd_ctx = new_sd_ctx(&sd_ctx_params);
@@ -1305,7 +1305,7 @@ void start_server(SDParams params) {
13051305
// context_params["t5xxl_path"] = params.ctxParams.t5xxl_path;
13061306
// context_params["diffusion_model_path"] = params.ctxParams.diffusion_model_path;
13071307
// context_params["vae_path"] = params.ctxParams.vae_path;
1308-
// context_params["controlnet_path"] = params.ctxParams.controlnet_path;
1308+
// context_params["control_net_path"] = params.ctxParams.control_net_path;
13091309
context_params["lora_model_dir"] = params.ctxParams.lora_model_dir;
13101310
// context_params["embeddings_path"] = params.ctxParams.embeddings_path;
13111311
// context_params["stacked_id_embeddings_path"] = params.ctxParams.stacked_id_embeddings_path;
@@ -1315,9 +1315,9 @@ void start_server(SDParams params) {
13151315
context_params["wtype"] = params.ctxParams.wtype;
13161316
context_params["rng_type"] = params.ctxParams.rng_type;
13171317
context_params["schedule"] = sd_schedule_name(params.ctxParams.schedule);
1318-
context_params["clip_on_cpu"] = params.ctxParams.clip_on_cpu;
1319-
context_params["control_net_cpu"] = params.ctxParams.control_net_cpu;
1320-
context_params["vae_on_cpu"] = params.ctxParams.vae_on_cpu;
1318+
context_params["keep_clip_on_cpu"] = params.ctxParams.keep_clip_on_cpu;
1319+
context_params["keep_control_net_on_cpu"] = params.ctxParams.keep_control_net_on_cpu;
1320+
context_params["keep_vae_on_cpu"] = params.ctxParams.keep_vae_on_cpu;
13211321
context_params["diffusion_flash_attn"] = params.ctxParams.diffusion_flash_attn;
13221322

13231323
// response["taesd_preview"] = params.taesd_preview;

0 commit comments

Comments
 (0)