update mnnsr

Author: tumuyan

.gitignore

@@ -12,3 +12,8 @@
 /RealSR-NCNN-Android-CLI/MNN-SR/src/main/jni/.vs/jni
 /RealSR-NCNN-Android-CLI/MNN-SR/src/main/jni/.vs
 /RealSR-NCNN-Android-CLI/MNN-SR/src/main/jni/out
+RealSR-NCNN-Android-GUI/.idea/CopilotChatHistory.xml
+RealSR-NCNN-Android-GUI/.idea/easycode.ignore
+RealSR-NCNN-Android-GUI/.idea/misc.xml
+RealSR-NCNN-Android-GUI/.idea/easycode/codebase-v2.xml
+/RealSR-NCNN-Android-GUI/.idea/easycode

README.md

@@ -39,6 +39,7 @@ RealSR-NCNN-Android-GUI could load extra models from sdcard automatily in ver 1.
 refer to https://mnn-docs.readthedocs.io/en/latest/tools/convert.html , you could convert ONNX, TFLITE, TorchScript, Tensorflow models to mnn format.
 1. `pip install mnn`
 2. (for example, convert onnx to mnn) `MNNConvert -f ONNX  --modelFile "{onnx_path}" --MNNModel "{mnn_path}"  --bizCode biz --fp16  --info  --detectSparseSpeedUp`
+3. modify mnn model filename, contains scale info just like`4xabcdefg.mnn` `abc-x4-def.mnn` or `abc_4x_def.mnn`, copy to your custom model folder.
 
 
 ### Convert pth models to ncnn format by yourself

README_CHS.md

@@ -51,7 +51,7 @@
 转换模型的方法可以参考 https://mnn-docs.readthedocs.io/en/latest/tools/convert.html 模型转换工具能够将其他格式的模型（如：ONNX, TFLITE, TorchScript, Tensorflow等）转换为MNN模型
 1. （首先确认你已经安装了Python环境）`pip install mnn`
 2. （举例转换onnx模型到mnn格式）直接输入命令 `MNNConvert -f ONNX  --modelFile "{onnx_path}" --MNNModel "{mnn_path}"  --bizCode biz --fp16  --info  --detectSparseSpeedUp`
-
+3. 修改mnn模型文件名，使包含缩放倍率信息，如：`4xabcdefg.mnn`或者`abc-x4-def.mnn`或者者`abc_4x_def.mnn`，并复制mnn模型到设置的自定义模型目录中。
 
 ## 为 RealSR-NCNN-Android-GUI 增加更多ncnn模型
 RealSR-NCNN-Android-GUI 在 ver 1.7.6 以上的版本可以自动加载自定义模型。

RealSR-NCNN-Android-CLI/MNN-SR/src/main/jni/CMakeLists.txt

@@ -1,44 +1,43 @@
 project(mnnsr-ncnn)
 
 cmake_minimum_required(VERSION 3.4.1)
-#set(CMAKE_CXX_STANDARD 20)
-#set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_BUILD_TYPE Debug)
 #set(CMAKE_BUILD_TYPE Release)
 
 
-
-if(MSVC)  # Visual Studio
+if (MSVC)  # Visual Studio
     message(STATUS "==Configuring for Visual Studio==")
 
