Lower default step count for LCM

saddam213 · saddam213 · commit afae65bffa81 · 2023-11-03T08:56:27.000+13:00
diff --git a/OnnxStack.StableDiffusion/Schedulers/LatentConsistency/LCMScheduler.cs b/OnnxStack.StableDiffusion/Schedulers/LatentConsistency/LCMScheduler.cs
@@ -54,7 +54,7 @@ protected override void Initialize()
 
             //The default number of inference steps used to generate a linearly - spaced timestep schedule, from which we
             //will ultimately take `num_inference_steps` evenly spaced timesteps to form the final timestep schedule.
-            _originalInferenceSteps = 30;
+            _originalInferenceSteps = 50;
 
             SetInitNoiseSigma(1.0f);
         }
diff --git a/OnnxStack.UI/Models/ImageResult.cs b/OnnxStack.UI/Models/ImageResult.cs
@@ -1,4 +1,5 @@
-﻿using OnnxStack.StableDiffusion.Config;
+﻿using Models;
+using OnnxStack.StableDiffusion.Config;
 using OnnxStack.StableDiffusion.Enums;
 using System;
 using System.Text.Json.Serialization;
@@ -11,6 +12,9 @@ public class ImageResult
         [JsonIgnore]
         public BitmapSource Image { get; init; }
 
+        [JsonIgnore]
+        public ModelOptionsModel Model { get; set; }
+
         public DateTime Timestamp { get; } = DateTime.UtcNow;
         public DiffuserType DiffuserType { get; init; }
         public string Prompt { get; init; }
