Skip to content

Commit

Permalink
Merge pull request #2 from czkoko/GuernikaCore
Browse files Browse the repository at this point in the history 
Guernika core
  • Loading branch information
@czkoko
czkoko authored Mar 6, 2024
2 parents 773e5e9 + ba76fe4 commit 1a487ef
Show file tree
Hide file tree
Showing 55 changed files with 1,204 additions and 255 deletions.
115 changes: 54 additions & 61 deletions Mochi Diffusion.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
03173C132999E2B500B03456 /* SDModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03173C122999E2B500B03456 /* SDModel.swift */; };
03173C152999F5C700B03456 /* ImageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03173C142999F5C700B03456 /* ImageController.swift */; };
03173C18299B3C1300B03456 /* ImageStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03173C17299B3C1300B03456 /* ImageStore.swift */; };
0352E2A5294E2591003FBF25 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 0352E2A4294E2591003FBF25 /* Sparkle */; };
0352E2A7294E3148003FBF25 /* HelpCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0352E2A6294E3148003FBF25 /* HelpCommands.swift */; };
0352E2AA294EA0E1003FBF25 /* AppView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0352E2A9294EA0E1003FBF25 /* AppView.swift */; };
0352E2AE294EA2B4003FBF25 /* MessageBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0352E2AD294EA2B4003FBF25 /* MessageBanner.swift */; };
Expand All @@ -40,7 +39,6 @@
0386DF8D2950F25500CA4CEB /* GalleryToolbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0386DF8C2950F25500CA4CEB /* GalleryToolbarView.swift */; };
0388DEB0297B00FC008B1C1C /* CompactSlider in Frameworks */ = {isa = PBXBuildFile; productRef = 0388DEAF297B00FC008B1C1C /* CompactSlider */; };
0395B3112995C70400465B73 /* Scheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0395B3102995C70400465B73 /* Scheduler.swift */; };
03ADC8B9299581AF00B2843F /* StableDiffusion in Frameworks */ = {isa = PBXBuildFile; productRef = 03ADC8B8299581AF00B2843F /* StableDiffusion */; };
03B1ACA8295167B900302F54 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B1ACA7295167B900302F54 /* SettingsView.swift */; };
03CB9D18297399AE0041A4FA /* ImageCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03CB9D17297399AE0041A4FA /* ImageCommands.swift */; };
03D280F2294FD60E00C7D184 /* PromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D280F1294FD60E00C7D184 /* PromptView.swift */; };
Expand All @@ -61,6 +59,11 @@
C1220FC02AFB122F007E5055 /* ImageWellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1220FBF2AFB122F007E5055 /* ImageWellView.swift */; };
C1ADEC2C2B16957800E142CA /* FolderMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1ADEC2B2B16957800E142CA /* FolderMonitor.swift */; };
D7B03F2029D42F9900DF89DD /* SDModelAttentionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7B03F1F29D42F9900DF89DD /* SDModelAttentionType.swift */; };
E45FA5822B7F7E4B009E90F0 /* GuernikaKit in Frameworks */ = {isa = PBXBuildFile; productRef = E45FA5812B7F7E4B009E90F0 /* GuernikaKit */; };
E487AD572B97803E00EF68FB /* StyleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E487AD562B97803E00EF68FB /* StyleView.swift */; };
E4EC46322B890B6D00351E8C /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = E4EC46312B890B6D00351E8C /* Sparkle */; };
E4F15B1D2B86720F00E1EC3C /* de-coremldata.bin in Resources */ = {isa = PBXBuildFile; fileRef = E4F15B1C2B86720F00E1EC3C /* de-coremldata.bin */; };
E4F15B1F2B8673DB00E1EC3C /* en-coremldata.bin in Resources */ = {isa = PBXBuildFile; fileRef = E4F15B1E2B8673DB00E1EC3C /* en-coremldata.bin */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -132,6 +135,9 @@
C1220FBF2AFB122F007E5055 /* ImageWellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageWellView.swift; sourceTree = "<group>"; };
C1ADEC2B2B16957800E142CA /* FolderMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderMonitor.swift; sourceTree = "<group>"; };
D7B03F1F29D42F9900DF89DD /* SDModelAttentionType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDModelAttentionType.swift; sourceTree = "<group>"; };
E487AD562B97803E00EF68FB /* StyleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StyleView.swift; sourceTree = "<group>"; };
E4F15B1C2B86720F00E1EC3C /* de-coremldata.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = "de-coremldata.bin"; sourceTree = "<group>"; };
E4F15B1E2B8673DB00E1EC3C /* en-coremldata.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = "en-coremldata.bin"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -140,8 +146,8 @@
buildActionMask = 2147483647;
files = (
036BFC4E294B9FDB00D8AD04 /* Path in Frameworks */,
03ADC8B9299581AF00B2843F /* StableDiffusion in Frameworks */,
0352E2A5294E2591003FBF25 /* Sparkle in Frameworks */,
E4EC46322B890B6D00351E8C /* Sparkle in Frameworks */,
E45FA5822B7F7E4B009E90F0 /* GuernikaKit in Frameworks */,
0388DEB0297B00FC008B1C1C /* CompactSlider in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -192,6 +198,7 @@
035EDFFB295A21D600080D18 /* SizeView.swift */,
C1220FBF2AFB122F007E5055 /* ImageWellView.swift */,
C116D4942AFC382E00314FE3 /* MochiSlider.swift */,
E487AD562B97803E00EF68FB /* StyleView.swift */,
);
path = SidebarControls;
sourceTree = "<group>";
Expand Down Expand Up @@ -275,6 +282,8 @@
isa = PBXGroup;
children = (
036BFC25294B9F7600D8AD04 /* Assets.xcassets */,
E4F15B1E2B8673DB00E1EC3C /* en-coremldata.bin */,
E4F15B1C2B86720F00E1EC3C /* de-coremldata.bin */,
03FD2318295F74B6006EEEE2 /* RealESRGAN.mlmodel */,
);
path = Resources;
Expand All @@ -287,7 +296,6 @@
isa = PBXNativeTarget;
buildConfigurationList = 036BFC43294B9F7600D8AD04 /* Build configuration list for PBXNativeTarget "Mochi Diffusion" */;
buildPhases = (
03074A1C2971C90C004A15DB /* ShellScript */,
036BFC1A294B9F7500D8AD04 /* Sources */,
036BFC1B294B9F7500D8AD04 /* Frameworks */,
036BFC1C294B9F7500D8AD04 /* Resources */,
Expand All @@ -299,9 +307,9 @@
name = "Mochi Diffusion";
packageProductDependencies = (
036BFC4D294B9FDB00D8AD04 /* Path */,
0352E2A4294E2591003FBF25 /* Sparkle */,
0388DEAF297B00FC008B1C1C /* CompactSlider */,
03ADC8B8299581AF00B2843F /* StableDiffusion */,
E45FA5812B7F7E4B009E90F0 /* GuernikaKit */,
E4EC46312B890B6D00351E8C /* Sparkle */,
);
productName = "Mochi Diffusion";
productReference = 036BFC1E294B9F7500D8AD04 /* Mochi Diffusion.app */;
Expand All @@ -315,7 +323,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1420;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
TargetAttributes = {
036BFC1D294B9F7500D8AD04 = {
CreatedOnToolsVersion = 14.2;
Expand Down Expand Up @@ -368,9 +376,9 @@
mainGroup = 036BFC15294B9F7500D8AD04;
packageReferences = (
036BFC4C294B9FDB00D8AD04 /* XCRemoteSwiftPackageReference "Path.swift" */,
0352E2A3294E2591003FBF25 /* XCRemoteSwiftPackageReference "Sparkle" */,
0388DEAE297B00FC008B1C1C /* XCRemoteSwiftPackageReference "CompactSlider" */,
03ADC8B7299581AF00B2843F /* XCRemoteSwiftPackageReference "ml-stable-diffusion" */,
E45FA5802B7F7E4B009E90F0 /* XCRemoteSwiftPackageReference "GuernikaKit" */,
E4EC46302B890B6D00351E8C /* XCRemoteSwiftPackageReference "Sparkle" */,
);
productRefGroup = 036BFC1F294B9F7500D8AD04 /* Products */;
projectDirPath = "";
Expand All @@ -390,32 +398,13 @@
03F578642967CE9A003A815F /* Localizable.strings in Resources */,
0311C6BD2989E3EF0074BCAE /* Localizable.stringsdict in Resources */,
036BFC26294B9F7600D8AD04 /* Assets.xcassets in Resources */,
E4F15B1F2B8673DB00E1EC3C /* en-coremldata.bin in Resources */,
E4F15B1D2B86720F00E1EC3C /* de-coremldata.bin in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
03074A1C2971C90C004A15DB /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export PATH=\"$PATH:/opt/homebrew/bin\"\nif which swiftlint > /dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
036BFC1A294B9F7500D8AD04 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand All @@ -440,6 +429,7 @@
03FD2319295F74B6006EEEE2 /* RealESRGAN.mlmodel in Sources */,
035EE000295A224900080D18 /* ModelView.swift in Sources */,
03E075792968A153003488F9 /* CircularProgressView.swift in Sources */,
E487AD572B97803E00EF68FB /* StyleView.swift in Sources */,
58FF218829FAE96200A70C7C /* ControlNetView.swift in Sources */,
C11A03882B099D9600540F7F /* JobQueueView.swift in Sources */,
C1ADEC2C2B16957800E142CA /* FolderMonitor.swift in Sources */,
Expand Down Expand Up @@ -512,7 +502,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = arm64;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -547,6 +536,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -576,7 +566,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = arm64;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -611,6 +600,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -622,6 +612,7 @@
MACOSX_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -636,12 +627,13 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Mochi Diffusion/App.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 5.0;
CURRENT_PROJECT_VERSION = 6.0;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Mochi Diffusion/Preview Content\"";
DEVELOPMENT_TEAM = TCQ6328PP6;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -653,7 +645,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 6.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.joshua-park.Mochi-Diffusion";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -669,12 +661,13 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Mochi Diffusion/App.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 5.0;
CURRENT_PROJECT_VERSION = 6.0;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Mochi Diffusion/Preview Content\"";
DEVELOPMENT_TEAM = TCQ6328PP6;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -686,7 +679,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 5.0;
MARKETING_VERSION = 6.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.joshua-park.Mochi-Diffusion";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -719,14 +712,6 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
0352E2A3294E2591003FBF25 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sparkle-project/Sparkle";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.0.0;
};
};
036BFC4C294B9FDB00D8AD04 /* XCRemoteSwiftPackageReference "Path.swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/mxcl/Path.swift.git";
Expand All @@ -743,22 +728,25 @@
minimumVersion = 1.0.0;
};
};
03ADC8B7299581AF00B2843F /* XCRemoteSwiftPackageReference "ml-stable-diffusion" */ = {
E45FA5802B7F7E4B009E90F0 /* XCRemoteSwiftPackageReference "GuernikaKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/apple/ml-stable-diffusion";
repositoryURL = "https://github.com/GuernikaCore/GuernikaKit.git";
requirement = {
branch = main;
kind = branch;
kind = exactVersion;
version = 1.6.1;
};
};
E4EC46302B890B6D00351E8C /* XCRemoteSwiftPackageReference "Sparkle" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sparkle-project/Sparkle.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.5.2;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
0352E2A4294E2591003FBF25 /* Sparkle */ = {
isa = XCSwiftPackageProductDependency;
package = 0352E2A3294E2591003FBF25 /* XCRemoteSwiftPackageReference "Sparkle" */;
productName = Sparkle;
};
036BFC4D294B9FDB00D8AD04 /* Path */ = {
isa = XCSwiftPackageProductDependency;
package = 036BFC4C294B9FDB00D8AD04 /* XCRemoteSwiftPackageReference "Path.swift" */;
Expand All @@ -769,10 +757,15 @@
package = 0388DEAE297B00FC008B1C1C /* XCRemoteSwiftPackageReference "CompactSlider" */;
productName = CompactSlider;
};
03ADC8B8299581AF00B2843F /* StableDiffusion */ = {
E45FA5812B7F7E4B009E90F0 /* GuernikaKit */ = {
isa = XCSwiftPackageProductDependency;
package = 03ADC8B7299581AF00B2843F /* XCRemoteSwiftPackageReference "ml-stable-diffusion" */;
productName = StableDiffusion;
package = E45FA5802B7F7E4B009E90F0 /* XCRemoteSwiftPackageReference "GuernikaKit" */;
productName = GuernikaKit;
};
E4EC46312B890B6D00351E8C /* Sparkle */ = {
isa = XCSwiftPackageProductDependency;
package = E4EC46302B890B6D00351E8C /* XCRemoteSwiftPackageReference "Sparkle" */;
productName = Sparkle;
};
/* End XCSwiftPackageProductDependency section */
};
Expand Down
33 changes: 21 additions & 12 deletions Mochi Diffusion.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
}
},
{
"identity" : "ml-stable-diffusion",
"identity" : "guernikakit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/ml-stable-diffusion",
"location" : "https://github.com/GuernikaCore/GuernikaKit.git",
"state" : {
"branch" : "main",
"revision" : "d456a972cd7d84cab2ec353a29896d59b8602248"
"revision" : "500b1f80ca14159afe7a9d14b7ce100413a568fc",
"version" : "1.6.1"
}
},
{
Expand All @@ -28,21 +28,30 @@
}
},
{
"identity" : "sparkle",
"identity" : "randomgenerator",
"kind" : "remoteSourceControl",
"location" : "https://github.com/sparkle-project/Sparkle",
"location" : "https://github.com/GuernikaCore/RandomGenerator.git",
"state" : {
"revision" : "47d3d90aee3c52b6f61d04ceae426e607df62347",
"version" : "2.5.2"
"revision" : "7c91e2f454ecc753075a526cf5ffc34d3c4a10c5",
"version" : "1.0.0"
}
},
{
"identity" : "swift-argument-parser",
"identity" : "schedulers",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser.git",
"location" : "https://github.com/GuernikaCore/Schedulers.git",
"state" : {
"revision" : "fddd1c00396eed152c45a46bea9f47b98e59301d",
"version" : "1.2.0"
"revision" : "1f517514d679e38bb9915c3a74bf04f75d5b5875",
"version" : "1.4.0"
}
},
{
"identity" : "sparkle",
"kind" : "remoteSourceControl",
"location" : "https://github.com/sparkle-project/Sparkle.git",
"state" : {
"revision" : "47d3d90aee3c52b6f61d04ceae426e607df62347",
"version" : "2.5.2"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion Mochi Diffusion.xcodeproj/xcshareddata/xcschemes/Mochi Diffusion.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading

0 comments on commit 1a487ef

Please sign in to comment.