Remove legacy InitialNoiseLevel parameter

saddam213 · saddam213 · commit 2eef655c2712 · 2023-12-03T19:06:54.000+13:00
diff --git a/OnnxStack.StableDiffusion/Config/SchedulerOptions.cs b/OnnxStack.StableDiffusion/Config/SchedulerOptions.cs
@@ -61,12 +61,6 @@ public record SchedulerOptions
         [Range(0f, 1f)]
         public float Strength { get; set; } = 0.6f;
 
-        /// <summary>
-        /// Gets or sets the initial noise level for Image 2 Image
-        /// </summary>
-        [Range(-1f, 1f)]
-        public float InitialNoiseLevel { get; set; } = 0f;
-
         [Range(0, int.MaxValue)]
         public int TrainTimesteps { get; set; } = 1000;
         public float BetaStart { get; set; } = 0.00085f;
diff --git a/OnnxStack.StableDiffusion/Diffusers/LatentConsistency/ImageDiffuser.cs b/OnnxStack.StableDiffusion/Diffusers/LatentConsistency/ImageDiffuser.cs
@@ -73,10 +73,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti
                 using (var result = results.First())
                 {
                     var outputResult = result.ToDenseTensor();
-                    var scaledSample = outputResult
-                       .Add(scheduler.CreateRandomSample(outputDimension, options.InitialNoiseLevel))
-                       .MultiplyBy(model.ScaleFactor);
-
+                    var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);
                     return scheduler.AddNoise(scaledSample, scheduler.CreateRandomSample(scaledSample.Dimensions), timesteps);
                 }
             }
diff --git a/OnnxStack.StableDiffusion/Diffusers/LatentConsistency/InpaintLegacyDiffuser.cs b/OnnxStack.StableDiffusion/Diffusers/LatentConsistency/InpaintLegacyDiffuser.cs
@@ -174,10 +174,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti
                 using (var result = results.First())
                 {
                     var outputResult = result.ToDenseTensor();
-                    var scaledSample = outputResult
-                       .Add(scheduler.CreateRandomSample(outputDimensions, options.InitialNoiseLevel))
-                       .MultiplyBy(model.ScaleFactor);
-
+                    var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);
                     return scaledSample;
                 }
             }
diff --git a/OnnxStack.StableDiffusion/Diffusers/StableDiffusion/ImageDiffuser.cs b/OnnxStack.StableDiffusion/Diffusers/StableDiffusion/ImageDiffuser.cs
@@ -75,10 +75,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti
                 using (var result = results.First())
                 {
                     var outputResult = result.ToDenseTensor();
-                    var scaledSample = outputResult
-                       .Add(scheduler.CreateRandomSample(outputDimension, options.InitialNoiseLevel))
-                       .MultiplyBy(model.ScaleFactor);
-
+                    var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);
                     return scheduler.AddNoise(scaledSample, scheduler.CreateRandomSample(scaledSample.Dimensions), timesteps);
                 }
             }
diff --git a/OnnxStack.StableDiffusion/Diffusers/StableDiffusion/InpaintDiffuser.cs b/OnnxStack.StableDiffusion/Diffusers/StableDiffusion/InpaintDiffuser.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Extensions.Logging;
-using Microsoft.ML.OnnxRuntime;
 using Microsoft.ML.OnnxRuntime.Tensors;
 using OnnxStack.Core;
 using OnnxStack.Core.Config;
@@ -15,7 +14,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/OnnxStack.StableDiffusion/Diffusers/StableDiffusion/InpaintLegacyDiffuser.cs b/OnnxStack.StableDiffusion/Diffusers/StableDiffusion/InpaintLegacyDiffuser.cs
@@ -162,10 +162,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti
                 using (var result = results.First())
                 {
                     var outputResult = result.ToDenseTensor();
-                    var scaledSample = outputResult
-                       .Add(scheduler.CreateRandomSample(outputDimensions, options.InitialNoiseLevel))
-                       .MultiplyBy(model.ScaleFactor);
-
+                    var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);
                     return scaledSample;
                 }
             }
