end to end with new storage (blur hash not generating properly)

mortenjust · mortenjust · commit 407312bc6fc0 · 2022-10-19T12:53:03.000+02:00
diff --git a/Sources/MapleDiffusion/MapleDiffusion.swift b/Sources/MapleDiffusion/MapleDiffusion.swift
@@ -114,7 +114,7 @@ public class MapleDiffusion : ObservableObject {
                 modelFolder mf : URL? = Bundle.main.url(forResource: "bins", withExtension: nil)) {
         // set global folder
         modelFolder = mf
-        try? loadModel(saveMemoryButBeSlower: saveMemoryButBeSlower)
+//        try? loadModel(saveMemoryButBeSlower: saveMemoryButBeSlower)
     }
     
     func updateState(_ newState:GeneratorState) {
@@ -125,10 +125,8 @@ public class MapleDiffusion : ObservableObject {
         }
     }
     
-    
-    
-    
-    func loadModel(saveMemoryButBeSlower: Bool = true) throws {
+    /// Loads the model in a Task, but can still be heavy, probably due to the MPS stuff
+    public func loadModel(saveMemoryButBeSlower: Bool = true) throws {
         
         Task {
             var progress = ProgressMonitor(total: 11)

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public class MapleDiffusion : ObservableObject {`
`114`	`114`	`modelFolder mf : URL? = Bundle.main.url(forResource: "bins", withExtension: nil)) {`
`115`	`115`	`// set global folder`
`116`	`116`	`modelFolder = mf`
`117`		`- try? loadModel(saveMemoryButBeSlower: saveMemoryButBeSlower)`
	`117`	`+// try? loadModel(saveMemoryButBeSlower: saveMemoryButBeSlower)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`func updateState(_ newState:GeneratorState) {`
`@@ -125,10 +125,8 @@ public class MapleDiffusion : ObservableObject {`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`-`
`129`		`-`
`130`		`-`
`131`		`- func loadModel(saveMemoryButBeSlower: Bool = true) throws {`
	`128`	`+ /// Loads the model in a Task, but can still be heavy, probably due to the MPS stuff`
	`129`	`+ public func loadModel(saveMemoryButBeSlower: Bool = true) throws {`
`132`	`130`
`133`	`131`	`Task {`
`134`	`132`	`var progress = ProgressMonitor(total: 11)`