Merge pull request #264727 from iynaix/bump-realesrgan-ncnn-vulkan

diff --git a/CMakeLists.txt b/CMakeLists.txt

index a234caa..d94388a 100644

index 1e7b71a..9db85b1 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -107,6 +107,8 @@ if(USE_SYSTEM_NCNN)

stdenv.mkDerivation rec {

  pname = "Real-ESRGAN-ncnn-vulkan";

  version = "0.1.3.2";

  version = "0.2.0";

  src = fetchFromGitHub {

    owner = "xinntao";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-eLAIlOl1sUxijeVPFG+NscZGxDdtrQqVkMuxhegESHk=";

    sha256 = "sha256-F+NfkAbk8UtAKzsF42ppPF2UGjK/M6iFfBsRRBbCmcI=";

  };

  sourceRoot = "${src.name}/src";

  models = fetchzip {

    # Choose the newst release from https://github.com/xinntao/Real-ESRGAN/releases to update

    url = "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.3.0/realesrgan-ncnn-vulkan-20211212-ubuntu.zip";

    url = "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesrgan-ncnn-vulkan-20220424-ubuntu.zip";

    stripRoot = false;

    sha256 = "sha256-17k6fewVEXxx7hi+vPXjHAOq4IIUHLh7WC80CwTeFKI=";

    sha256 = "sha256-1YiPzv1eGnHrazJFRvl37+C1F2xnoEbN0UQYkxLT+JQ=";

  };

  patches = [

diff --git a/main.cpp b/main.cpp

index eb6f6c8..b230bed 100644

index ebe0e62..ef3a1ed 100644

--- a/main.cpp

+++ b/main.cpp

@@ -110,7 +110,7 @@ static void print_usage()

@@ -109,7 +109,7 @@ static void print_usage()

     fprintf(stderr, "  -o output-path       output image path (jpg/png/webp) or directory\n");

     fprintf(stderr, "  -s scale             upscale ratio (can be 2, 4. default=4)\n");

     fprintf(stderr, "  -s scale             upscale ratio (can be 2, 3, 4. default=4)\n");

     fprintf(stderr, "  -t tile-size         tile size (>=32/0=auto, default=0) can be 0,0,0 for multi-gpu\n");

-    fprintf(stderr, "  -m model-path        folder path to pre-trained models(default=models)\n");

+    fprintf(stderr, "  -m model-path        folder path to pre-trained models(default=REPLACE_MODELS)\n");

     fprintf(stderr, "  -n model-name        model name (default=realesrgan-x4plus, can be realesrgan-x4plus | realesrgan-x4plus-anime | realesrnet-x4plus | RealESRGANv2-animevideo-xsx2 | RealESRGANv2-animevideo-xsx4 | RealESRGANv2-anime-xsx2 | RealESRGANv2-anime-xsx4)\n");

-    fprintf(stderr, "  -m model-path        folder path to the pre-trained models. default=models\n");

+    fprintf(stderr, "  -m model-path        folder path to the pre-trained models. default=REPLACE_MODELS\n");

     fprintf(stderr, "  -n model-name        model name (default=realesr-animevideov3, can be realesr-animevideov3 | realesrgan-x4plus | realesrgan-x4plus-anime | realesrnet-x4plus)\n");

     fprintf(stderr, "  -g gpu-id            gpu device to use (default=auto) can be 0,1,2 for multi-gpu\n");

     fprintf(stderr, "  -j load:proc:save    thread count for load/proc/save (default=1:2:2) can be 1:2,2,2:2 for multi-gpu\n");

@@ -438,7 +438,7 @@ int main(int argc, char** argv)

     std::vector<int> tilesize;

-    path_t model = PATHSTR("models");

+    path_t model = PATHSTR("REPLACE_MODELS");

     path_t modelname = PATHSTR("realesrgan-x4plus");

     path_t modelname = PATHSTR("realesr-animevideov3");

     std::vector<int> gpuid;

     int jobs_load = 1;