fix reset-assets, adjust realsr-ncnn log printing, finetune realsr-ncnn tilesize for Snapdragon

Author: tumuyan

RealSR-NCNN-Android-CLI/RealSR/src/main/jni/main.cpp

@@ -848,6 +848,7 @@ int main(int argc, char **argv)
         return -1;
     }
 
+    std::cout << "build time: " << __DATE__ << " " << __TIME__ << std::endl;
 
     int scales[] = {4, 2, 1, 8};
     int sp = 0;
@@ -970,6 +971,8 @@ int main(int argc, char **argv)
         }
 
         uint32_t heap_budget = ncnn::get_gpu_device(gpuid[i])->get_heap_budget();
+        const char* gpu_name = ncnn::get_gpu_info(i).device_name();
+        const bool is_adreno = nullptr != strstr(gpu_name, "Adreno");
 
         // more fine-grained tilesize policy here
         if (model.find(PATHSTR("models-Real-ESRGANv")) != path_t::npos) {
@@ -979,13 +982,17 @@ int main(int argc, char **argv)
                 tilesize[i] = 200;
             else if (heap_budget > 550)
                 tilesize[i] = 100;
-            else if (heap_budget > 190)
+            else if (heap_budget > 200)
                 tilesize[i] = 64;
             else
                 tilesize[i] = 32;
         } else {
-            if (heap_budget > 2800)
-                tilesize[i] = 200;
+            if (heap_budget > 2800) {
+                if(is_adreno)
+                    tilesize[i] = 160;
+                else
+                    tilesize[i] = 200;
+            }
             else if (heap_budget > 900)
                 tilesize[i] = 100;
             else if (heap_budget > 300)

RealSR-NCNN-Android-CLI/RealSR/src/main/jni/realsr.cpp

@@ -48,9 +48,9 @@ int RealSR::load(const std::wstring& parampath, const std::wstring& modelpath)
 int RealSR::load(const std::string& parampath, const std::string& modelpath)
 #endif
 {
-    net.opt.use_vulkan_compute = vkdev ? true : false;
+    net.opt.use_vulkan_compute = vkdev != nullptr;
     net.opt.use_fp16_packed = true;
-    net.opt.use_fp16_storage = vkdev ? true : false;
+    net.opt.use_fp16_storage = vkdev != nullptr;
     net.opt.use_fp16_arithmetic = false;
     net.opt.use_int8_storage = true;
 
@@ -205,6 +205,8 @@ int RealSR::process(const ncnn::Mat& inimage, ncnn::Mat& outimage) const
 
     const size_t in_out_tile_elemsize = opt.use_fp16_storage ? 2u : 4u;
     high_resolution_clock::time_point begin = high_resolution_clock::now();
+    high_resolution_clock::time_point time_print_progress;
+
 
     //#pragma omp parallel for num_threads(2)
     for (int yi = 0; yi < ytiles; yi++)
@@ -337,10 +339,13 @@ int RealSR::process(const ncnn::Mat& inimage, ncnn::Mat& outimage) const
                 {
                     ncnn::Extractor ex = net.create_extractor();
 
+
+
                     ex.set_blob_vkallocator(blob_vkallocator);
                     ex.set_workspace_vkallocator(blob_vkallocator);
                     ex.set_staging_vkallocator(staging_vkallocator);
 
+
                     ex.input("data", in_tile_gpu[ti]);
 
                     ex.extract("output", out_tile_gpu[ti], cmd);
@@ -522,16 +527,21 @@ int RealSR::process(const ncnn::Mat& inimage, ncnn::Mat& outimage) const
                 }
             }
 
-            if (xtiles > 1)
-            {
+            if (xtiles > 1) {
                 cmd.submit_and_wait();
                 cmd.reset();
             }
             high_resolution_clock::time_point end = high_resolution_clock::now();
-            double time_span = duration_cast<duration<double>>(end - begin).count();
-            double progress = (float)(yi * xtiles + xi +1) / (ytiles * xtiles);
-            fprintf(stderr, "%5.2f%%\t[%5.2fs /%5.2f ETA]\n", progress * 100, time_span, time_span / progress - time_span);
-
+            float time_span_print_progress = duration_cast<duration<double>>(
+                    end - time_print_progress).count();
+            float progress_tile = (float) (yi * xtiles + xi + 1);
+            if (time_span_print_progress > 0.5 || (yi + 1 == ytiles && xi + 3 > xtiles)) {
+                double progress = progress_tile / (ytiles * xtiles);
+                double time_span = duration_cast<duration<double>>(end - begin).count();
+                fprintf(stderr, "%5.2f%%\t[%5.2fs /%5.2f ETA]\n", progress * 100, time_span,
+                        time_span / progress - time_span);
+                time_print_progress = end;
+            }
         }
 
         // download
@@ -598,6 +608,9 @@ int RealSR::process_cpu(const ncnn::Mat& inimage, ncnn::Mat& outimage) const
         int in_tile_y0 = std::max(yi * TILE_SIZE_Y - prepadding, 0);
         int in_tile_y1 = std::min((yi + 1) * TILE_SIZE_Y + prepadding, h);
 
+        high_resolution_clock::time_point begin = high_resolution_clock::now();
+        high_resolution_clock::time_point time_print_progress;
+
         for (int xi = 0; xi < xtiles; xi++)
         {
             const int tile_w_nopad = std::min((xi + 1) * TILE_SIZE_X, w) - xi * TILE_SIZE_X;
@@ -900,6 +913,18 @@ int RealSR::process_cpu(const ncnn::Mat& inimage, ncnn::Mat& outimage) const
 #endif
                 }
             }
