Merge pull request #63 from saddam213/Init

Improve ModelSet runtime management

Author: saddam213

OnnxStack.Console/Examples/StableDebug.cs

@@ -48,7 +48,7 @@ public async Task RunAsync()
                     Strength = 0.6f
                 };
 
-                foreach (var model in _stableDiffusionService.Models)
+                foreach (var model in _stableDiffusionService.ModelSets)
                 {
                     OutputHelpers.WriteConsole($"Loading Model `{model.Name}`...", ConsoleColor.Green);
                     await _stableDiffusionService.LoadModelAsync(model);
@@ -71,7 +71,7 @@ public async Task RunAsync()
         }
 
 
-        private async Task<bool> GenerateImage(ModelOptions model, PromptOptions prompt, SchedulerOptions options)
+        private async Task<bool> GenerateImage(StableDiffusionModelSet model, PromptOptions prompt, SchedulerOptions options)
         {
             var timestamp = Stopwatch.GetTimestamp();
             var outputFilename = Path.Combine(_outputDirectory, $"{model.Name}_{options.Seed}_{options.SchedulerType}.png");

OnnxStack.Console/Examples/StableDiffusionBatch.cs

@@ -51,7 +51,7 @@ public async Task RunAsync()
                     BatchType = BatchOptionType.Scheduler
                 };
 
-                foreach (var model in _stableDiffusionService.Models)
+                foreach (var model in _stableDiffusionService.ModelSets)
                 {
                     OutputHelpers.WriteConsole($"Loading Model `{model.Name}`...", ConsoleColor.Green);
                     await _stableDiffusionService.LoadModelAsync(model);

OnnxStack.Console/Examples/StableDiffusionExample.cs

@@ -47,7 +47,7 @@ public async Task RunAsync()
                     Seed = Random.Shared.Next()
                 };
 
-                foreach (var model in _stableDiffusionService.Models)
+                foreach (var model in _stableDiffusionService.ModelSets)
                 {
                     OutputHelpers.WriteConsole($"Loading Model `{model.Name}`...", ConsoleColor.Green);
                     await _stableDiffusionService.LoadModelAsync(model);
@@ -65,7 +65,7 @@ public async Task RunAsync()
             }
         }
 
-        private async Task<bool> GenerateImage(ModelOptions model, PromptOptions prompt, SchedulerOptions options)
+        private async Task<bool> GenerateImage(StableDiffusionModelSet model, PromptOptions prompt, SchedulerOptions options)
         {
             var outputFilename = Path.Combine(_outputDirectory, $"{options.Seed}_{options.SchedulerType}.png");
             var result = await _stableDiffusionService.GenerateAsImageAsync(model, prompt, options);

OnnxStack.Console/Examples/StableDiffusionGenerator.cs

@@ -31,7 +31,7 @@ public async Task RunAsync()
             Directory.CreateDirectory(_outputDirectory);
 
             var seed = Random.Shared.Next();
-            foreach (var model in _stableDiffusionService.Models)
+            foreach (var model in _stableDiffusionService.ModelSets)
             {
                 OutputHelpers.WriteConsole($"Loading Model `{model.Name}`...", ConsoleColor.Green);
                 await _stableDiffusionService.LoadModelAsync(model);
@@ -62,7 +62,7 @@ public async Task RunAsync()
             OutputHelpers.ReadConsole(ConsoleColor.Gray);
         }
 
-        private async Task<bool> GenerateImage(ModelOptions model, PromptOptions prompt, SchedulerOptions options, string key)
+        private async Task<bool> GenerateImage(StableDiffusionModelSet model, PromptOptions prompt, SchedulerOptions options, string key)
         {
             var outputFilename = Path.Combine(_outputDirectory, $"{options.Seed}_{options.SchedulerType}_{key}.png");
             var result = await _stableDiffusionService.GenerateAsImageAsync(model, prompt, options);

OnnxStack.Console/Examples/StableDiffusionGif.cs

@@ -54,7 +54,7 @@ public async Task RunAsync()
             };
 
             // Choose Model
-            var model = _stableDiffusionService.Models.FirstOrDefault(x => x.Name == "LCM-Dreamshaper-V7");
+            var model = _stableDiffusionService.ModelSets.FirstOrDefault(x => x.Name == "LCM-Dreamshaper-V7");
             OutputHelpers.WriteConsole($"Loading Model `{model.Name}`...", ConsoleColor.Green);
             await _stableDiffusionService.LoadModelAsync(model);
 

OnnxStack.Console/appsettings.json

@@ -6,8 +6,8 @@
     }
   },
   "AllowedHosts": "*",
-  "OnnxStackConfig": {
-    "OnnxModelSets": [
+  "StableDiffusionConfig": {
+    "ModelSets": [
       {
         "Name": "StableDiffusion 1.5",
         "IsEnabled": true,

OnnxStack.Core/Config/IOnnxModelSetConfig.cs

@@ -11,6 +11,6 @@ public interface IOnnxModelSetConfig : IOnnxModel
         int IntraOpNumThreads { get; set; }
         ExecutionMode ExecutionMode { get; set; }
         ExecutionProvider ExecutionProvider { get; set; }
-        List<OnnxModelSessionConfig> ModelConfigurations { get; set; }
+        List<OnnxModelConfig> ModelConfigurations { get; set; }
     }
 }

OnnxStack.Core/Config/OnnxModelSessionConfig.cs renamed to OnnxStack.Core/Config/OnnxModelConfig.cs

@@ -3,7 +3,7 @@
 
 namespace OnnxStack.Core.Config
 {
-    public class OnnxModelSessionConfig
+    public class OnnxModelConfig
     {
         public OnnxModelType Type { get; set; }
         public string OnnxModelPath { get; set; }

OnnxStack.Core/Config/OnnxModelEqualityComparer.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace OnnxStack.Core.Config
+{
+    public class OnnxModelEqualityComparer : IEqualityComparer<IOnnxModel>
+    {
+        public bool Equals(IOnnxModel x, IOnnxModel y)
+        {
+            return x != null && y != null && x.Name == y.Name;
+        }
+
+        public int GetHashCode(IOnnxModel obj)
+        {
+            return obj?.Name?.GetHashCode() ?? 0;
+        }
+    }
+}

OnnxStack.Core/Config/OnnxModelSetConfig.cs

@@ -13,6 +13,6 @@ public class OnnxModelSetConfig : IOnnxModelSetConfig
         public int IntraOpNumThreads { get; set; }
         public ExecutionMode ExecutionMode { get; set; }
         public ExecutionProvider ExecutionProvider { get; set; }
-        public List<OnnxModelSessionConfig> ModelConfigurations { get; set; }
+        public List<OnnxModelConfig> ModelConfigurations { get; set; }
     }
 }