Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): move fp32 check to its own variable

Browse Source 
remove a ton of extraneous checks that are easy to miss during maintenance
This commit is contained in:
psychedelicious 2023-09-05 11:51:46 +10:00
parent 94115b5217
commit 2ab75bc52e
13 changed files with 58 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
invokeai/frontend/web/src/features/nodes/util/graphBuilders/addSDXLRefinerToGraph.ts
View File

@ -47,6 +47,8 @@ export const addSDXLRefinerToGraph = (
const { seamlessXAxis, seamlessYAxis, vaePrecision } = state.generation; const { seamlessXAxis, seamlessYAxis, vaePrecision } = state.generation;
const { boundingBoxScaleMethod } = state.canvas; const { boundingBoxScaleMethod } = state.canvas;
const fp32 = vaePrecision === 'fp32';
const isUsingScaledDimensions = ['auto', 'manual'].includes( const isUsingScaledDimensions = ['auto', 'manual'].includes(
boundingBoxScaleMethod boundingBoxScaleMethod
); );
@ -232,7 +234,7 @@ export const addSDXLRefinerToGraph = (
type: 'create_denoise_mask', type: 'create_denoise_mask',
id: SDXL_REFINER_INPAINT_CREATE_MASK, id: SDXL_REFINER_INPAINT_CREATE_MASK,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
if (isUsingScaledDimensions) { if (isUsingScaledDimensions) {

6
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasImageToImageGraph.ts
View File

@ -59,6 +59,8 @@ export const buildCanvasImageToImageGraph = (
shouldAutoSave, shouldAutoSave,
} = state.canvas; } = state.canvas;
const fp32 = vaePrecision === 'fp32';
const isUsingScaledDimensions = ['auto', 'manual'].includes( const isUsingScaledDimensions = ['auto', 'manual'].includes(
boundingBoxScaleMethod boundingBoxScaleMethod
); );
@ -245,7 +247,7 @@ export const buildCanvasImageToImageGraph = (
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
type: 'l2i', type: 'l2i',
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
graph.nodes[CANVAS_OUTPUT] = { graph.nodes[CANVAS_OUTPUT] = {
id: CANVAS_OUTPUT, id: CANVAS_OUTPUT,
@ -292,7 +294,7 @@ export const buildCanvasImageToImageGraph = (
type: 'l2i', type: 'l2i',
id: CANVAS_OUTPUT, id: CANVAS_OUTPUT,
is_intermediate: !shouldAutoSave, is_intermediate: !shouldAutoSave,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
(graph.nodes[IMAGE_TO_LATENTS] as ImageToLatentsInvocation).image = (graph.nodes[IMAGE_TO_LATENTS] as ImageToLatentsInvocation).image =

10
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasInpaintGraph.ts
View File

@ -93,6 +93,8 @@ export const buildCanvasInpaintGraph = (
shouldAutoSave, shouldAutoSave,
} = state.canvas; } = state.canvas;
const fp32 = vaePrecision === 'fp32';
const isUsingScaledDimensions = ['auto', 'manual'].includes( const isUsingScaledDimensions = ['auto', 'manual'].includes(
boundingBoxScaleMethod boundingBoxScaleMethod
); );
@ -141,7 +143,7 @@ export const buildCanvasInpaintGraph = (
type: 'i2l', type: 'i2l',
id: INPAINT_IMAGE, id: INPAINT_IMAGE,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[NOISE]: { [NOISE]: {
type: 'noise', type: 'noise',
@ -153,7 +155,7 @@ export const buildCanvasInpaintGraph = (
type: 'create_denoise_mask', type: 'create_denoise_mask',
id: INPAINT_CREATE_MASK, id: INPAINT_CREATE_MASK,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[DENOISE_LATENTS]: { [DENOISE_LATENTS]: {
type: 'denoise_latents', type: 'denoise_latents',
@ -191,7 +193,7 @@ export const buildCanvasInpaintGraph = (
type: 'l2i', type: 'l2i',
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[CANVAS_OUTPUT]: { [CANVAS_OUTPUT]: {
type: 'color_correct', type: 'color_correct',
@ -596,7 +598,7 @@ export const buildCanvasInpaintGraph = (
type: 'create_denoise_mask', type: 'create_denoise_mask',
id: CANVAS_COHERENCE_INPAINT_CREATE_MASK, id: CANVAS_COHERENCE_INPAINT_CREATE_MASK,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
// Handle Image Input For Mask Creation // Handle Image Input For Mask Creation

10
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasOutpaintGraph.ts
View File

@ -97,6 +97,8 @@ export const buildCanvasOutpaintGraph = (
shouldAutoSave, shouldAutoSave,
} = state.canvas; } = state.canvas;
const fp32 = vaePrecision === 'fp32';
const isUsingScaledDimensions = ['auto', 'manual'].includes( const isUsingScaledDimensions = ['auto', 'manual'].includes(
boundingBoxScaleMethod boundingBoxScaleMethod
); );
@ -150,7 +152,7 @@ export const buildCanvasOutpaintGraph = (
type: 'i2l', type: 'i2l',
id: INPAINT_IMAGE, id: INPAINT_IMAGE,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[NOISE]: { [NOISE]: {
type: 'noise', type: 'noise',
@ -162,7 +164,7 @@ export const buildCanvasOutpaintGraph = (
type: 'create_denoise_mask', type: 'create_denoise_mask',
id: INPAINT_CREATE_MASK, id: INPAINT_CREATE_MASK,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[DENOISE_LATENTS]: { [DENOISE_LATENTS]: {
type: 'denoise_latents', type: 'denoise_latents',
@ -200,7 +202,7 @@ export const buildCanvasOutpaintGraph = (
type: 'l2i', type: 'l2i',
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[CANVAS_OUTPUT]: { [CANVAS_OUTPUT]: {
type: 'color_correct', type: 'color_correct',
@ -698,7 +700,7 @@ export const buildCanvasOutpaintGraph = (
type: 'create_denoise_mask', type: 'create_denoise_mask',
id: CANVAS_COHERENCE_INPAINT_CREATE_MASK, id: CANVAS_COHERENCE_INPAINT_CREATE_MASK,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
// Handle Image Input For Mask Creation // Handle Image Input For Mask Creation

8
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLImageToImageGraph.ts
View File

@ -67,6 +67,8 @@ export const buildCanvasSDXLImageToImageGraph = (
shouldAutoSave, shouldAutoSave,
} = state.canvas; } = state.canvas;
const fp32 = vaePrecision === 'fp32';
const isUsingScaledDimensions = ['auto', 'manual'].includes( const isUsingScaledDimensions = ['auto', 'manual'].includes(
boundingBoxScaleMethod boundingBoxScaleMethod
); );
@ -133,7 +135,7 @@ export const buildCanvasSDXLImageToImageGraph = (
type: 'i2l', type: 'i2l',
id: IMAGE_TO_LATENTS, id: IMAGE_TO_LATENTS,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[SDXL_DENOISE_LATENTS]: { [SDXL_DENOISE_LATENTS]: {
type: 'denoise_latents', type: 'denoise_latents',
@ -258,7 +260,7 @@ export const buildCanvasSDXLImageToImageGraph = (
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
type: 'l2i', type: 'l2i',
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
graph.nodes[CANVAS_OUTPUT] = { graph.nodes[CANVAS_OUTPUT] = {
id: CANVAS_OUTPUT, id: CANVAS_OUTPUT,
@ -305,7 +307,7 @@ export const buildCanvasSDXLImageToImageGraph = (
type: 'l2i', type: 'l2i',
id: CANVAS_OUTPUT, id: CANVAS_OUTPUT,
is_intermediate: !shouldAutoSave, is_intermediate: !shouldAutoSave,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
(graph.nodes[IMAGE_TO_LATENTS] as ImageToLatentsInvocation).image = (graph.nodes[IMAGE_TO_LATENTS] as ImageToLatentsInvocation).image =

10
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLInpaintGraph.ts
View File

@ -100,6 +100,8 @@ export const buildCanvasSDXLInpaintGraph = (
shouldAutoSave, shouldAutoSave,
} = state.canvas; } = state.canvas;
const fp32 = vaePrecision === 'fp32';
const isUsingScaledDimensions = ['auto', 'manual'].includes( const isUsingScaledDimensions = ['auto', 'manual'].includes(
boundingBoxScaleMethod boundingBoxScaleMethod
); );
@ -145,7 +147,7 @@ export const buildCanvasSDXLInpaintGraph = (
type: 'i2l', type: 'i2l',
id: INPAINT_IMAGE, id: INPAINT_IMAGE,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[NOISE]: { [NOISE]: {
type: 'noise', type: 'noise',
@ -157,7 +159,7 @@ export const buildCanvasSDXLInpaintGraph = (
type: 'create_denoise_mask', type: 'create_denoise_mask',
id: INPAINT_CREATE_MASK, id: INPAINT_CREATE_MASK,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[SDXL_DENOISE_LATENTS]: { [SDXL_DENOISE_LATENTS]: {
type: 'denoise_latents', type: 'denoise_latents',
@ -197,7 +199,7 @@ export const buildCanvasSDXLInpaintGraph = (
type: 'l2i', type: 'l2i',
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[CANVAS_OUTPUT]: { [CANVAS_OUTPUT]: {
type: 'color_correct', type: 'color_correct',
@ -611,7 +613,7 @@ export const buildCanvasSDXLInpaintGraph = (
type: 'create_denoise_mask', type: 'create_denoise_mask',
id: CANVAS_COHERENCE_INPAINT_CREATE_MASK, id: CANVAS_COHERENCE_INPAINT_CREATE_MASK,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
// Handle Image Input For Mask Creation // Handle Image Input For Mask Creation

10
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLOutpaintGraph.ts
View File

@ -104,6 +104,8 @@ export const buildCanvasSDXLOutpaintGraph = (
shouldAutoSave, shouldAutoSave,
} = state.canvas; } = state.canvas;
const fp32 = vaePrecision === 'fp32';
const isUsingScaledDimensions = ['auto', 'manual'].includes( const isUsingScaledDimensions = ['auto', 'manual'].includes(
boundingBoxScaleMethod boundingBoxScaleMethod
); );
@ -154,7 +156,7 @@ export const buildCanvasSDXLOutpaintGraph = (
type: 'i2l', type: 'i2l',
id: INPAINT_IMAGE, id: INPAINT_IMAGE,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[NOISE]: { [NOISE]: {
type: 'noise', type: 'noise',
@ -166,7 +168,7 @@ export const buildCanvasSDXLOutpaintGraph = (
type: 'create_denoise_mask', type: 'create_denoise_mask',
id: INPAINT_CREATE_MASK, id: INPAINT_CREATE_MASK,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[SDXL_DENOISE_LATENTS]: { [SDXL_DENOISE_LATENTS]: {
type: 'denoise_latents', type: 'denoise_latents',
@ -206,7 +208,7 @@ export const buildCanvasSDXLOutpaintGraph = (
type: 'l2i', type: 'l2i',
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[CANVAS_OUTPUT]: { [CANVAS_OUTPUT]: {
type: 'color_correct', type: 'color_correct',
@ -714,7 +716,7 @@ export const buildCanvasSDXLOutpaintGraph = (
type: 'create_denoise_mask', type: 'create_denoise_mask',
id: CANVAS_COHERENCE_INPAINT_CREATE_MASK, id: CANVAS_COHERENCE_INPAINT_CREATE_MASK,
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
// Handle Image Input For Mask Creation // Handle Image Input For Mask Creation

6
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLTextToImageGraph.ts
View File

@ -61,6 +61,8 @@ export const buildCanvasSDXLTextToImageGraph = (
shouldAutoSave, shouldAutoSave,
} = state.canvas; } = state.canvas;
const fp32 = vaePrecision === 'fp32';
const isUsingScaledDimensions = ['auto', 'manual'].includes( const isUsingScaledDimensions = ['auto', 'manual'].includes(
boundingBoxScaleMethod boundingBoxScaleMethod
); );
@ -252,7 +254,7 @@ export const buildCanvasSDXLTextToImageGraph = (
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
type: isUsingOnnxModel ? 'l2i_onnx' : 'l2i', type: isUsingOnnxModel ? 'l2i_onnx' : 'l2i',
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
graph.nodes[CANVAS_OUTPUT] = { graph.nodes[CANVAS_OUTPUT] = {
@ -290,7 +292,7 @@ export const buildCanvasSDXLTextToImageGraph = (
type: isUsingOnnxModel ? 'l2i_onnx' : 'l2i', type: isUsingOnnxModel ? 'l2i_onnx' : 'l2i',
id: CANVAS_OUTPUT, id: CANVAS_OUTPUT,
is_intermediate: !shouldAutoSave, is_intermediate: !shouldAutoSave,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
graph.edges.push({ graph.edges.push({

6
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasTextToImageGraph.ts
View File

@ -59,6 +59,8 @@ export const buildCanvasTextToImageGraph = (
shouldAutoSave, shouldAutoSave,
} = state.canvas; } = state.canvas;
const fp32 = vaePrecision === 'fp32';
const isUsingScaledDimensions = ['auto', 'manual'].includes( const isUsingScaledDimensions = ['auto', 'manual'].includes(
boundingBoxScaleMethod boundingBoxScaleMethod
); );
@ -238,7 +240,7 @@ export const buildCanvasTextToImageGraph = (
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
type: isUsingOnnxModel ? 'l2i_onnx' : 'l2i', type: isUsingOnnxModel ? 'l2i_onnx' : 'l2i',
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
graph.nodes[CANVAS_OUTPUT] = { graph.nodes[CANVAS_OUTPUT] = {
@ -276,7 +278,7 @@ export const buildCanvasTextToImageGraph = (
type: isUsingOnnxModel ? 'l2i_onnx' : 'l2i', type: isUsingOnnxModel ? 'l2i_onnx' : 'l2i',
id: CANVAS_OUTPUT, id: CANVAS_OUTPUT,
is_intermediate: !shouldAutoSave, is_intermediate: !shouldAutoSave,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}; };
graph.edges.push({ graph.edges.push({

6
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearImageToImageGraph.ts
View File

@ -84,6 +84,8 @@ export const buildLinearImageToImageGraph = (
throw new Error('No model found in state'); throw new Error('No model found in state');
} }
const fp32 = vaePrecision === 'fp32';
let modelLoaderNodeId = MAIN_MODEL_LOADER; let modelLoaderNodeId = MAIN_MODEL_LOADER;
const use_cpu = shouldUseNoiseSettings const use_cpu = shouldUseNoiseSettings
@ -122,7 +124,7 @@ export const buildLinearImageToImageGraph = (
[LATENTS_TO_IMAGE]: { [LATENTS_TO_IMAGE]: {
type: 'l2i', type: 'l2i',
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[DENOISE_LATENTS]: { [DENOISE_LATENTS]: {
type: 'denoise_latents', type: 'denoise_latents',
@ -140,7 +142,7 @@ export const buildLinearImageToImageGraph = (
// image: { // image: {
// image_name: initialImage.image_name, // image_name: initialImage.image_name,
// }, // },
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
}, },
edges: [ edges: [

6
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLImageToImageGraph.ts
View File

@ -84,6 +84,8 @@ export const buildLinearSDXLImageToImageGraph = (
throw new Error('No model found in state'); throw new Error('No model found in state');
} }
const fp32 = vaePrecision === 'fp32';
// Model Loader ID // Model Loader ID
let modelLoaderNodeId = SDXL_MODEL_LOADER; let modelLoaderNodeId = SDXL_MODEL_LOADER;
@ -124,7 +126,7 @@ export const buildLinearSDXLImageToImageGraph = (
[LATENTS_TO_IMAGE]: { [LATENTS_TO_IMAGE]: {
type: 'l2i', type: 'l2i',
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
[SDXL_DENOISE_LATENTS]: { [SDXL_DENOISE_LATENTS]: {
type: 'denoise_latents', type: 'denoise_latents',
@ -144,7 +146,7 @@ export const buildLinearSDXLImageToImageGraph = (
// image: { // image: {
// image_name: initialImage.image_name, // image_name: initialImage.image_name,
// }, // },
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
}, },
edges: [ edges: [

4
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLTextToImageGraph.ts
View File

@ -62,6 +62,8 @@ export const buildLinearSDXLTextToImageGraph = (
throw new Error('No model found in state'); throw new Error('No model found in state');
} }
const fp32 = vaePrecision === 'fp32';
// Construct Style Prompt // Construct Style Prompt
const { craftedPositiveStylePrompt, craftedNegativeStylePrompt } = const { craftedPositiveStylePrompt, craftedNegativeStylePrompt } =
craftSDXLStylePrompt(state, shouldConcatSDXLStylePrompt); craftSDXLStylePrompt(state, shouldConcatSDXLStylePrompt);
@ -118,7 +120,7 @@ export const buildLinearSDXLTextToImageGraph = (
[LATENTS_TO_IMAGE]: { [LATENTS_TO_IMAGE]: {
type: 'l2i', type: 'l2i',
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
}, },
edges: [ edges: [

4
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearTextToImageGraph.ts
View File

@ -57,6 +57,8 @@ export const buildLinearTextToImageGraph = (
throw new Error('No model found in state'); throw new Error('No model found in state');
} }
const fp32 = vaePrecision === 'fp32';
const isUsingOnnxModel = model.model_type === 'onnx'; const isUsingOnnxModel = model.model_type === 'onnx';
let modelLoaderNodeId = isUsingOnnxModel let modelLoaderNodeId = isUsingOnnxModel
@ -139,7 +141,7 @@ export const buildLinearTextToImageGraph = (
[LATENTS_TO_IMAGE]: { [LATENTS_TO_IMAGE]: {
type: isUsingOnnxModel ? 'l2i_onnx' : 'l2i', type: isUsingOnnxModel ? 'l2i_onnx' : 'l2i',
id: LATENTS_TO_IMAGE, id: LATENTS_TO_IMAGE,
fp32: vaePrecision === 'fp32' ? true : false, fp32,
}, },
}, },
edges: [ edges: [