Merge branch 'master' into add_tests

Author: James Tayler

OnnxStack.StableDiffusion/Diffusers/LatentConsistency/LatentConsistencyDiffuser.cs

@@ -119,7 +119,8 @@ protected override async Task<DenseTensor<float>> SchedulerStep(IModelOptions mo
                     // Create input tensor.
                     var inputTensor = scheduler.ScaleInput(latents, timestep);
 
-                    var outputBuffer = new DenseTensor<float>(schedulerOptions.GetScaledDimension());
+                    var outputChannels = 1;
+                    var outputBuffer = new DenseTensor<float>(schedulerOptions.GetScaledDimension(outputChannels));
                     using (var outputTensorValue = outputBuffer.ToOrtValue())
                     using (var inputTensorValue = inputTensor.ToOrtValue())
                     using (var timestepOrtValue = CreateTimestepNamedOrtValue(inputMetaData, inputNames[1], timestep))

OnnxStack.StableDiffusion/Diffusers/StableDiffusion/InpaintDiffuser.cs

@@ -86,7 +86,8 @@ protected override async Task<DenseTensor<float>> SchedulerStep(IModelOptions mo
                     var inputTensor = scheduler.ScaleInput(inputLatent, timestep);
                     inputTensor = ConcatenateLatents(inputTensor, maskedImage, maskImage);
 
-                    var outputBuffer = new DenseTensor<float>(schedulerOptions.GetScaledDimension());
+                    var outputChannels = performGuidance ? 2 : 1;
+                    var outputBuffer = new DenseTensor<float>(schedulerOptions.GetScaledDimension(outputChannels));
                     using (var outputTensorValue = outputBuffer.ToOrtValue())
                     using (var inputTensorValue = inputTensor.ToOrtValue())
                     using (var timestepOrtValue = CreateTimestepNamedOrtValue(inputMetaData, inputNames[1], timestep))

OnnxStack.StableDiffusion/Diffusers/StableDiffusion/InpaintLegacyDiffuser.cs

@@ -86,7 +86,8 @@ protected override async Task<DenseTensor<float>> SchedulerStep(IModelOptions mo
                     var inputLatent = performGuidance ? latents.Repeat(2) : latents;
                     var inputTensor = scheduler.ScaleInput(inputLatent, timestep);
 
-                    var outputBuffer = new DenseTensor<float>(schedulerOptions.GetScaledDimension());
+                    var outputChannels = performGuidance ? 2 : 1;
+                    var outputBuffer = new DenseTensor<float>(schedulerOptions.GetScaledDimension(outputChannels));
                     using (var outputTensorValue = outputBuffer.ToOrtValue())
                     using (var inputTensorValue = inputTensor.ToOrtValue())
                     using (var timestepOrtValue = CreateTimestepNamedOrtValue(inputMetaData, inputNames[1], timestep))

OnnxStack.StableDiffusion/Diffusers/StableDiffusion/StableDiffusionDiffuser.cs

@@ -74,7 +74,8 @@ protected override async Task<DenseTensor<float>> SchedulerStep(IModelOptions mo
                     var inputLatent = performGuidance ? latents.Repeat(2) : latents;
                     var inputTensor = scheduler.ScaleInput(inputLatent, timestep);
 
-                    var outputBuffer = new DenseTensor<float>(schedulerOptions.GetScaledDimension());
+                    var outputChannels = performGuidance ? 2 : 1;
+                    var outputBuffer = new DenseTensor<float>(schedulerOptions.GetScaledDimension(outputChannels));
                     using (var outputTensorValue = outputBuffer.ToOrtValue())
                     using (var inputTensorValue = inputTensor.ToOrtValue())
                     using (var timestepOrtValue = CreateTimestepNamedOrtValue(inputMetaData, inputNames[1], timestep))