diff --git a/OnnxStack.UI/Models/SchedulerOptionsConfig.cs b/OnnxStack.UI/Models/SchedulerOptionsConfig.cs
@@ -0,0 +1,33 @@
+﻿using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace OnnxStack.UI.Models
+{
+    public class SchedulerOptionsConfig : INotifyPropertyChanged
+    {
+
+        private int _stepsMin = 4;
+        private int _stepsMax = 100;
+
+        public int StepsMin
+        {
+            get { return _stepsMin; }
+            set { _stepsMin = value; NotifyPropertyChanged(); }
+        }
+
+        public int StepsMax
+        {
+            get { return _stepsMax; }
+            set { _stepsMax = value; NotifyPropertyChanged(); }
+        }
+
+
+        #region INotifyPropertyChanged
+        public event PropertyChangedEventHandler PropertyChanged;
+        public void NotifyPropertyChanged([CallerMemberName] string property = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
+        }
+        #endregion
+    }
+}
diff --git a/OnnxStack.UI/UserControls/PromptControl.xaml.cs b/OnnxStack.UI/UserControls/PromptControl.xaml.cs
@@ -76,6 +76,9 @@ public ObservableCollection<SchedulerType> SchedulerTypes
         private void OnModelChanged(ModelOptionsModel model)
         {
             SchedulerTypes.Clear();
+            if (model is null)
+                return;
+
             if (model.ModelOptions.PipelineType == DiffuserPipelineType.StableDiffusion)
             {
                 foreach (SchedulerType type in Enum.GetValues<SchedulerType>().Where(x => x != SchedulerType.LCM))
diff --git a/OnnxStack.UI/UserControls/SchedulerControl.xaml b/OnnxStack.UI/UserControls/SchedulerControl.xaml
@@ -53,7 +53,7 @@
                                 <Label>Inference Steps</Label>
                                 <TextBlock Text="{Binding ElementName=SliderInferenceSteps, Path=Value, StringFormat={}{0}}" VerticalAlignment="Bottom" HorizontalAlignment="Right" FontSize="10" Margin="0,0,6,0" FontWeight="Medium" />
                             </DockPanel>
-                            <Slider Name="SliderInferenceSteps" Value="{Binding SchedulerOptions.InferenceSteps}" Minimum="4" Maximum="100" TickFrequency="1" IsSnapToTickEnabled="True" SmallChange="0.1" LargeChange="0.1" >
+                            <Slider Name="SliderInferenceSteps" Value="{Binding SchedulerOptions.InferenceSteps}" Minimum="{Binding OptionsConfig.StepsMin}" Maximum="{Binding OptionsConfig.StepsMax}" TickFrequency="1" IsSnapToTickEnabled="True" SmallChange="1" LargeChange="1" >
                                 <i:Interaction.Behaviors>
                                     <behaviors:SliderMouseWheelBehavior />
                                 </i:Interaction.Behaviors>
diff --git a/OnnxStack.UI/UserControls/SchedulerControl.xaml.cs b/OnnxStack.UI/UserControls/SchedulerControl.xaml.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
@@ -19,6 +18,7 @@ namespace OnnxStack.UI.UserControls
     /// </summary>
     public partial class SchedulerControl : UserControl, INotifyPropertyChanged
     {
+        private SchedulerOptionsConfig _optionsConfig = new();
 
         /// <summary>Initializes a new instance of the <see cref="SchedulerControl" /> class.</summary>
         public SchedulerControl()
@@ -29,19 +29,18 @@ public SchedulerControl()
             InitializeComponent();
         }
 
-        /// <summary>Gets the reset parameters command.</summary>
-        /// <value>The reset parameters command.</value>
         public ICommand ResetParametersCommand { get; }
         public ICommand RandomSeedCommand { get; }
         public ObservableCollection<int> ValidSizes { get; }
 
-
+        /// <summary>
+        /// Gets or sets the selected model.
+        /// </summary>
         public ModelOptionsModel SelectedModel
         {
             get { return (ModelOptionsModel)GetValue(SelectedModelProperty); }
             set { SetValue(SelectedModelProperty, value); }
         }
-
         public static readonly DependencyProperty SelectedModelProperty =
             DependencyProperty.Register("SelectedModel", typeof(ModelOptionsModel), typeof(SchedulerControl), new PropertyMetadata((d, e) =>
             {
@@ -50,17 +49,18 @@ public ModelOptionsModel SelectedModel
             }));
 
 
+        /// <summary>
+        /// Gets or sets the type of the diffuser.
+        /// </summary>
         public DiffuserType DiffuserType
         {
             get { return (DiffuserType)GetValue(DiffuserTypeProperty); }
             set { SetValue(DiffuserTypeProperty, value); }
         }
-
         public static readonly DependencyProperty DiffuserTypeProperty =
             DependencyProperty.Register("DiffuserType", typeof(DiffuserType), typeof(SchedulerControl));
 
 
-
         /// <summary>
         /// Gets or sets the SchedulerOptions.
         /// </summary>
@@ -69,14 +69,18 @@ public SchedulerOptionsModel SchedulerOptions
             get { return (SchedulerOptionsModel)GetValue(SchedulerOptionsProperty); }
             set { SetValue(SchedulerOptionsProperty, value); }
         }
+        public static readonly DependencyProperty SchedulerOptionsProperty =
+            DependencyProperty.Register("SchedulerOptions", typeof(SchedulerOptionsModel), typeof(SchedulerControl));
 
 
         /// <summary>
-        /// The SchedulerOptions property
+        /// Gets or sets the options configuration.
         /// </summary>
-        public static readonly DependencyProperty SchedulerOptionsProperty =
-            DependencyProperty.Register("SchedulerOptions", typeof(SchedulerOptionsModel), typeof(SchedulerControl));
-
+        public SchedulerOptionsConfig OptionsConfig
+        {
+            get { return _optionsConfig; }
+            set { _optionsConfig = value; NotifyPropertyChanged(); }
+        }
 
 
         /// <summary>
@@ -85,7 +89,21 @@ public SchedulerOptionsModel SchedulerOptions
         /// <param name="modelOptionsModel">The model options model.</param>
         private void OnModelChanged(ModelOptionsModel model)
         {
-           
+            if (model is null)
+                return;
+
+            if (model.ModelOptions.PipelineType == DiffuserPipelineType.StableDiffusion)
+            {
+                OptionsConfig.StepsMin = 4;
+                OptionsConfig.StepsMax = 100;
+                SchedulerOptions.InferenceSteps = 30;
+            }
+            else if (model.ModelOptions.PipelineType == DiffuserPipelineType.LatentConsistency)
+            {
+                OptionsConfig.StepsMin = 1;
+                OptionsConfig.StepsMax = 50;
+                SchedulerOptions.InferenceSteps = 6;
+            }
         }
 
 
diff --git a/OnnxStack.UI/Views/ImageInpaint.xaml.cs b/OnnxStack.UI/Views/ImageInpaint.xaml.cs
@@ -163,6 +163,11 @@ public Task NavigateAsync(ImageResult imageResult)
             HasInputResult = true;
             HasInputMaskResult = false;
             InputImageMask = null;
+            if (imageResult.Model.ModelOptions.Diffusers.Contains(DiffuserType.ImageInpaint) 
+             || imageResult.Model.ModelOptions.Diffusers.Contains(DiffuserType.ImageInpaintLegacy))
+            {
+                SelectedModel = imageResult.Model;
+            }
             InputImage = new ImageInput
             {
                 Image = imageResult.Image,
@@ -314,6 +319,7 @@ private async Task<ImageResult> ExecuteStableDiffusion(IModelOptions modelOption
                 return new ImageResult
                 {
                     Image = image,
+                    Model = _selectedModel,
                     Prompt = promptOptions.Prompt,
                     NegativePrompt = promptOptions.NegativePrompt,
                     DiffuserType = promptOptions.DiffuserType,
diff --git a/OnnxStack.UI/Views/ImageToImage.xaml.cs b/OnnxStack.UI/Views/ImageToImage.xaml.cs
@@ -145,6 +145,10 @@ public Task NavigateAsync(ImageResult imageResult)
             HasResult = false;
             ResultImage = null;
             HasInputResult = true;
+            if (imageResult.Model.ModelOptions.Diffusers.Contains(DiffuserType.ImageToImage))
+            {
+                SelectedModel = imageResult.Model;
+            }
             InputImage = new ImageInput
             {
                 Image = imageResult.Image,
@@ -288,6 +292,7 @@ private async Task<ImageResult> ExecuteStableDiffusion(IModelOptions modelOption
                 return new ImageResult
                 {
                     Image = image,
+                    Model = _selectedModel,
                     Prompt = promptOptions.Prompt,
                     NegativePrompt = promptOptions.NegativePrompt,
                     DiffuserType = promptOptions.DiffuserType,
diff --git a/OnnxStack.UI/Views/TextToImage.xaml.cs b/OnnxStack.UI/Views/TextToImage.xaml.cs
@@ -131,6 +131,10 @@ public Task NavigateAsync(ImageResult imageResult)
             Reset();
             HasResult = false;
             ResultImage = null;
+            if (imageResult.Model.ModelOptions.Diffusers.Contains(DiffuserType.TextToImage))
+            {
+                SelectedModel = imageResult.Model;
+            }
             PromptOptions = new PromptOptionsModel
             {
                 Prompt = imageResult.Prompt,
@@ -262,6 +266,7 @@ private async Task<ImageResult> ExecuteStableDiffusion(IModelOptions modelOption
                 return new ImageResult
                 {
                     Image = image,
+                    Model = _selectedModel,
                     Prompt = promptOptions.Prompt,
                     NegativePrompt = promptOptions.NegativePrompt,
                     DiffuserType = promptOptions.DiffuserType,

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ protected override void Initialize()`
`54`	`54`
`55`	`55`	`//The default number of inference steps used to generate a linearly - spaced timestep schedule, from which we`
`56`	`56`	//will ultimately take `num_inference_steps` evenly spaced timesteps to form the final timestep schedule.
`57`		`- _originalInferenceSteps = 30;`
	`57`	`+ _originalInferenceSteps = 50;`
`58`	`58`
`59`	`59`	`SetInitNoiseSigma(1.0f);`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ public ObservableCollection<SchedulerType> SchedulerTypes`
`76`	`76`	`private void OnModelChanged(ModelOptionsModel model)`
`77`	`77`	`{`
`78`	`78`	`SchedulerTypes.Clear();`
	`79`	`+ if (model is null)`
	`80`	`+ return;`
	`81`	`+`
`79`	`82`	`if (model.ModelOptions.PipelineType == DiffuserPipelineType.StableDiffusion)`
`80`	`83`	`{`
`81`	`84`	`foreach (SchedulerType type in Enum.GetValues<SchedulerType>().Where(x => x != SchedulerType.LCM))`