Supported tta mode and updated ncnn to be3f978

Signed-off-by: Cocoa <[email protected]>

Author: BlueCocoa

README.md

@@ -98,7 +98,6 @@ which cmake
 sudo "/Applications/CMake.app/Contents/bin/cmake-gui" --install
 
 # build ncnn
-cp -f waifu2x-ncnn-vulkan-macos/waifu2x/CMakeLists-waifu2x-ncnn-vulkan.txt ncnn/CMakeLists.txt
 rm -rf ncnn/build && mkdir -p ncnn/build && pushd ncnn/build
 cmake -DNCNN_VULKAN=ON -D CMAKE_BUILD_TYPE=Release ..
 make -j`sysctl -n hw.ncpu` && make install

waifu2x.xcodeproj/project.pbxproj

@@ -484,7 +484,7 @@
 					"$(PROJECT_DIR)/waifu2x/ncnn/lib",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 1.4;
+				MARKETING_VERSION = 1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "moe.cocoaneko.waifu2x-gui";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRINGS_FILE_OUTPUT_ENCODING = "UTF-8";
@@ -522,7 +522,7 @@
 					"$(PROJECT_DIR)/waifu2x/ncnn/lib",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 1.4;
+				MARKETING_VERSION = 1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "moe.cocoaneko.waifu2x-gui";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRINGS_FILE_OUTPUT_ENCODING = "UTF-8";

waifu2x/Base.lproj/Main.storyboard

@@ -70,6 +70,8 @@ set(SHADER_SPV_HEX_FILES)
 
 compile_shader(waifu2x_preproc.comp)
 compile_shader(waifu2x_postproc.comp)
+compile_shader(waifu2x_preproc_tta.comp)
+compile_shader(waifu2x_postproc_tta.comp)
 
 add_custom_target(generate-spirv DEPENDS ${SHADER_SPV_HEX_FILES})
 

waifu2x/CMakeLists-waifu2x-ncnn-vulkan.txt

@@ -32,6 +32,7 @@
 @property (weak) IBOutlet NSTabView *processingModeTab;
 @property (weak) IBOutlet DragDropTableView *multipleImageTableView;
 @property (weak) IBOutlet NSButton *startButton;
+@property (weak) IBOutlet NSButton *ttaModeButton;
 
 @end
 

waifu2x/ViewController.h

@@ -39,6 +39,7 @@ @implementation ViewController
 @synthesize vramStaticticsLabel;
 @synthesize processingModeTab;
 @synthesize multipleImageTableView;
+@synthesize ttaModeButton;
 
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -226,9 +227,10 @@ - (NSArray *)generateOutputPaths:(NSArray *)inputpaths {
 - (void)benchmark {
     __block NSMutableArray * result = [[NSMutableArray alloc] init];
 
-    int noise = 2;
-    int scale = 2;
+    int noise = self.noiseParameter.intValue;
+    int scale = self.scaleParameter.intValue;
     int gpuID = self.gpus[self.gpuIDButton.indexOfSelectedItem].deviceID;
+    BOOL enableTTAMode = self.ttaModeButton.state == NSControlStateValueOn;
     NSArray * models = @[@"models-cunet", @"models-upconv_7_anime_style_art_rgb"];
     NSArray<NSNumber *> * tilesizes = @[@(400), @(200), @(100)];
     NSArray<NSNumber *> * inputSizes = @[@(200), @(400), @(1000), @(2000), @(4000)];
@@ -266,6 +268,7 @@ - (void)benchmark {
                              tilesize:tsize
                                 model:model
                                 gpuid:gpuID
+                             tta_mode:enableTTAMode
                          load_job_num:1
                          proc_job_num:1
                          save_job_num:1
@@ -318,6 +321,7 @@ - (void)benchmark {
             for (NSString * p in result) {
                 [resultString appendFormat:@"%@\n", p];
             }
+            [resultString appendFormat:@"\nnoise: %d, scale: %d, gpuid: %d, tta mode: %@\n", noise, scale, gpuID, enableTTAMode ? @"YES" : @"NO"];
             [alert setInformativeText:resultString];
             [alert setAlertStyle:NSAlertStyleInformational];
             [alert beginSheetModalForWindow:[self view].window completionHandler:^(NSModalResponse returnCode) {
@@ -353,6 +357,7 @@ - (IBAction)waifu2x:(NSButton *)sender {
     int save_jobs = self.savingJobsParameter.intValue;
     NSString * model = [NSString stringWithFormat:@"models-%@", [self.modelButton selectedItem].title];
     int gpuID = self.gpus[self.gpuIDButton.indexOfSelectedItem].deviceID;
+    BOOL enableTTAMode = self.ttaModeButton.state == NSControlStateValueOn;
     BOOL isSingleMode = true;
 
     NSArray<NSString *> * inputpaths = nil;
@@ -393,6 +398,7 @@ - (IBAction)waifu2x:(NSButton *)sender {
                                     tilesize:tilesize
                                        model:model
                                        gpuid:gpuID
+                                    tta_mode:enableTTAMode
                                 load_job_num:load_jobs
                                 proc_job_num:proc_jobs
                                 save_job_num:save_jobs
@@ -406,18 +412,18 @@ - (IBAction)waifu2x:(NSButton *)sender {
         }];
 
         self.isProcessing = NO;
-        [self allowUserIntereaction:YES];
 
-        if (isSingleMode) {
-            dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self allowUserIntereaction:YES];
+            if (isSingleMode) {
                 if (!result) {
                     return;
                 }
 
                 [self.outputImageView setImage:result];
                 unlink(outputpaths[0].UTF8String);
-            });
-        }
+            }
+        });
     });
 }
 

waifu2x/ViewController.mm

@@ -21,6 +21,7 @@ typedef void (^waifu2xProgressBlock)(int current, int total, NSString * descript
           tilesize:(int)tilesize
              model:(NSString *)model
              gpuid:(int)gpuid
+          tta_mode:(BOOL)enable_tta_mode
       load_job_num:(int)jobs_load
       proc_job_num:(int)jobs_proc
       save_job_num:(int)jobs_save

waifu2x/waifu2xmac.h

@@ -244,6 +244,7 @@ + (NSImage *)input:(NSArray<NSString *> *)inputpaths
           tilesize:(int)tilesize
              model:(NSString *)model
              gpuid:(int)gpuid
+          tta_mode:(BOOL)enable_tta_mode
       load_job_num:(int)jobs_load
       proc_job_num:(int)jobs_proc
       save_job_num:(int)jobs_save
@@ -362,7 +363,7 @@ + (NSImage *)input:(NSArray<NSString *> *)inputpaths
     }
 
     {
-        Waifu2x waifu2x(gpuid);
+        Waifu2x waifu2x(gpuid, enable_tta_mode);
 
         if (cb) cb(4, total, NSLocalizedString(@"Loading models...", @""));
         waifu2x.load([parampath UTF8String], [modelpath UTF8String]);