Migrations
/
ImgGenSD2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added Negative Prompt.

Browse Source
main
Yasuhito Nagatomo 2 years ago
parent 5cb933b46a
commit 53bcef5581
5 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
README.md
Unescape View File

@ -25,6 +25,8 @@ You can see how it works through the simple sample code.
![Image](images/ss0_1280.png) ![Image](images/ss0_1280.png)
## Change Log ## Change Log
- [1.1.0 (5)] - Dec 21, 2022 `[Added]`
- Added the negative prompt. It requires the latest apple/ml-stable-diffusion Swift Package.
- [1.0.3 (4)] - Dec 18, 2022 `[Changed]` - [1.0.3 (4)] - Dec 18, 2022 `[Changed]`
- set `MLModelConfiguration.computeUnits` to `.cpuAndGPU`, when running on mobile devices. - set `MLModelConfiguration.computeUnits` to `.cpuAndGPU`, when running on mobile devices.
- [1.0.2 (3)] - Dec 16, 2022 `[Changed]` - [1.0.2 (3)] - Dec 16, 2022 `[Changed]`

24
imggensd2.xcodeproj/project.pbxproj
Unescape View File

@ -7,13 +7,13 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
BA01CAE9294C92FC00C89D87 /* StableDiffusion in Frameworks */ = {isa = PBXBuildFile; productRef = BA01CAE8294C92FC00C89D87 /* StableDiffusion */; };
BA03C378293D785C001426DE /* imggensd2App.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA03C377293D785C001426DE /* imggensd2App.swift */; }; BA03C378293D785C001426DE /* imggensd2App.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA03C377293D785C001426DE /* imggensd2App.swift */; };
BA03C37A293D785C001426DE /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA03C379293D785C001426DE /* ContentView.swift */; }; BA03C37A293D785C001426DE /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA03C379293D785C001426DE /* ContentView.swift */; };
BA03C37C293D785D001426DE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BA03C37B293D785D001426DE /* Assets.xcassets */; }; BA03C37C293D785D001426DE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BA03C37B293D785D001426DE /* Assets.xcassets */; };
BA03C37F293D785D001426DE /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BA03C37E293D785D001426DE /* Preview Assets.xcassets */; }; BA03C37F293D785D001426DE /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BA03C37E293D785D001426DE /* Preview Assets.xcassets */; };
BA03C388293D80A4001426DE /* CoreMLModels in Resources */ = {isa = PBXBuildFile; fileRef = BA03C387293D80A4001426DE /* CoreMLModels */; }; BA03C388293D80A4001426DE /* CoreMLModels in Resources */ = {isa = PBXBuildFile; fileRef = BA03C387293D80A4001426DE /* CoreMLModels */; };
BA03C38D293D8773001426DE /* ImageGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA03C38C293D8773001426DE /* ImageGenerator.swift */; }; BA03C38D293D8773001426DE /* ImageGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA03C38C293D8773001426DE /* ImageGenerator.swift */; };
BA1E84232952ED66001701EA /* StableDiffusion in Frameworks */ = {isa = PBXBuildFile; productRef = BA1E84222952ED66001701EA /* StableDiffusion */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
@ -32,7 +32,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
BA01CAE9294C92FC00C89D87 /* StableDiffusion in Frameworks */, BA1E84232952ED66001701EA /* StableDiffusion in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -95,7 +95,7 @@
); );
name = imggensd2; name = imggensd2;
packageProductDependencies = ( packageProductDependencies = (
BA01CAE8294C92FC00C89D87 /* StableDiffusion */, BA1E84222952ED66001701EA /* StableDiffusion */,
); );
productName = imggensd2; productName = imggensd2;
productReference = BA03C374293D785C001426DE /* imggensd2.app */; productReference = BA03C374293D785C001426DE /* imggensd2.app */;
@ -126,7 +126,7 @@
); );
mainGroup = BA03C36B293D785C001426DE; mainGroup = BA03C36B293D785C001426DE;
packageReferences = ( packageReferences = (
BA01CAE7294C92FB00C89D87 /* XCRemoteSwiftPackageReference "ml-stable-diffusion" */, BA1E84212952ED66001701EA /* XCRemoteSwiftPackageReference "ml-stable-diffusion" */,
); );
productRefGroup = BA03C375293D785C001426DE /* Products */; productRefGroup = BA03C375293D785C001426DE /* Products */;
projectDirPath = ""; projectDirPath = "";
@ -305,7 +305,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_ASSET_PATHS = "\"imggensd2/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"imggensd2/Preview Content\"";
DEVELOPMENT_TEAM = J5CY9Q9UP5; DEVELOPMENT_TEAM = J5CY9Q9UP5;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
@ -321,7 +321,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.3; MARKETING_VERSION = 1.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.atarayosd.imggensd2; PRODUCT_BUNDLE_IDENTIFIER = com.atarayosd.imggensd2;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
@ -336,7 +336,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_ASSET_PATHS = "\"imggensd2/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"imggensd2/Preview Content\"";
DEVELOPMENT_TEAM = J5CY9Q9UP5; DEVELOPMENT_TEAM = J5CY9Q9UP5;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
@ -352,7 +352,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.3; MARKETING_VERSION = 1.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.atarayosd.imggensd2; PRODUCT_BUNDLE_IDENTIFIER = com.atarayosd.imggensd2;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
@ -385,9 +385,9 @@
/* End XCConfigurationList section */ /* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */ /* Begin XCRemoteSwiftPackageReference section */
BA01CAE7294C92FB00C89D87 /* XCRemoteSwiftPackageReference "ml-stable-diffusion" */ = { BA1E84212952ED66001701EA /* XCRemoteSwiftPackageReference "ml-stable-diffusion" */ = {
isa = XCRemoteSwiftPackageReference; isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/apple/ml-stable-diffusion#swift-requirements"; repositoryURL = "https://github.com/apple/ml-stable-diffusion";
requirement = { requirement = {
branch = main; branch = main;
kind = branch; kind = branch;
@ -396,9 +396,9 @@
/* End XCRemoteSwiftPackageReference section */ /* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */ /* Begin XCSwiftPackageProductDependency section */
BA01CAE8294C92FC00C89D87 /* StableDiffusion */ = { BA1E84222952ED66001701EA /* StableDiffusion */ = {
isa = XCSwiftPackageProductDependency; isa = XCSwiftPackageProductDependency;
package = BA01CAE7294C92FB00C89D87 /* XCRemoteSwiftPackageReference "ml-stable-diffusion" */; package = BA1E84212952ED66001701EA /* XCRemoteSwiftPackageReference "ml-stable-diffusion" */;
productName = StableDiffusion; productName = StableDiffusion;
}; };
/* End XCSwiftPackageProductDependency section */ /* End XCSwiftPackageProductDependency section */

6
imggensd2.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Unescape View File

@ -1,12 +1,12 @@
{ {
"pins" : [ "pins" : [
{ {
"identity" : "ml-stable-diffusion#swift-requirements", "identity" : "ml-stable-diffusion",
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/apple/ml-stable-diffusion#swift-requirements", "location" : "https://github.com/apple/ml-stable-diffusion",
"state" : { "state" : {
"branch" : "main", "branch" : "main",
"revision" : "66dde8da135593eccef7bbb3a329ccf7bb1724d3" "revision" : "c90b705334c3807f4f4042cbb351b59cbe5c6f7b"
} }
}, },
{ {

24
imggensd2/ContentView.swift
Unescape View File

@ -8,9 +8,17 @@
import SwiftUI import SwiftUI
struct ContentView: View { struct ContentView: View {
static let prompt = "a photo of an astronaut riding a horse on mars"
static let negativePrompt =
"""
lowres, bad anatomy, bad hands, text, error, missing fingers, extra digit, fewer digits,
cropped, worst quality, low quality, normal quality, jpeg artifacts, blurry, multiple legs, malformation
"""
@StateObject var imageGenerator = ImageGenerator() @StateObject var imageGenerator = ImageGenerator()
@State private var generationParameter = @State private var generationParameter =
ImageGenerator.GenerationParameter(prompt: "a photo of an astronaut riding a horse on mars", ImageGenerator.GenerationParameter(prompt: prompt,
negativePrompt: negativePrompt,
seed: 100, stepCount: 20, seed: 100, stepCount: 20,
imageCount: 1, disableSafety: false) imageCount: 1, disableSafety: false)
var body: some View { var body: some View {
@ -46,19 +54,23 @@ struct ContentView: View {
} }
} }
// struct ContentView_Previews: PreviewProvider { struct ContentView_Previews: PreviewProvider {
// static var previews: some View { static var previews: some View {
// ContentView() ContentView()
// } }
// } }
struct PromptView: View { struct PromptView: View {
@Binding var parameter: ImageGenerator.GenerationParameter @Binding var parameter: ImageGenerator.GenerationParameter
var body: some View { var body: some View {
VStack { VStack {
HStack { Text("Prompt:"); Spacer() }
TextField("Prompt:", text: $parameter.prompt) TextField("Prompt:", text: $parameter.prompt)
.textFieldStyle(RoundedBorderTextFieldStyle()) .textFieldStyle(RoundedBorderTextFieldStyle())
HStack { Text("Negative Prompt:"); Spacer() }
TextField("Negative Prompt:", text: $parameter.negativePrompt)
.textFieldStyle(RoundedBorderTextFieldStyle())
Stepper(value: $parameter.imageCount, in: 1...10) { Stepper(value: $parameter.imageCount, in: 1...10) {
Text("Image Count: \(parameter.imageCount)") Text("Image Count: \(parameter.imageCount)")
} }

9
imggensd2/ImageGenerator.swift
Unescape View File

@ -13,6 +13,7 @@ import CoreML
final class ImageGenerator: ObservableObject { final class ImageGenerator: ObservableObject {
struct GenerationParameter { struct GenerationParameter {
var prompt: String var prompt: String
var negativePrompt: String
var seed: Int var seed: Int
var stepCount: Int var stepCount: Int
var imageCount: Int var imageCount: Int
@ -26,6 +27,7 @@ final class ImageGenerator: ObservableObject {
struct GeneratedImages { struct GeneratedImages {
let prompt: String let prompt: String
let negativePrompt: String
let imageCount: Int let imageCount: Int
let stepCount: Int let stepCount: Int
let seed: Int let seed: Int
@ -50,6 +52,8 @@ final class ImageGenerator: ObservableObject {
@Published var generationState: GenerationState = .idle @Published var generationState: GenerationState = .idle
@Published var generatedImages: GeneratedImages? @Published var generatedImages: GeneratedImages?
@Published var isPipelineCreated = false
private var sdPipeline: StableDiffusionPipeline? private var sdPipeline: StableDiffusionPipeline?
init() { init() {
@ -61,6 +65,7 @@ final class ImageGenerator: ObservableObject {
func setPipeline(_ pipeline: StableDiffusionPipeline) { // for actor isolation func setPipeline(_ pipeline: StableDiffusionPipeline) { // for actor isolation
sdPipeline = pipeline sdPipeline = pipeline
isPipelineCreated = true
} }
func setGeneratedImages(_ images: GeneratedImages) { // for actor isolation func setGeneratedImages(_ images: GeneratedImages) { // for actor isolation
@ -102,9 +107,10 @@ final class ImageGenerator: ObservableObject {
// https://github.com/ynagatomo/ARDiffMuseum // https://github.com/ynagatomo/ARDiffMuseum
// It handles the progressHandler and displays the generating images step by step. // It handles the progressHandler and displays the generating images step by step.
let cgImages = try sdPipeline.generateImages(prompt: parameter.prompt, let cgImages = try sdPipeline.generateImages(prompt: parameter.prompt,
negativePrompt: parameter.negativePrompt,
imageCount: parameter.imageCount, imageCount: parameter.imageCount,
stepCount: parameter.stepCount, stepCount: parameter.stepCount,
seed: parameter.seed, seed: UInt32(parameter.seed),
disableSafety: parameter.disableSafety) disableSafety: parameter.disableSafety)
print("images were generated.") print("images were generated.")
let uiImages = cgImages.compactMap { image in let uiImages = cgImages.compactMap { image in
@ -112,6 +118,7 @@ final class ImageGenerator: ObservableObject {
} else { return nil } } else { return nil }
} }
await self.setGeneratedImages(GeneratedImages(prompt: parameter.prompt, await self.setGeneratedImages(GeneratedImages(prompt: parameter.prompt,
negativePrompt: parameter.negativePrompt,
imageCount: parameter.imageCount, imageCount: parameter.imageCount,
stepCount: parameter.stepCount, stepCount: parameter.stepCount,
seed: parameter.seed, seed: parameter.seed,

Write Preview
Loading…
Cancel
Save