From 332739a9a414e1b642a7a7faa1e7ed2e86ac8a2d Mon Sep 17 00:00:00 2001 From: Pedro Cuenca Date: Sat, 14 Jan 2023 18:40:51 +0100 Subject: [PATCH] Compile common code in macOS target. --- Diffusion-macOS/Diffusion_macOSApp.swift | 2 ++ Diffusion-macOS/PromptView.swift | 1 + Diffusion.xcodeproj/project.pbxproj | 38 ++++++++++++++++++++++++ Diffusion/DiffusionApp.swift | 3 -- Diffusion/Utils.swift | 10 +++++++ 5 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 Diffusion/Utils.swift diff --git a/Diffusion-macOS/Diffusion_macOSApp.swift b/Diffusion-macOS/Diffusion_macOSApp.swift index e4c71eb..659dfc6 100644 --- a/Diffusion-macOS/Diffusion_macOSApp.swift +++ b/Diffusion-macOS/Diffusion_macOSApp.swift @@ -15,3 +15,5 @@ struct Diffusion_macOSApp: App { } } } + +let runningOnMac = false diff --git a/Diffusion-macOS/PromptView.swift b/Diffusion-macOS/PromptView.swift index f1bf64b..55960d8 100644 --- a/Diffusion-macOS/PromptView.swift +++ b/Diffusion-macOS/PromptView.swift @@ -7,6 +7,7 @@ import SwiftUI import CompactSlider +//import StableDiffusion struct PromptView: View { diff --git a/Diffusion.xcodeproj/project.pbxproj b/Diffusion.xcodeproj/project.pbxproj index ad063ec..478f4d1 100644 --- a/Diffusion.xcodeproj/project.pbxproj +++ b/Diffusion.xcodeproj/project.pbxproj @@ -12,6 +12,15 @@ EBB5BA5829425E17003A2A5B /* Path in Frameworks */ = {isa = PBXBuildFile; productRef = EBB5BA5729425E17003A2A5B /* Path */; }; EBB5BA5A29426E06003A2A5B /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBB5BA5929426E06003A2A5B /* Downloader.swift */; }; EBB5BA5D294504DE003A2A5B /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = EBB5BA5C294504DE003A2A5B /* ZIPFoundation */; }; + EBDD7DAA29731F6C00C1C4B2 /* Pipeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE75601293E91E200806B32 /* Pipeline.swift */; }; + EBDD7DAB29731F7500C1C4B2 /* PipelineLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBB5BA5229425BEE003A2A5B /* PipelineLoader.swift */; }; + EBDD7DAD29731FB300C1C4B2 /* Path in Frameworks */ = {isa = PBXBuildFile; productRef = EBDD7DAC29731FB300C1C4B2 /* Path */; }; + EBDD7DAF29731FB300C1C4B2 /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = EBDD7DAE29731FB300C1C4B2 /* ZIPFoundation */; }; + EBDD7DB129731FB300C1C4B2 /* StableDiffusion in Frameworks */ = {isa = PBXBuildFile; productRef = EBDD7DB029731FB300C1C4B2 /* StableDiffusion */; }; + EBDD7DB32973200200C1C4B2 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBDD7DB22973200200C1C4B2 /* Utils.swift */; }; + EBDD7DB42973200200C1C4B2 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBDD7DB22973200200C1C4B2 /* Utils.swift */; }; + EBDD7DB52973201800C1C4B2 /* ModelInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE3FF4B295E1EFE00E921AA /* ModelInfo.swift */; }; + EBDD7DB62973206600C1C4B2 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBB5BA5929426E06003A2A5B /* Downloader.swift */; }; EBE3FF4C295E1EFE00E921AA /* ModelInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE3FF4B295E1EFE00E921AA /* ModelInfo.swift */; }; EBE755C9293E37DD00806B32 /* DiffusionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE755C8293E37DD00806B32 /* DiffusionApp.swift */; }; EBE755CB293E37DD00806B32 /* TextToImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE755CA293E37DD00806B32 /* TextToImage.swift */; }; @@ -53,6 +62,7 @@ EB33A51E2954E1BC00B16357 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; EBB5BA5229425BEE003A2A5B /* PipelineLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PipelineLoader.swift; sourceTree = ""; }; EBB5BA5929426E06003A2A5B /* Downloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Downloader.swift; sourceTree = ""; }; + EBDD7DB22973200200C1C4B2 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = ""; }; EBE3FF4A295DFE2400E921AA /* common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = common.xcconfig; path = config/common.xcconfig; sourceTree = ""; }; EBE3FF4B295E1EFE00E921AA /* ModelInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelInfo.swift; sourceTree = ""; }; EBE4438729488DCA00CDA605 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; @@ -110,6 +120,9 @@ buildActionMask = 2147483647; files = ( F155203C297118E700DC009B /* CompactSlider in Frameworks */, + EBDD7DB129731FB300C1C4B2 /* StableDiffusion in Frameworks */, + EBDD7DAD29731FB300C1C4B2 /* Path in Frameworks */, + EBDD7DAF29731FB300C1C4B2 /* ZIPFoundation in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -160,6 +173,7 @@ EBE7560A29411A5E00806B32 /* Views */, EBB5BA5929426E06003A2A5B /* Downloader.swift */, EBE755C8293E37DD00806B32 /* DiffusionApp.swift */, + EBDD7DB22973200200C1C4B2 /* Utils.swift */, EBE3FF4B295E1EFE00E921AA /* ModelInfo.swift */, EBE755CC293E37DD00806B32 /* Assets.xcassets */, EBE755CE293E37DD00806B32 /* Diffusion.entitlements */, @@ -314,6 +328,9 @@ name = "Diffusion-macOS"; packageProductDependencies = ( F155203B297118E700DC009B /* CompactSlider */, + EBDD7DAC29731FB300C1C4B2 /* Path */, + EBDD7DAE29731FB300C1C4B2 /* ZIPFoundation */, + EBDD7DB029731FB300C1C4B2 /* StableDiffusion */, ); productName = "Diffusion-macOS"; productReference = F15520212971093300DC009B /* Diffusion-macOS.app */; @@ -420,6 +437,7 @@ EBE756092941178600806B32 /* Loading.swift in Sources */, EBB5BA5329425BEE003A2A5B /* PipelineLoader.swift in Sources */, EBE755C9293E37DD00806B32 /* DiffusionApp.swift in Sources */, + EBDD7DB32973200200C1C4B2 /* Utils.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -444,10 +462,15 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + EBDD7DAB29731F7500C1C4B2 /* PipelineLoader.swift in Sources */, + EBDD7DAA29731F6C00C1C4B2 /* Pipeline.swift in Sources */, F15520262971093300DC009B /* ContentView.swift in Sources */, + EBDD7DB42973200200C1C4B2 /* Utils.swift in Sources */, F1552031297109C300DC009B /* PromptView.swift in Sources */, + EBDD7DB62973206600C1C4B2 /* Downloader.swift in Sources */, F155203429710B3600DC009B /* StatusView.swift in Sources */, F15520242971093300DC009B /* Diffusion_macOSApp.swift in Sources */, + EBDD7DB52973201800C1C4B2 /* ModelInfo.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -903,6 +926,21 @@ package = EBB5BA5B294504DE003A2A5B /* XCRemoteSwiftPackageReference "ZIPFoundation" */; productName = ZIPFoundation; }; + EBDD7DAC29731FB300C1C4B2 /* Path */ = { + isa = XCSwiftPackageProductDependency; + package = EBB5BA5629425E17003A2A5B /* XCRemoteSwiftPackageReference "Path.swift" */; + productName = Path; + }; + EBDD7DAE29731FB300C1C4B2 /* ZIPFoundation */ = { + isa = XCSwiftPackageProductDependency; + package = EBB5BA5B294504DE003A2A5B /* XCRemoteSwiftPackageReference "ZIPFoundation" */; + productName = ZIPFoundation; + }; + EBDD7DB029731FB300C1C4B2 /* StableDiffusion */ = { + isa = XCSwiftPackageProductDependency; + package = EB33A51B2954D89F00B16357 /* XCRemoteSwiftPackageReference "ml-stable-diffusion" */; + productName = StableDiffusion; + }; F155203B297118E700DC009B /* CompactSlider */ = { isa = XCSwiftPackageProductDependency; package = F155203A297118E600DC009B /* XCRemoteSwiftPackageReference "CompactSlider" */; diff --git a/Diffusion/DiffusionApp.swift b/Diffusion/DiffusionApp.swift index a07e3f9..d8cdc30 100644 --- a/Diffusion/DiffusionApp.swift +++ b/Diffusion/DiffusionApp.swift @@ -17,7 +17,4 @@ struct DiffusionApp: App { } } -// A couple of helpers - -extension String: Error {} let runningOnMac = ProcessInfo.processInfo.isMacCatalystApp diff --git a/Diffusion/Utils.swift b/Diffusion/Utils.swift new file mode 100644 index 0000000..91af4da --- /dev/null +++ b/Diffusion/Utils.swift @@ -0,0 +1,10 @@ +// +// Utils.swift +// Diffusion +// +// Created by Pedro Cuenca on 14/1/23. +// + +import Foundation + +extension String: Error {}