diff --git a/OnnxStack.StableDiffusion/Diffusers/StableDiffusionXL/ImageDiffuser.cs b/OnnxStack.StableDiffusion/Diffusers/StableDiffusionXL/ImageDiffuser.cs
@@ -74,10 +74,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti
                 using (var result = results.First())
                 {
                     var outputResult = result.ToDenseTensor();
-                    var scaledSample = outputResult
-                       .Add(scheduler.CreateRandomSample(outputDimension, options.InitialNoiseLevel))
-                       .MultiplyBy(model.ScaleFactor);
-
+                    var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);
                     return scheduler.AddNoise(scaledSample, scheduler.CreateRandomSample(scaledSample.Dimensions), timesteps);
                 }
             }
diff --git a/OnnxStack.StableDiffusion/Diffusers/StableDiffusionXL/InpaintLegacyDiffuser.cs b/OnnxStack.StableDiffusion/Diffusers/StableDiffusionXL/InpaintLegacyDiffuser.cs
@@ -166,10 +166,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti
                 using (var result = results.First())
                 {
                     var outputResult = result.ToDenseTensor();
-                    var scaledSample = outputResult
-                       .Add(scheduler.CreateRandomSample(outputDimensions, options.InitialNoiseLevel))
-                       .MultiplyBy(model.ScaleFactor);
-
+                    var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);
                     return scaledSample;
                 }
             }
diff --git a/OnnxStack.UI/Models/SchedulerOptionsModel.cs b/OnnxStack.UI/Models/SchedulerOptionsModel.cs
@@ -14,7 +14,6 @@ public class SchedulerOptionsModel : INotifyPropertyChanged
         private int _inferenceSteps = 30;
         private float _guidanceScale = 7.5f;
         private float _strength = 0.75f;
-        private float _initialNoiseLevel = 0f;
         private int _trainTimesteps = 1000;
         private float _betaStart = 0.00085f;
         private float _betaEnd = 0.012f;
@@ -106,15 +105,6 @@ public float Strength
             get { return _strength; }
             set { _strength = value; NotifyPropertyChanged(); }
         }
-        /// <summary>
-        /// Gets or sets the initial noise level for Image 2 Image
-        /// </summary>
-        [Range(-1f, 1f)]
-        public float InitialNoiseLevel
-        {
-            get { return _initialNoiseLevel; }
-            set { _initialNoiseLevel = value; NotifyPropertyChanged(); }
-        }
 
         [Range(0, int.MaxValue)]
         public int TrainTimesteps
diff --git a/OnnxStack.UI/UserControls/SchedulerControl.xaml b/OnnxStack.UI/UserControls/SchedulerControl.xaml
@@ -185,12 +185,14 @@
                     <UniformGrid Columns="2" Margin="0,5,0,0">
 
 
+
+
                         <StackPanel Margin="0,0,5,0">
                             <DockPanel>
-                                <Label>Initial Noise</Label>
-                                <TextBlock Text="{Binding ElementName=SliderInitialNoiseLevel, Path=Value, StringFormat={}{0:F2}}" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="10" Margin="0,0,6,0" FontWeight="Medium" />
+                                <Label>Strength</Label>
+                                <TextBlock Text="{Binding ElementName=SliderStrength, Path=Value, StringFormat={}{0:F2}}" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="10" Margin="0,0,6,0" FontWeight="Medium" />
                             </DockPanel>
-                            <Slider Name="SliderInitialNoiseLevel" Value="{Binding SchedulerOptions.InitialNoiseLevel}" Minimum="-1" Maximum="1" TickFrequency="0.1" IsSnapToTickEnabled="true" SmallChange="0.1" LargeChange="0.1">
+                            <Slider Name="SliderStrength" Value="{Binding SchedulerOptions.Strength}" Minimum="0" Maximum="1" TickFrequency="0.01" IsSnapToTickEnabled="true" SmallChange="0.01" LargeChange="0.01">
                                 <i:Interaction.Behaviors>
                                     <behaviors:SliderMouseWheelBehavior />
                                 </i:Interaction.Behaviors>