-    if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
+    if ("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
         set(TARGET_ARCH "x64")
-    elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64")
+    elseif ("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64")
         set(TARGET_ARCH "ARM64")
-    elseif("${CMAKE_GENERATOR}" MATCHES "ARM")
+    elseif ("${CMAKE_GENERATOR}" MATCHES "ARM")
         set(TARGET_ARCH "ARM")
-    elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+    elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
         set(TARGET_ARCH "x64")
-    else()
+    else ()
         set(TARGET_ARCH x86)
-    endif()
+    endif ()
 
     # 设置目标属性，指定 MNN 库的路径
     set(mnn_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../3rdparty/mnn_windows_x64_cpu_opencl)
     find_library(MNN_LIB mnn HINTS "${mnn_DIR}/lib/${TARGET_ARCH}/Release/Dynamic/MD")
 
-#    add_library(MNN_Vulkan SHARED IMPORTED)
-#    set_target_properties(MNN_Vulkan PROPERTIES IMPORTED_LOCATION
-#            ${mnn_DIR}/${ANDROID_ABI}/libMNN_Vulkan.so)
+    #    add_library(MNN_Vulkan SHARED IMPORTED)
+    #    set_target_properties(MNN_Vulkan PROPERTIES IMPORTED_LOCATION
+    #            ${mnn_DIR}/${ANDROID_ABI}/libMNN_Vulkan.so)
 
     set(OpenCV_DIR "C:/Lib/opencv/build")
-    
+
     set(ncnn_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../3rdparty/ncnn-windows-vs2022-shared)
     find_library(NCNN_LIB ncnn HINTS ${ncnn_DIR}/${TARGET_ARCH}/lib)
- #  set(ncnn_LIB ${ncnn_DIR}/${TARGET_ARCH}/lib/ncnn.lib)
+    #  set(ncnn_LIB ${ncnn_DIR}/${TARGET_ARCH}/lib/ncnn.lib)
 
 
-else()  # Android Studio
+else ()  # Android Studio
     message(STATUS "Configuring for Android Studio")
     set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -s -Wall -g -ggdb -Wl,-rpath=./")
     set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wl,-rpath=./")
@@ -47,18 +46,18 @@ else()  # Android Studio
 
     # 设置目标属性，指定 MNN 库的路径
     set(mnn_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../3rdparty/mnn_android)
-    
+
     include_directories(${mnn_DIR}/include)
-#include_directories(${mnn_DIR}/${ANDROID_ABI}/include/MNN)
+    #include_directories(${mnn_DIR}/${ANDROID_ABI}/include/MNN)
     find_library(MNN_LIB mnn HINTS "${mnn_DIR}/${TARGET_ARCH}")
 
     add_library(MNN SHARED IMPORTED)
     set_target_properties(MNN PROPERTIES IMPORTED_LOCATION
             ${mnn_DIR}/${ANDROID_ABI}/libMNN.so)
 
-#    add_library(c++_shared SHARED IMPORTED)
-#    set_target_properties(c++_shared PROPERTIES IMPORTED_LOCATION
-#            ${mnn_DIR}/${ANDROID_ABI}/libc++_shared.so)
+    add_library(c++_shared SHARED IMPORTED)
+    set_target_properties(c++_shared PROPERTIES IMPORTED_LOCATION
+            ${mnn_DIR}/${ANDROID_ABI}/libc++_shared.so)
 
     add_library(MNN_CL SHARED IMPORTED)
     set_target_properties(MNN_CL PROPERTIES IMPORTED_LOCATION
@@ -70,28 +69,21 @@ else()  # Android Studio
 
     set(OpenCV_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../3rdparty/OpenCV-android-sdk/sdk/native/jni/)
     set(ncnn_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../3rdparty/ncnn-android-vulkan-shared)
-#    set(ncnn_LIB ${ncnn_DIR}/${ANDROID_ABI}/lib/libncnn.so)
+    #    set(ncnn_LIB ${ncnn_DIR}/${ANDROID_ABI}/lib/libncnn.so)
 
-endif()
+endif ()
 
 message(STATUS "TARGET_ARCH: ${TARGET_ARCH}")
-
-
-find_package(OpenCV REQUIRED)
-include_directories(${OpenCV_DIR}/include)
-message(STATUS "find opencv result: ${OpenCV_LIBS}")
-
-
 include_directories(${mnn_DIR}/include)
 #include_directories(${mnn_DIR}/${ANDROID_ABI}/include/MNN)
 
 
-if(EXISTS ${MNN_LIB})
+if (EXISTS ${MNN_LIB})
     message(STATUS "find mnn: ${MNN_LIB}")
-else()
+else ()
     message(STATUS "mnn library not found!")
     set(MNN_LIB "${mnn_DIR}/${ANDROID_ABI}/libMNN.so")
-endif()
+endif ()
 message(STATUS "find mnn result: ${MNN_LIB}")
 
 
@@ -101,27 +93,28 @@ include_directories(${ncnn_DIR}/${TARGET_ARCH}/include/ncnn)
 
 
 message(STATUS "find ncnn in: ${ncnn_DIR}/${TARGET_ARCH}/lib")
-find_library(NCNN_LIB NAMES  ncnn libncnn PATHS "${ncnn_DIR}/${TARGET_ARCH}/lib")
-if(EXISTS ${NCNN_LIB})
+find_library(NCNN_LIB NAMES ncnn libncnn PATHS "${ncnn_DIR}/${TARGET_ARCH}/lib")
+if (EXISTS ${NCNN_LIB})
     message(STATUS "Found ncnn: ${NCNN_LIB}")
-else()
+else ()
     message(STATUS "ncnn library not found!")
     set(NCNN_LIB "${ncnn_DIR}/${TARGET_ARCH}/lib/libncnn.so")
-endif()
+endif ()
 message(STATUS "find ncnn result: ${NCNN_LIB}")
 
+find_package(OpenCV REQUIRED)
+include_directories(${OpenCV_DIR}/include)
 
 set(libwebp_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../3rdparty/libwebp)
 
 
-
 #include_directories(${CMAKE_CURRENT_BINARY_DIR})
 option(USE_SYSTEM_WEBP "build with system libwebp" OFF)
-if(NOT USE_SYSTEM_WEBP)
+if (NOT USE_SYSTEM_WEBP)
     # build libwebp library
-    if(NOT EXISTS "${libwebp_DIR}/CMakeLists.txt")
+    if (NOT EXISTS "${libwebp_DIR}/CMakeLists.txt")
         message(FATAL_ERROR "Not find libwebp CMakeLists.txt!")
-    endif()
+    endif ()
 
     option(WEBP_ENABLE_SIMD "" ON)
     option(WEBP_BUILD_ANIM_UTILS "" OFF)
@@ -137,16 +130,16 @@ if(NOT USE_SYSTEM_WEBP)
     option(WEBP_NEAR_LOSSLESS "" OFF)
     option(WEBP_ENABLE_SWAP_16BIT_CSP "" OFF)
 
-    add_subdirectory(${libwebp_DIR}  ${CMAKE_BINARY_DIR}/libwebp)
+    add_subdirectory(${libwebp_DIR} ${CMAKE_BINARY_DIR}/libwebp)
     include_directories(${CMAKE_BINARY_DIR}/libwebp/src)
-endif()
+endif ()
 
 
 add_executable(${PROJECT_NAME} main.cpp mnnsr.cpp)
 
-target_link_libraries(${PROJECT_NAME} webp  ${OpenCV_LIBS} ${MNN_LIB} ${NCNN_LIB})
+target_link_libraries(${PROJECT_NAME} webp MNN MNN_CL MNN_Vulkan ${OpenCV_LIBS} ${NCNN_LIB})
 
-add_custom_command(TARGET ${PROJECT_NAME}  POST_BUILD
+add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
         $<TARGET_FILE_DIR:${PROJECT_NAME}>
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../RealSR-NCNN-Android-GUI/app/src/main/assets/realsr

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

@@ -293,11 +293,6 @@ void *load(void *args) {
 
         toproc.put(v);
 
-#if _WIN32
-        fprintf(stderr, "load %ls finish\n", imagepath.c_str());
-#else // _WIN32
-        fprintf(stderr, "load %s finish\n", imagepath.c_str());
-#endif // _WIN32
     }
 
 
@@ -446,7 +441,7 @@ int main(int argc, char **argv)
 {
 
     high_resolution_clock::time_point prg_start = high_resolution_clock::now();
-    MNNForwardType backend_type = MNN_FORWARD_OPENCL;
+    int backend_type = MNN_FORWARD_OPENCL;
     path_t inputpath;
     path_t outputpath;
     int scale = 4;
@@ -511,7 +506,8 @@ int main(int argc, char **argv)
             break;
         case L'b':
             if(backend_type != MNN_FORWARD_CPU)
-                backend_type = (MNNForwardType)_wtoi(optarg);
+                backend_type =_wtoi(optarg);
+            break;
         case L'h':
         default:
             print_usage();
@@ -561,7 +557,8 @@ int main(int argc, char **argv)
                 break;
             case 'b':
                 if (backend_type != MNN_FORWARD_CPU)
-                    backend_type = (MNNForwardType) atoi(optarg);
+                    backend_type = atoi(optarg);
+                break;
             case 'h':
             default:
                 print_usage();
@@ -684,7 +681,7 @@ int main(int argc, char **argv)
 
     int prepadding = 0;
 
-    if (model.find(PATHSTR("models-")) != path_t::npos ||(  model.size() >= 4 && model.compare(model.size() - 4, 4, ".mnn") == 0)) {
+    if (model.find(PATHSTR("models-")) != path_t::npos||model.ends_with(".mnn")) {
         prepadding = 5;
     } else {
         fprintf(stderr, "unknown model dir type\n");
@@ -709,7 +706,7 @@ int main(int argc, char **argv)
     FILE* mp = _wfopen(modelfullpath.c_str(), L"rb");
 #else
     char modelpath[256];
-    if ((  model.size() >= 4 && model.compare(model.size() - 4, 4, ".mnn") == 0))
+    if ( model.ends_with(".mnn"))
         sprintf(modelpath, "%s", model.c_str());
     else
         sprintf(modelpath, "%s/x%d.mnn", model.c_str(), scale);
@@ -779,20 +776,21 @@ int main(int argc, char **argv)
     {
         MNNSR mnnsr = MNNSR();
 
-        if (tilesize == 0){
+        if (tilesize == 0) {
             tilesize = 128;
-            tilesize =4000/ modelsize;
-            if(tilesize>300)
-                tilesize = 300;
+            tilesize = 7000 / modelsize;
+            if (tilesize > 400)
+                tilesize = 400;
         }
         if (tilesize < 64)
             tilesize = 64;
         mnnsr.tilesize = tilesize;
         mnnsr.prepadding = prepadding;
-        mnnsr.backend_type = backend_type;
+        if (backend_type >= 0 && backend_type <= 14)
+            mnnsr.backend_type = static_cast<MNNForwardType>(backend_type);
 
         mnnsr.scale = scale;
-        mnnsr.load(modelfullpath, modelsize>10);
+        mnnsr.load(modelfullpath, modelsize > 10);
 
         // main routine
         {