Move ApplyConfigurationOverrides to ModelSet

Author: saddam213

OnnxStack.Core/Extensions/Extensions.cs

@@ -57,23 +57,6 @@ public static SessionOptions GetSessionOptions(this OnnxModelConfig configuratio
             }
         }
 
-        /// <summary>
-        /// Applies the configuration overrides.
-        /// </summary>
-        public static void ApplyConfigurationOverrides(this IOnnxModelSetConfig innxModelSetConfig)
-        {
-            if (innxModelSetConfig.ModelConfigurations.IsNullOrEmpty())
-                return;
-
-            foreach (var modelConfig in innxModelSetConfig.ModelConfigurations)
-            {
-                modelConfig.DeviceId ??= innxModelSetConfig.DeviceId;
-                modelConfig.ExecutionMode ??= innxModelSetConfig.ExecutionMode;
-                modelConfig.InterOpNumThreads ??= innxModelSetConfig.InterOpNumThreads;
-                modelConfig.IntraOpNumThreads ??= innxModelSetConfig.IntraOpNumThreads;
-                modelConfig.ExecutionProvider ??= innxModelSetConfig.ExecutionProvider;
-            }
-        }
 
         /// <summary>
         /// Determines whether the the source sequence is null or empty

OnnxStack.Core/Model/OnnxModelSet.cs

@@ -22,7 +22,7 @@ public OnnxModelSet(IOnnxModelSetConfig configuration)
             _prePackedWeightsContainer = new PrePackedWeightsContainer();
             _modelSessions = configuration.ModelConfigurations.ToImmutableDictionary(
                 modelConfig => modelConfig.Type,
-                modelConfig => new OnnxModelSession(modelConfig, _prePackedWeightsContainer));
+                modelConfig => new OnnxModelSession(ApplyConfigurationOverrides(modelConfig), _prePackedWeightsContainer));
         }
 
 
@@ -95,5 +95,19 @@ public void Dispose()
             }
             _prePackedWeightsContainer?.Dispose();
         }
+
+        private OnnxModelConfig ApplyConfigurationOverrides(OnnxModelConfig onnxModelConfig)
+        {
+            return new OnnxModelConfig
+            {
+                Type = onnxModelConfig.Type,
+                OnnxModelPath = onnxModelConfig.OnnxModelPath,
+                DeviceId = onnxModelConfig.DeviceId ?? _configuration.DeviceId,
+                ExecutionMode = onnxModelConfig.ExecutionMode ?? _configuration.ExecutionMode,
+                ExecutionProvider = onnxModelConfig.ExecutionProvider ?? _configuration.ExecutionProvider,
+                InterOpNumThreads = onnxModelConfig.InterOpNumThreads ?? _configuration.InterOpNumThreads,
+                IntraOpNumThreads = onnxModelConfig.IntraOpNumThreads ?? _configuration.IntraOpNumThreads,
+            };
+        }
     }
 }

OnnxStack.ImageUpscaler/Config/ImageUpscalerConfig.cs

@@ -11,13 +11,6 @@ public class ImageUpscalerConfig : IConfigSection
 
         public void Initialize()
         {
-            if (ModelSets.IsNullOrEmpty())
-                return;
-
-            foreach (var modelSet in ModelSets)
-            {
-                modelSet.ApplyConfigurationOverrides();
-            }
         }
     }
 }

OnnxStack.StableDiffusion/Config/StableDiffusionConfig.cs

@@ -23,7 +23,6 @@ public void Initialize()
             foreach (var modelSet in ModelSets)
             {
                 modelSet.InitBlankTokenArray();
-                modelSet.ApplyConfigurationOverrides();
                 foreach (var model in modelSet.ModelConfigurations)
                 {
                     if ((model.Type == OnnxModelType.Tokenizer || model.Type == OnnxModelType.Tokenizer2) && string.IsNullOrEmpty(model.OnnxModelPath))

OnnxStack.UI/UserControls/ModelPickerControl.xaml.cs

@@ -126,8 +126,7 @@ private async Task LoadModel()
                 }
 
                 SelectedModel.ModelSet.InitBlankTokenArray();
-                SelectedModel.ModelSet.ApplyConfigurationOverrides();
-                await _stableDiffusionService.AddModelAsync(SelectedModel.ModelSet);
+                await _stableDiffusionService.UpdateModelAsync(SelectedModel.ModelSet);
                 SelectedModel.IsLoaded = await _stableDiffusionService.LoadModelAsync(SelectedModel.ModelSet);
             }
             catch (Exception ex)

OnnxStack.UI/UserControls/UpscalePickerControl.xaml.cs

@@ -84,7 +84,6 @@ private async Task LoadModel()
                     }
                 }
 
-                SelectedModel.ModelSet.ApplyConfigurationOverrides();
                 await _upscaleService.AddModelAsync(SelectedModel.ModelSet);
                 SelectedModel.IsLoaded = await _upscaleService.LoadModelAsync(SelectedModel.ModelSet);
             }