pyrox.dev / nixpkgs
lol
fork atom

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

realesrgan-ncnn-vulkan: 0.1.3.2 -> 0.2.0

authored by Emily Trau and committed by GitHub 1970cee6 0d936a72

+14 -14
unified split
+3 -3
pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch
··· 1 diff --git a/CMakeLists.txt b/CMakeLists.txt 2 - index a234caa..d94388a 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 @@ -107,6 +107,8 @@ if(USE_SYSTEM_NCNN) 6 - 7 find_package(Threads) 8 - 9 + include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") 10 + include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") 11 include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
··· 1 diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index 1e7b71a..9db85b1 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 @@ -107,6 +107,8 @@ if(USE_SYSTEM_NCNN) 6 + 7 find_package(Threads) 8 + 9 + include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") 10 + include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") 11 include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
+4 -4
pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix
··· 12 13 stdenv.mkDerivation rec { 14 pname = "Real-ESRGAN-ncnn-vulkan"; 15 - version = "0.1.3.2"; 16 17 src = fetchFromGitHub { 18 owner = "xinntao"; 19 repo = pname; 20 rev = "v${version}"; 21 - sha256 = "sha256-eLAIlOl1sUxijeVPFG+NscZGxDdtrQqVkMuxhegESHk="; 22 }; 23 sourceRoot = "${src.name}/src"; 24 25 models = fetchzip { 26 # Choose the newst release from https://github.com/xinntao/Real-ESRGAN/releases to update 27 - url = "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.3.0/realesrgan-ncnn-vulkan-20211212-ubuntu.zip"; 28 stripRoot = false; 29 - sha256 = "sha256-17k6fewVEXxx7hi+vPXjHAOq4IIUHLh7WC80CwTeFKI="; 30 }; 31 32 patches = [
··· 12 13 stdenv.mkDerivation rec { 14 pname = "Real-ESRGAN-ncnn-vulkan"; 15 + version = "0.2.0"; 16 17 src = fetchFromGitHub { 18 owner = "xinntao"; 19 repo = pname; 20 rev = "v${version}"; 21 + sha256 = "sha256-F+NfkAbk8UtAKzsF42ppPF2UGjK/M6iFfBsRRBbCmcI="; 22 }; 23 sourceRoot = "${src.name}/src"; 24 25 models = fetchzip { 26 # Choose the newst release from https://github.com/xinntao/Real-ESRGAN/releases to update 27 + url = "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesrgan-ncnn-vulkan-20220424-ubuntu.zip"; 28 stripRoot = false; 29 + sha256 = "sha256-1YiPzv1eGnHrazJFRvl37+C1F2xnoEbN0UQYkxLT+JQ="; 30 }; 31 32 patches = [
+7 -7
pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch
··· 1 diff --git a/main.cpp b/main.cpp 2 - index eb6f6c8..b230bed 100644 3 --- a/main.cpp 4 +++ b/main.cpp 5 - @@ -110,7 +110,7 @@ static void print_usage() 6 fprintf(stderr, " -o output-path output image path (jpg/png/webp) or directory\n"); 7 - fprintf(stderr, " -s scale upscale ratio (can be 2, 4. default=4)\n"); 8 fprintf(stderr, " -t tile-size tile size (>=32/0=auto, default=0) can be 0,0,0 for multi-gpu\n"); 9 - - fprintf(stderr, " -m model-path folder path to pre-trained models(default=models)\n"); 10 - + fprintf(stderr, " -m model-path folder path to pre-trained models(default=REPLACE_MODELS)\n"); 11 - 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"); 12 fprintf(stderr, " -g gpu-id gpu device to use (default=auto) can be 0,1,2 for multi-gpu\n"); 13 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"); 14 @@ -438,7 +438,7 @@ int main(int argc, char** argv) ··· 17 std::vector<int> tilesize; 18 - path_t model = PATHSTR("models"); 19 + path_t model = PATHSTR("REPLACE_MODELS"); 20 - path_t modelname = PATHSTR("realesrgan-x4plus"); 21 std::vector<int> gpuid; 22 int jobs_load = 1;
··· 1 diff --git a/main.cpp b/main.cpp 2 + index ebe0e62..ef3a1ed 100644 3 --- a/main.cpp 4 +++ b/main.cpp 5 + @@ -109,7 +109,7 @@ static void print_usage() 6 fprintf(stderr, " -o output-path output image path (jpg/png/webp) or directory\n"); 7 + fprintf(stderr, " -s scale upscale ratio (can be 2, 3, 4. default=4)\n"); 8 fprintf(stderr, " -t tile-size tile size (>=32/0=auto, default=0) can be 0,0,0 for multi-gpu\n"); 9 + - fprintf(stderr, " -m model-path folder path to the pre-trained models. default=models\n"); 10 + + fprintf(stderr, " -m model-path folder path to the pre-trained models. default=REPLACE_MODELS\n"); 11 + fprintf(stderr, " -n model-name model name (default=realesr-animevideov3, can be realesr-animevideov3 | realesrgan-x4plus | realesrgan-x4plus-anime | realesrnet-x4plus)\n"); 12 fprintf(stderr, " -g gpu-id gpu device to use (default=auto) can be 0,1,2 for multi-gpu\n"); 13 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"); 14 @@ -438,7 +438,7 @@ int main(int argc, char** argv) ··· 17 std::vector<int> tilesize; 18 - path_t model = PATHSTR("models"); 19 + path_t model = PATHSTR("REPLACE_MODELS"); 20 + path_t modelname = PATHSTR("realesr-animevideov3"); 21 std::vector<int> gpuid; 22 int jobs_load = 1;