+
+            high_resolution_clock::time_point end = high_resolution_clock::now();
+            float time_span_print_progress = duration_cast<duration<double>>(
+                    end - time_print_progress).count();
+            float progress_tile = (float) (yi * xtiles + xi + 1);
+            if (time_span_print_progress > 0.5 || (yi + 1 == ytiles && xi + 3 > xtiles)) {
+                double progress = progress_tile / (ytiles * xtiles);
+                double time_span = duration_cast<duration<double>>(end - begin).count();
+                fprintf(stderr, "%5.2f%%\t[%5.2fs /%5.2f ETA]\n", progress * 100, time_span,
+                        time_span / progress - time_span);
+                time_print_progress = end;
+            }
         }
     }
 

RealSR-NCNN-Android-GUI/app/build.gradle

@@ -39,6 +39,9 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
     namespace 'com.tumuyan.ncnn.realsr'
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {

RealSR-NCNN-Android-GUI/app/src/main/java/com/tumuyan/ncnn/realsr/AssetsCopyer.java

@@ -23,14 +23,14 @@ public static void releaseAssets(Context context, String assetsDir,
 //		Log.d(TAG, "context: " + context + ", " + assetsDir);
         if (TextUtils.isEmpty(releaseDir)) {
             return;
-        } else if (releaseDir.endsWith("/")) {
-            releaseDir = releaseDir.substring(0, releaseDir.length() - 1);
         }
 
+        releaseDir = releaseDir.replaceFirst("/+$","");
+
         if (TextUtils.isEmpty(assetsDir) || assetsDir.equals("/")) {
             assetsDir = "";
-        } else if (assetsDir.endsWith("/")) {
-            assetsDir = assetsDir.substring(0, assetsDir.length() - 1);
+        } else {
+            assetsDir = assetsDir.replaceFirst("/+$","");
         }
 
         AssetManager assets = context.getAssets();
@@ -74,6 +74,8 @@ private static boolean writeFile(String fileName, InputStream in, boolean skipEx
                 if (skipExistFile) {
                     Log.d(TAG, "skip file: " + fileName);
                     return bRet;
+                }else{
+                    file.delete();
                 }
             } else if (!file.getParentFile().exists()) {
                 file.getParentFile().mkdirs();

RealSR-NCNN-Android-GUI/app/src/main/java/com/tumuyan/ncnn/realsr/MainActivity.java

@@ -43,7 +43,6 @@
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 
 import java.io.BufferedReader;
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -73,7 +72,7 @@ public class MainActivity extends AppCompatActivity {
             Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM)
                     + File.separator + "RealSR";
     private File outputFile, inputFile, titleFile;
-    private String dir;
+    private String dir, cache_dir;
     // dir="/data/data/com.tumuyan.ncnn.realsr/cache/realsr";
     private String modelName = "SR";
     private SearchView searchView;
@@ -203,7 +202,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
                 append_param += (" -g -1");
 
             append_param += ";";
-            q = "rm *.png; rm *.png/*; rmdir *.png;" + bench_mark_commands[0] + append_param + bench_mark_commands[1] + append_param;
+            q = "rm -rf *.png; ls *.png; " + bench_mark_commands[0] + append_param + bench_mark_commands[1] + append_param;
 
             imageName = "/img/realsr.png";
             bench_mark_mode = true;
@@ -220,7 +219,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
             boolean final_bench_mark_mode = bench_mark_mode;
             new Thread(() -> {
                 if (q == CMD_RESET_CACHE) {
-                    AssetsCopyer.releaseAssets(this, "realsr", dir, false);
+                    AssetsCopyer.releaseAssets(this, "realsr", cache_dir, false);
                 }
                 run20(q, final_bench_mark_mode);
                 final File finalfile = new File(dir + finalImageName);
@@ -612,11 +611,8 @@ protected void onCreate(Bundle savedInstanceState) {
         String defaultCommand = mySharePerferences.getString("defaultCommand", "");
         searchView.setQuery(defaultCommand, false);
 
-        dir = this.getCacheDir().getAbsolutePath();
-        AssetsCopyer.releaseAssets(this,
-                "realsr", dir
-                , version == BuildConfig.VERSION_CODE
-        );
+        cache_dir = this.getCacheDir().getAbsolutePath();
+        AssetsCopyer.releaseAssets(this, "realsr", cache_dir, version == BuildConfig.VERSION_CODE);
 
         SharedPreferences.Editor editor = mySharePerferences.edit();
         editor.putInt("version", BuildConfig.VERSION_CODE);
@@ -633,7 +629,7 @@ else if (orientation == 3) {
         }
 
 
-        dir = dir + "/realsr";
+        dir = cache_dir + "/realsr";
 
         outputFile = new File(dir, "output.png");
         inputFile = new File(dir, "input.png");

RealSR-NCNN-Android-GUI/gradle.properties

@@ -19,5 +19,4 @@ android.useAndroidX=true
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false