ImageController: avoid creating pipeline twice

MochiDiffusion · Jul 20, 2023 · 4fe125a · 4fe125a
1 parent 0d232e1
commit 4fe125a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/Mochi Diffusion/Support/ImageController.swift b/Mochi Diffusion/Support/ImageController.swift
@@ -89,26 +89,22 @@ final class ImageController: ObservableObject {
             controlNet = model.controlNet
             currentControlNets = []
 
-            loadModel()
+            loadPipeline()
         }
     }
 
     @Published
-    var currentControlNets: [SDControlNet] = [] {
-        didSet {
-            loadModel()
-        }
-    }
+    var currentControlNets: [SDControlNet] = []
 
-    private func loadModel() {
+    private func loadPipeline() {
         guard let model = currentModel else {
             return
         }
 
         Task {
             logger.info("Started loading model: \"\(self.modelName)\"")
             do {
-                try await ImageGenerator.shared.load(
+                try await ImageGenerator.shared.loadPipeline(
                     model: model,
                     controlNet: currentControlNets.filter { $0.image != nil }.compactMap(\.name),
                     computeUnit: mlComputeUnitPreference.computeUnits(forModel: model),
@@ -381,6 +377,7 @@ final class ImageController: ObservableObject {
                 currentControlNets[index].image = image
             }
         }
+        loadPipeline()
     }
 
     func selectImage() async -> CGImage? {

diff --git a/Mochi Diffusion/Support/ImageGenerator.swift b/Mochi Diffusion/Support/ImageGenerator.swift
@@ -142,7 +142,7 @@ class ImageGenerator: ObservableObject {
         return models
     }
 
-    func load(model: SDModel, controlNet: [String] = [], computeUnit: MLComputeUnits, reduceMemory: Bool) async throws {
+    func loadPipeline(model: SDModel, controlNet: [String] = [], computeUnit: MLComputeUnits, reduceMemory: Bool) async throws {
         let fm = FileManager.default
         if !fm.fileExists(atPath: model.url.path) {
             await updateState(.error("Couldn't load \(model.name) because it doesn't exist."))