edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Pick correct sd binary

Browse Source
This commit is contained in:
luboslenco
2025-11-23 12:42:38 +01:00
parent 029e66c53a
commit 95dbcd17f6
13 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paint/sources/box_preferences.ts
+4
View File
@@ -780,7 +780,11 @@ function box_preferences_neural_tab() {
if (inference_handle.init) {
inference_handle.i = config_raw.neural_backend;
}
/// if arm_windows
let inference_combo: string[] = [ "CPU", "Vulkan", "CUDA" ];
/// else
let inference_combo: string[] = [ "CPU", "Vulkan" ];
/// end
ui_combo(inference_handle, inference_combo, tr("Inference Backend"), true);
if (ui.is_hovered) {
ui_tooltip(tr("Backend for neural node processing"));
paint/sources/enums.ts
+1
View File
@@ -277,6 +277,7 @@ enum layout_size_t {
enum neural_backend_t {
CPU = 0,
VULKAN = 1,
CUDA = 2,
}
enum preference_tab_t {
paint/sources/neural_nodes/edit_image_node.ts
+3 -1
View File
@@ -35,7 +35,7 @@ function edit_image_node_button(node_id: i32) {
}
let argv: string[] = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"--diffusion-model",
dir + "/Qwen-Image-Edit-2509-Q4_K_S.gguf",
"--vae",
@@ -50,6 +50,8 @@ function edit_image_node_button(node_id: i32) {
"30",
"-s",
"-1",
"--cfg-scale", "2.5",
"--flow-shift", "3",
"-W",
"512",
"-H",
paint/sources/neural_nodes/image_to_depth_node.ts
+1 -1
View File
@@ -22,7 +22,7 @@ function image_to_depth_node_button(node_id: i32) {
iron_write_png(dir + path_sep + "input.png", gpu_get_texture_pixels(input), input.width, input.height, 0);
let argv: string[] = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"-m",
dir + "/marigold-depth-v1-1.q8_0.gguf",
"--sampling-method",
paint/sources/neural_nodes/image_to_normal_map_node.ts
+1 -1
View File
@@ -22,7 +22,7 @@ function image_to_normal_map_node_button(node_id: i32) {
iron_write_png(dir + path_sep + "input.png", gpu_get_texture_pixels(input), input.width, input.height, 0);
let argv: string[] = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"-m",
dir + "/marigold-normals-v1-1.q8_0.gguf",
"--sampling-method",
paint/sources/neural_nodes/image_to_pbr_node.ts
+1 -1
View File
@@ -62,7 +62,7 @@ function image_to_pbr_node_run_sd(model: string, prompt: string, done: (tex: gpu
let dir: string = neural_node_dir();
let argv: string[] = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"-m",
dir + "/" + model,
"--sampling-method",
paint/sources/neural_nodes/inpaint_image_node.ts
+2 -2
View File
@@ -61,7 +61,7 @@ function inpaint_image_node_button(node_id: i32) {
let argv: string[];
if (model == 0) {
argv = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"-m",
dir + "/v1-5-pruned-emaonly.safetensors",
"--steps",
@@ -89,7 +89,7 @@ function inpaint_image_node_button(node_id: i32) {
}
else {
argv = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"--diffusion-model",
dir + "/Qwen-Image-Edit-2509-Q4_K_S.gguf",
"--vae",
paint/sources/neural_nodes/neural_node.ts
+18
View File
@@ -77,6 +77,24 @@ function neural_node_check_result(node: ui_node_t) {
}
}
function neural_node_sd_bin_ext(): string {
/// if arm_windows
return ".exe";
/// else
return "";
/// end
}
function neural_node_sd_bin(): string {
if (config_raw.neural_backend == neural_backend_t.VULKAN) {
return "sd_vulkan" + neural_node_sd_bin_ext();
}
if (config_raw.neural_backend == neural_backend_t.CUDA) {
return "sd_cuda" + neural_node_sd_bin_ext();
}
return "sd_cpu" + neural_node_sd_bin_ext();
}
function neural_node_dir(): string {
let dir: string;
if (path_is_protected()) {
paint/sources/neural_nodes/outpaint_image_node.ts
+2 -2
View File
@@ -57,7 +57,7 @@ function outpaint_image_node_button(node_id: i32) {
let argv: string[];
if (model == 0) {
argv = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"-m",
dir + "/v1-5-pruned-emaonly.safetensors",
"--offload-to-cpu",
@@ -86,7 +86,7 @@ function outpaint_image_node_button(node_id: i32) {
}
else {
argv = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"--diffusion-model",
dir + "/Qwen-Image-Edit-2509-Q4_K_S.gguf",
"--vae",
paint/sources/neural_nodes/text_to_image_node.ts
+3 -3
View File
@@ -7,7 +7,7 @@ function text_to_image_node_init() {
function text_to_image_node_sd_args(dir: string, prompt: string): string[] {
let argv: string[] = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"-m",
dir + "/v1-5-pruned-emaonly.safetensors",
"--offload-to-cpu",
@@ -30,7 +30,7 @@ function text_to_image_node_sd_args(dir: string, prompt: string): string[] {
function text_to_image_node_qwen_args(dir: string, prompt: string): string[] {
let argv: string[] = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"--diffusion-model",
dir + "/Qwen_Image-Q4_K_S.gguf",
"--vae",
@@ -59,7 +59,7 @@ function text_to_image_node_qwen_args(dir: string, prompt: string): string[] {
function text_to_image_node_wan_args(dir: string, prompt: string): string[] {
let argv: string[] = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"-M",
"vid_gen",
"--diffusion-model",
paint/sources/neural_nodes/tile_image_node.ts
+2 -2
View File
@@ -64,7 +64,7 @@ function tile_image_node_button(node_id: i32) {
let argv: string[];
if (model == 0) {
argv = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"-m",
dir + "/v1-5-pruned-emaonly.safetensors",
"--offload-to-cpu",
@@ -89,7 +89,7 @@ function tile_image_node_button(node_id: i32) {
}
else {
argv = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"--diffusion-model",
dir + "/Qwen-Image-Edit-2509-Q4_K_S.gguf",
"--vae",
paint/sources/neural_nodes/upscale_image_node.ts
+6 -4
View File
@@ -8,8 +8,8 @@ function upscale_image_node_init() {
function upscale_image_node_button(node_id: i32) {
let canvas: ui_node_canvas_t = ui_nodes_get_canvas(true);
let node: ui_node_t = ui_get_node(canvas.nodes, node_id);
let node_name: string = parser_material_node_name(node);
let h: ui_handle_t = ui_handle(node_name);
let node_name: string = parser_material_node_name(node);
let h: ui_handle_t = ui_handle(node_name);
let models: string[] = [ "Real-ESRGAN" ];
let model: i32 = ui_combo(ui_nest(h, 0), models, tr("Model"));
@@ -27,8 +27,10 @@ function upscale_image_node_button(node_id: i32) {
let dir: string = neural_node_dir();
iron_write_png(dir + path_sep + "input.png", input_buf, input.width, input.height, 0);
let argv: string[] =
[ dir + "/sd_vulkan", "-M", "upscale", "--upscale-model", dir + "/RealESRGAN_x4plus.pth", "-i", dir + "/input.png", "-o", dir + "/output.png", null ];
let argv: string[] = [
dir + "/" + neural_node_sd_bin(), "-M", "upscale", "--upscale-model", dir + "/RealESRGAN_x4plus.pth", "-i", dir + "/input.png", "-o",
dir + "/output.png", null
];
iron_exec_async(argv[0], argv.buffer);
sys_notify_on_update(neural_node_check_result, node);
}
paint/sources/neural_nodes/vary_image_node.ts
+2 -2
View File
@@ -50,7 +50,7 @@ function vary_image_node_button(node_id: i32) {
let argv: string[];
if (model == 0) {
argv = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"-m",
dir + "/v1-5-pruned-emaonly.safetensors",
"--offload-to-cpu",
@@ -79,7 +79,7 @@ function vary_image_node_button(node_id: i32) {
}
else {
argv = [
dir + "/sd_vulkan",
dir + "/" + neural_node_sd_bin(),
"--diffusion-model",
dir + "/Qwen-Image-Edit-2509-Q4_K_S.gguf",
"--vae",