Skip to content
This repository was archived by the owner on Nov 27, 2024. It is now read-only.

Commit e06cf41

Browse files
saddam213saddam213
committed
Wrap and simplify Image input
1 parent bf4315f commit e06cf41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+556
-941
lines changed

‎OnnxStack.Console/Examples/ControlNetExample.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public ControlNetExample(StableDiffusionConfig configuration)
3232
public async Task RunAsync()
3333
{
3434
// Load Control Image
35-
var controlImage = await InputImage.FromFileAsync("D:\\Repositories\\OnnxStack\\Assets\\Samples\\OpenPose.png");
35+
var controlImage = await OnnxImage.FromFileAsync("D:\\Repositories\\OnnxStack\\Assets\\Samples\\OpenPose.png");
3636

3737
// Create ControlNet
3838
var controlNet = ControlNetModel.Create("D:\\Repositories\\controlnet_onnx\\controlnet\\openpose.onnx");
@@ -54,11 +54,11 @@ public async Task RunAsync()
5454
var result = await pipeline.RunAsync(promptOptions, controlNet: controlNet, progressCallback: OutputHelpers.ProgressCallback);
5555

5656
// Create Image from Tensor result
57-
var image = result.ToImage();
57+
var image = new OnnxImage(result);
5858

5959
// Save Image File
6060
var outputFilename = Path.Combine(_outputDirectory, $"Output.png");
61-
await image.SaveAsPngAsync(outputFilename);
61+
await image.SaveAsync(outputFilename);
6262

6363
//Unload
6464
await controlNet.UnloadAsync();

‎OnnxStack.Console/Examples/ControlNetFeatureExample.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public ControlNetFeatureExample(StableDiffusionConfig configuration)
3232
public async Task RunAsync()
3333
{
3434
// Load Control Image
35-
var inputImage = await InputImage.FromFileAsync("D:\\Repositories\\OnnxStack\\Assets\\Samples\\Img2Img_Start.bmp");
35+
var inputImage = await OnnxImage.FromFileAsync("D:\\Repositories\\OnnxStack\\Assets\\Samples\\Img2Img_Start.bmp");
3636

3737
// Create Annotation pipeline
3838
var annotationPipeline = FeatureExtractorPipeline.CreatePipeline("D:\\Repositories\\controlnet_onnx\\annotators\\depth.onnx", true);
@@ -41,7 +41,7 @@ public async Task RunAsync()
4141
var controlImage = await annotationPipeline.RunAsync(inputImage);
4242

4343
// Save Depth Image (Debug Only)
44-
await controlImage.Image.SaveAsPngAsync(Path.Combine(_outputDirectory, $"Depth.png"));
44+
await controlImage.SaveAsync(Path.Combine(_outputDirectory, $"Depth.png"));
4545

4646
// Create ControlNet
4747
var controlNet = ControlNetModel.Create("D:\\Repositories\\controlnet_onnx\\controlnet\\depth.onnx");
@@ -61,11 +61,11 @@ public async Task RunAsync()
6161
var result = await pipeline.RunAsync(promptOptions, controlNet: controlNet, progressCallback: OutputHelpers.ProgressCallback);
6262

6363
// Create Image from Tensor result
64-
var image = result.ToImage();
64+
var image = new OnnxImage(result);
6565

6666
// Save Image File
6767
var outputFilename = Path.Combine(_outputDirectory, $"Output.png");
68-
await image.SaveAsPngAsync(outputFilename);
68+
await image.SaveAsync(outputFilename);
6969

7070
//Unload
7171
await annotationPipeline.UnloadAsync();

‎OnnxStack.Console/Examples/FeatureExtractorExample.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public FeatureExtractorExample(StableDiffusionConfig configuration)
3030
public async Task RunAsync()
3131
{
3232
// Load Control Image
33-
var inputImage = await InputImage.FromFileAsync("D:\\Repositories\\OnnxStack\\Assets\\Samples\\Img2Img_Start.bmp");
33+
var inputImage = await OnnxImage.FromFileAsync("D:\\Repositories\\OnnxStack\\Assets\\Samples\\Img2Img_Start.bmp");
3434

3535
var pipelines = new[]
3636
{
@@ -53,7 +53,7 @@ public async Task RunAsync()
5353
OutputHelpers.WriteConsole($"Generating image", ConsoleColor.Cyan);
5454

5555
// Save Image
56-
await imageFeature.Image.SaveAsPngAsync(Path.Combine(_outputDirectory, $"{pipeline.Name}.png"));
56+
await imageFeature.SaveAsync(Path.Combine(_outputDirectory, $"{pipeline.Name}.png"));
5757

5858

5959
OutputHelpers.WriteConsole($"Unload pipeline", ConsoleColor.Cyan);

‎OnnxStack.Console/Examples/StableDebug.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ public async Task RunAsync()
6969
var result = await pipeline.RunAsync(promptOptions, schedulerOptions, progressCallback: OutputHelpers.ProgressCallback);
7070

7171
// Create Image from Tensor result
72-
var image = result.ToImage();
72+
var image = new OnnxImage(result);
7373

7474
// Save Image File
7575
var outputFilename = Path.Combine(_outputDirectory, $"{modelSet.Name}_{schedulerOptions.SchedulerType}.png");
76-
await image.SaveAsPngAsync(outputFilename);
76+
await image.SaveAsync(outputFilename);
7777

7878
OutputHelpers.WriteConsole($"{schedulerOptions.SchedulerType} Image Created: {Path.GetFileName(outputFilename)}", ConsoleColor.Green);
7979
OutputHelpers.WriteConsole($"Elapsed: {Stopwatch.GetElapsedTime(timestamp)}ms", ConsoleColor.Yellow);

‎OnnxStack.Console/Examples/StableDiffusionBatch.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ public async Task RunAsync()
6161
await foreach (var result in pipeline.RunBatchAsync(batchOptions, promptOptions, progressCallback: OutputHelpers.BatchProgressCallback))
6262
{
6363
// Create Image from Tensor result
64-
var image = result.ImageResult.ToImage();
64+
var image = result.ImageResult;
6565

6666
// Save Image File
6767
var outputFilename = Path.Combine(_outputDirectory, $"{modelSet.Name}_{result.SchedulerOptions.Seed}.png");
68-
await image.SaveAsPngAsync(outputFilename);
68+
await image.SaveAsync(outputFilename);
6969

7070
OutputHelpers.WriteConsole($"Image Created: {Path.GetFileName(outputFilename)}, Elapsed: {Stopwatch.GetElapsedTime(timestamp)}ms", ConsoleColor.Green);
7171
timestamp = Stopwatch.GetTimestamp();

‎OnnxStack.Console/Examples/StableDiffusionExample.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ public async Task RunAsync()
7070
var result = await pipeline.RunAsync(promptOptions, schedulerOptions, progressCallback: OutputHelpers.ProgressCallback);
7171

7272
// Create Image from Tensor result
73-
var image = result.ToImage();
73+
var image = new OnnxImage(result);
7474

7575
// Save Image File
7676
var outputFilename = Path.Combine(_outputDirectory, $"{modelSet.Name}_{schedulerOptions.SchedulerType}.png");
77-
await image.SaveAsPngAsync(outputFilename);
77+
await image.SaveAsync(outputFilename);
7878

7979
OutputHelpers.WriteConsole($"Image Created: {Path.GetFileName(outputFilename)}, Elapsed: {Stopwatch.GetElapsedTime(timestamp)}ms", ConsoleColor.Green);
8080
}

‎OnnxStack.Console/Examples/StableDiffusionGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ public async Task RunAsync()
5858
var result = await pipeline.RunAsync(promptOptions, progressCallback: OutputHelpers.ProgressCallback);
5959

6060
// Create Image from Tensor result
61-
var image = result.ToImage();
61+
var image = new OnnxImage(result);
6262

6363
// Save Image File
6464
var outputFilename = Path.Combine(_outputDirectory, $"{modelSet.Name}_{generationPrompt.Key}.png");
65-
await image.SaveAsPngAsync(outputFilename);
65+
await image.SaveAsync(outputFilename);
6666

6767
OutputHelpers.WriteConsole($"Image Created: {Path.GetFileName(outputFilename)}, Elapsed: {Stopwatch.GetElapsedTime(timestamp)}ms", ConsoleColor.Green);
6868
}

‎OnnxStack.Console/Examples/UpscaleExample.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public UpscaleExample(ImageUpscalerConfig configuration)
2626
public async Task RunAsync()
2727
{
2828
// Load Input Image
29-
var inputImage = await InputImage.FromFileAsync("D:\\Repositories\\OnnxStack\\Assets\\Samples\\Img2Img_Start.bmp");
29+
var inputImage = await OnnxImage.FromFileAsync("D:\\Repositories\\OnnxStack\\Assets\\Samples\\Img2Img_Start.bmp");
3030

3131
// Create Pipeline
3232
var pipeline = ImageUpscalePipeline.CreatePipeline("D:\\Repositories\\upscaler\\SwinIR\\003_realSR_BSRGAN_DFO_s64w8_SwinIR-M_x4_GAN.onnx", 4);
@@ -35,11 +35,11 @@ public async Task RunAsync()
3535
var result = await pipeline.RunAsync(inputImage);
3636

3737
// Create Image from Tensor result
38-
var image = result.ToImage(ImageNormalizeType.ZeroToOne);
38+
var image = new OnnxImage(result, ImageNormalizeType.ZeroToOne);
3939

4040
// Save Image File
4141
var outputFilename = Path.Combine(_outputDirectory, $"Upscaled.png");
42-
await image.SaveAsPngAsync(outputFilename);
42+
await image.SaveAsync(outputFilename);
4343

4444
// Unload
4545
await pipeline.UnloadAsync();

0 commit comments

Comments
 (0)