UpscaleModelSet Load/Unload

Author: saddam213

OnnxStack.Console/Examples/UpscaleExample.cs

@@ -1,7 +1,4 @@
-using OnnxStack.Core;
-using OnnxStack.Core.Config;
-using OnnxStack.Core.Services;
-using OnnxStack.ImageUpscaler.Services;
+using OnnxStack.ImageUpscaler.Services;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -10,13 +7,11 @@ namespace OnnxStack.Console.Runner
     public sealed class UpscaleExample : IExampleRunner
     {
         private readonly string _outputDirectory;
-        private readonly IOnnxModelService _modelService;
         private readonly IUpscaleService _imageUpscaleService;
-       
 
-        public UpscaleExample(IOnnxModelService modelService, IUpscaleService imageUpscaleService)
+
+        public UpscaleExample(IUpscaleService imageUpscaleService)
         {
-            _modelService = modelService;
             _imageUpscaleService = imageUpscaleService;
             _outputDirectory = Path.Combine(Directory.GetCurrentDirectory(), "Examples", nameof(UpscaleExample));
             Directory.CreateDirectory(_outputDirectory);
@@ -28,23 +23,9 @@ public UpscaleExample(IOnnxModelService modelService, IUpscaleService imageUpsca
 
         public async Task RunAsync()
         {
+            var modelSet = _imageUpscaleService.ModelSets.FirstOrDefault(x => x.Name == "RealSR BSRGAN x4");
+
 
-            var modelset = new OnnxModelSetConfig
-            {
-                Name = "Upscaler",
-                IsEnabled = true,
-                ExecutionProvider = ExecutionProvider.DirectML,
-                ModelConfigurations = new List<OnnxModelSessionConfig>
-                {
-                    new OnnxModelSessionConfig
-                    {
-                        Type = OnnxModelType.Upscaler,
-                        OnnxModelPath = "D:\\Repositories\\upscaler\\SwinIR\\003_realSR_BSRGAN_DFO_s64w8_SwinIR-M_x4_GAN.onnx"
-                    }
-                }
-            };
-            modelset.ApplyConfigurationOverrides();
-            _modelService.UpdateModelSet(modelset);
 
             OutputHelpers.WriteConsole("Enter Image Path", ConsoleColor.Yellow);
             var imageFile = OutputHelpers.ReadConsole(ConsoleColor.Gray);
@@ -55,13 +36,13 @@ public async Task RunAsync()
             }
 
             OutputHelpers.WriteConsole("Loading Model...", ConsoleColor.Cyan);
-            await _modelService.LoadModelAsync(modelset);
+            await _imageUpscaleService.LoadModelAsync(modelSet);
             OutputHelpers.WriteConsole("Model Loaded.", ConsoleColor.Cyan);
 
             var inputImage = await Image.LoadAsync<Rgba32>(imageFile);
 
             OutputHelpers.WriteConsole("Upscaling Image...", ConsoleColor.Cyan);
-            var result = await _imageUpscaleService.GenerateAsync(modelset, inputImage);
+            var result = await _imageUpscaleService.GenerateAsync(modelSet, inputImage);
             await result.SaveAsPngAsync(Path.Combine(_outputDirectory, "Result.png"));
             OutputHelpers.WriteConsole("Upscaling Complete.", ConsoleColor.Cyan);
         }

OnnxStack.Console/Program.cs

@@ -19,7 +19,7 @@ static async Task Main(string[] _)
             // Add OnnxStack
             builder.Services.AddOnnxStack();
             builder.Services.AddOnnxStackStableDiffusion();
-            builder.Services.AddOnnxStackImageUpscaler(new ImageUpscalerConfig());
+            builder.Services.AddOnnxStackImageUpscaler();
 
             // Add AppService
             builder.Services.AddHostedService<AppService>();