@@ -201,17 +203,21 @@
                                         <DataTrigger Binding="{Binding Path=DiffuserType}" Value="TextToImage">
                                             <Setter Property="Visibility" Value="Collapsed" />
                                         </DataTrigger>
+                                        <DataTrigger Binding="{Binding Path=DiffuserType}" Value="ImageInpaint">
+                                            <Setter Property="Visibility" Value="Collapsed" />
+                                        </DataTrigger>
                                     </Style.Triggers>
                                 </Style>
                             </StackPanel.Style>
                         </StackPanel>
 
-                        <StackPanel Margin="5,0,0,0">
+
+                        <!--<StackPanel Margin="5,0,0,0">
                             <DockPanel>
-                                <Label>Strength</Label>
-                                <TextBlock Text="{Binding ElementName=SliderStrength, Path=Value, StringFormat={}{0:F2}}" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="10" Margin="0,0,6,0" FontWeight="Medium" />
+                                <Label>Initial Noise</Label>
+                                <TextBlock Text="{Binding ElementName=SliderInitialNoiseLevel, Path=Value, StringFormat={}{0:F2}}" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="10" Margin="0,0,6,0" FontWeight="Medium" />
                             </DockPanel>
-                            <Slider Name="SliderStrength" Value="{Binding SchedulerOptions.Strength}" Minimum="0" Maximum="1" TickFrequency="0.01" IsSnapToTickEnabled="true" SmallChange="0.01" LargeChange="0.01">
+                            <Slider Name="SliderInitialNoiseLevel" Value="{Binding SchedulerOptions.InitialNoiseLevel}" Minimum="-1" Maximum="1" TickFrequency="0.1" IsSnapToTickEnabled="true" SmallChange="0.1" LargeChange="0.1">
                                 <i:Interaction.Behaviors>
                                     <behaviors:SliderMouseWheelBehavior />
                                 </i:Interaction.Behaviors>
@@ -222,13 +228,11 @@
                                         <DataTrigger Binding="{Binding Path=DiffuserType}" Value="TextToImage">
                                             <Setter Property="Visibility" Value="Collapsed" />
                                         </DataTrigger>
-                                        <DataTrigger Binding="{Binding Path=DiffuserType}" Value="ImageInpaint">
-                                            <Setter Property="Visibility" Value="Collapsed" />
-                                        </DataTrigger>
                                     </Style.Triggers>
                                 </Style>
                             </StackPanel.Style>
-                        </StackPanel>
+                        </StackPanel>-->
+
                     </UniformGrid>
 
                     <UniformGrid Columns="2" Rows="1" Margin="0,1,0,10">
@@ -393,7 +397,7 @@
                                 <ComboBox ItemsSource="{Binding Source={StaticResource BatchOptionType}}" SelectedItem="{Binding BatchOptions.BatchType}"/>
                                 <CheckBox Content="Disable History" IsChecked="{Binding BatchOptions.DisableHistory}" IsEnabled="{Binding BatchOptions.IsAutomationEnabled}" HorizontalAlignment="Right" />
                             </UniformGrid>
-                           
+
                         </StackPanel>
 
 
diff --git a/OnnxStack.UI/Utils.cs b/OnnxStack.UI/Utils.cs
@@ -111,7 +111,6 @@ public static SchedulerOptions ToSchedulerOptions(this SchedulerOptionsModel mod
                 GuidanceScale = model.GuidanceScale,
                 Height = model.Height,
                 InferenceSteps = model.InferenceSteps,
-                InitialNoiseLevel = model.InitialNoiseLevel,
                 MaximumBeta = model.MaximumBeta,
                 PredictionType = model.PredictionType,
                 SampleMaxValue = model.SampleMaxValue,
@@ -143,7 +142,6 @@ public static SchedulerOptionsModel ToSchedulerOptionsModel(this SchedulerOption
                 GuidanceScale = model.GuidanceScale,
                 Height = model.Height,
                 InferenceSteps = model.InferenceSteps,
-                InitialNoiseLevel = model.InitialNoiseLevel,
                 MaximumBeta = model.MaximumBeta,
                 PredictionType = model.PredictionType,
                 SampleMaxValue = model.SampleMaxValue,

Original file line number	Diff line number	Diff line change
`@@ -73,10 +73,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti`
`73`	`73`	`using (var result = results.First())`
`74`	`74`	`{`
`75`	`75`	`var outputResult = result.ToDenseTensor();`
`76`		`- var scaledSample = outputResult`
`77`		`- .Add(scheduler.CreateRandomSample(outputDimension, options.InitialNoiseLevel))`
`78`		`- .MultiplyBy(model.ScaleFactor);`
`79`		`-`
	`76`	`+ var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);`
`80`	`77`	`return scheduler.AddNoise(scaledSample, scheduler.CreateRandomSample(scaledSample.Dimensions), timesteps);`
`81`	`78`	`}`
`82`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,10 +174,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti`
`174`	`174`	`using (var result = results.First())`
`175`	`175`	`{`
`176`	`176`	`var outputResult = result.ToDenseTensor();`
`177`		`- var scaledSample = outputResult`
`178`		`- .Add(scheduler.CreateRandomSample(outputDimensions, options.InitialNoiseLevel))`
`179`		`- .MultiplyBy(model.ScaleFactor);`
`180`		`-`
	`177`	`+ var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);`
`181`	`178`	`return scaledSample;`
`182`	`179`	`}`
`183`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti`
`75`	`75`	`using (var result = results.First())`
`76`	`76`	`{`
`77`	`77`	`var outputResult = result.ToDenseTensor();`
`78`		`- var scaledSample = outputResult`
`79`		`- .Add(scheduler.CreateRandomSample(outputDimension, options.InitialNoiseLevel))`
`80`		`- .MultiplyBy(model.ScaleFactor);`
`81`		`-`
	`78`	`+ var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);`
`82`	`79`	`return scheduler.AddNoise(scaledSample, scheduler.CreateRandomSample(scaledSample.Dimensions), timesteps);`
`83`	`80`	`}`
`84`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,10 +162,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti`
`162`	`162`	`using (var result = results.First())`
`163`	`163`	`{`
`164`	`164`	`var outputResult = result.ToDenseTensor();`
`165`		`- var scaledSample = outputResult`
`166`		`- .Add(scheduler.CreateRandomSample(outputDimensions, options.InitialNoiseLevel))`
`167`		`- .MultiplyBy(model.ScaleFactor);`
`168`		`-`
	`165`	`+ var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);`
`169`	`166`	`return scaledSample;`
`170`	`167`	`}`
`171`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti`
`74`	`74`	`using (var result = results.First())`
`75`	`75`	`{`
`76`	`76`	`var outputResult = result.ToDenseTensor();`
`77`		`- var scaledSample = outputResult`
`78`		`- .Add(scheduler.CreateRandomSample(outputDimension, options.InitialNoiseLevel))`
`79`		`- .MultiplyBy(model.ScaleFactor);`
`80`		`-`
	`77`	`+ var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);`
`81`	`78`	`return scheduler.AddNoise(scaledSample, scheduler.CreateRandomSample(scaledSample.Dimensions), timesteps);`
`82`	`79`	`}`
`83`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,10 +166,7 @@ protected override async Task<DenseTensor<float>> PrepareLatentsAsync(IModelOpti`
`166`	`166`	`using (var result = results.First())`
`167`	`167`	`{`
`168`	`168`	`var outputResult = result.ToDenseTensor();`
`169`		`- var scaledSample = outputResult`
`170`		`- .Add(scheduler.CreateRandomSample(outputDimensions, options.InitialNoiseLevel))`
`171`		`- .MultiplyBy(model.ScaleFactor);`
`172`		`-`
	`169`	`+ var scaledSample = outputResult.MultiplyBy(model.ScaleFactor);`
`173`	`170`	`return scaledSample;`
`174`	`171`	`}`
`175`	`172`	`}`