diff --git a/.gitignore b/.gitignore index b075a51..a0b6d54 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,4 @@ VoTT-v2/output/vott-json-export.zip /OpenCV/opencv VoTT-v2/vids/Every 100m World Lead Since 2009. \[JoZOpTWBI1E\].mp4 VoTT-v2/vids/World Record - 400m Men Final Sevilla 1999 \[udlrRIYBUsw\].mp4 +upscale/400m_alq13.mp4 diff --git a/upscale/400m Unsqueezed.mp4 b/upscale/400m Unsqueezed.mp4 new file mode 100644 index 0000000..026ae0b Binary files /dev/null and b/upscale/400m Unsqueezed.mp4 differ diff --git a/upscale/400m.mp4 b/upscale/400m.mp4 new file mode 100644 index 0000000..5bc7600 Binary files /dev/null and b/upscale/400m.mp4 differ diff --git a/upscale/downscale.md b/upscale/downscale.md new file mode 100644 index 0000000..c9c9ea6 --- /dev/null +++ b/upscale/downscale.md @@ -0,0 +1,3 @@ +ffmpeg -i input.mp4 -vf "scale=640:360" -c:a copy output.mp4 + +ffmpeg -i 400m.mp4 -ss 00:00:10.000 -vframes 1 output_frame.jpg \ No newline at end of file diff --git a/upscale/install.md b/upscale/install.md index e69de29..74bff86 100644 --- a/upscale/install.md +++ b/upscale/install.md @@ -0,0 +1,9 @@ +Doc : +```bash +docker run -it --rm --device=/dev/dri -v $PWD:/host ghcr.io/k4yt3x/video2x:$TAG -i input.mp4 -o output.mp4 -p3 upscale -h 720 -a waifu2x -n3 +``` + +Command : +```bash +docker run -it --rm --device=/dev/dri -v $PWD:/host ghcr.io/k4yt3x/video2x:latest -i 400m.mp4 -o 400m_480p.mp4 -p3 upscale -h 480p -a waifu2x -n3 +``` \ No newline at end of file diff --git a/upscale/waifu2x-ncnn-v.md b/upscale/waifu2x-ncnn-v.md new file mode 100644 index 0000000..f184d62 --- /dev/null +++ b/upscale/waifu2x-ncnn-v.md @@ -0,0 +1 @@ +./waifu2x-ncnn-vulkan -i output_frame.jpg -o output_frame_up.jpg -n 3 -s 8 -v \ No newline at end of file diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/400m.mp4 b/upscale/waifu2x-ncnn-vulkan-20220728-macos/400m.mp4 new file mode 100644 index 0000000..5bc7600 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/400m.mp4 differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/LICENSE b/upscale/waifu2x-ncnn-vulkan-20220728-macos/LICENSE new file mode 100644 index 0000000..36f47b4 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2019 nihui + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/README.md b/upscale/waifu2x-ncnn-vulkan-20220728-macos/README.md new file mode 100644 index 0000000..635697e --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/README.md @@ -0,0 +1,179 @@ +# waifu2x ncnn Vulkan + +![CI](https://github.com/nihui/waifu2x-ncnn-vulkan/workflows/CI/badge.svg) +![download](https://img.shields.io/github/downloads/nihui/waifu2x-ncnn-vulkan/total.svg) + +ncnn implementation of waifu2x converter. Runs fast on Intel / AMD / Nvidia / Apple-Silicon with Vulkan API. + +waifu2x-ncnn-vulkan uses [ncnn project](https://github.com/Tencent/ncnn) as the universal neural network inference framework. + +## [Download](https://github.com/nihui/waifu2x-ncnn-vulkan/releases) + +Download Windows/Linux/MacOS Executable for Intel/AMD/Nvidia GPU + +**https://github.com/nihui/waifu2x-ncnn-vulkan/releases** + +This package includes all the binaries and models required. It is portable, so no CUDA or Caffe runtime environment is needed :) + +## Usages + +### Example Command + +```shell +waifu2x-ncnn-vulkan.exe -i input.jpg -o output.png -n 2 -s 2 +``` + +### Full Usages + +```console +Usage: waifu2x-ncnn-vulkan -i infile -o outfile [options]... + + -h show this help + -v verbose output + -i input-path input image path (jpg/png/webp) or directory + -o output-path output image path (jpg/png/webp) or directory + -n noise-level denoise level (-1/0/1/2/3, default=0) + -s scale upscale ratio (1/2/4/8/16/32, default=2) + -t tile-size tile size (>=32/0=auto, default=0) can be 0,0,0 for multi-gpu + -m model-path waifu2x model path (default=models-cunet) + -g gpu-id gpu device to use (-1=cpu, default=auto) can be 0,1,2 for multi-gpu + -j load:proc:save thread count for load/proc/save (default=1:2:2) can be 1:2,2,2:2 for multi-gpu + -x enable tta mode + -f format output image format (jpg/png/webp, default=ext/png) +``` + +- `input-path` and `output-path` accept either file path or directory path +- `noise-level` = noise level, large value means strong denoise effect, -1 = no effect +- `scale` = scale level, 1 = no scaling, 2 = upscale 2x +- `tile-size` = tile size, use smaller value to reduce GPU memory usage, default selects automatically +- `load:proc:save` = thread count for the three stages (image decoding + waifu2x upscaling + image encoding), using larger values may increase GPU usage and consume more GPU memory. You can tune this configuration with "4:4:4" for many small-size images, and "2:2:2" for large-size images. The default setting usually works fine for most situations. If you find that your GPU is hungry, try increasing thread count to achieve faster processing. +- `format` = the format of the image to be output, png is better supported, however webp generally yields smaller file sizes, both are losslessly encoded + +If you encounter a crash or error, try upgrading your GPU driver: + +- Intel: https://downloadcenter.intel.com/product/80939/Graphics-Drivers +- AMD: https://www.amd.com/en/support +- NVIDIA: https://www.nvidia.com/Download/index.aspx + +## Build from Source + +1. Download and setup the Vulkan SDK from https://vulkan.lunarg.com/ + - For Linux distributions, you can either get the essential build requirements from package manager +```shell +dnf install vulkan-headers vulkan-loader-devel +``` +```shell +apt-get install libvulkan-dev +``` +```shell +pacman -S vulkan-headers vulkan-icd-loader +``` + +2. Clone this project with all submodules + +```shell +git clone https://github.com/nihui/waifu2x-ncnn-vulkan.git +cd waifu2x-ncnn-vulkan +git submodule update --init --recursive +``` + +3. Build with CMake + - You can pass -DUSE_STATIC_MOLTENVK=ON option to avoid linking the vulkan loader library on MacOS + +```shell +mkdir build +cd build +cmake ../src +cmake --build . -j 4 +``` + +## Speed Comparison with waifu2x-caffe-cui + +### Environment + +- Windows 10 1809 +- AMD R7-1700 +- Nvidia GTX-1070 +- Nvidia driver 419.67 +- CUDA 10.1.105 +- cuDNN 10.1 + +```powershell +Measure-Command { waifu2x-ncnn-vulkan.exe -i input.png -o output.png -n 2 -s 2 -t [block size] -m [model dir] } +``` + +```powershell +Measure-Command { waifu2x-caffe-cui.exe -t 0 --gpu 0 -b 1 -c [block size] -p cudnn --model_dir [model dir] -s 2 -n 2 -m noise_scale -i input.png -o output.png } +``` + +### cunet + +||Image Size|Target Size|Block Size|Total Time(s)|GPU Memory(MB)| +|---|---|---|---|---|---| +|waifu2x-ncnn-vulkan|200x200|400x400|400/200/100|0.86/0.86/0.82|638/638/197| +|waifu2x-caffe-cui|200x200|400x400|400/200/100|2.54/2.39/2.36|3017/936/843| +|waifu2x-ncnn-vulkan|400x400|800x800|400/200/100|1.17/1.04/1.02|2430/638/197| +|waifu2x-caffe-cui|400x400|800x800|400/200/100|2.91/2.43/2.7|3202/1389/1178| +|waifu2x-ncnn-vulkan|1000x1000|2000x2000|400/200/100|2.35/2.26/2.46|2430/638/197| +|waifu2x-caffe-cui|1000x1000|2000x2000|400/200/100|4.04/3.79/4.35|3258/1582/1175| +|waifu2x-ncnn-vulkan|2000x2000|4000x4000|400/200/100|6.46/6.59/7.49|2430/686/213| +|waifu2x-caffe-cui|2000x2000|4000x4000|400/200/100|7.01/7.54/10.11|3258/1499/1200| +|waifu2x-ncnn-vulkan|4000x4000|8000x8000|400/200/100|22.78/23.78/27.61|2448/654/213| +|waifu2x-caffe-cui|4000x4000|8000x8000|400/200/100|18.45/21.85/31.82|3325/1652/1236| + +### upconv_7_anime_style_art_rgb + +||Image Size|Target Size|Block Size|Total Time(s)|GPU Memory(MB)| +|---|---|---|---|---|---| +|waifu2x-ncnn-vulkan|200x200|400x400|400/200/100|0.74/0.75/0.72|482/482/142| +|waifu2x-caffe-cui|200x200|400x400|400/200/100|2.04/1.99/1.99|995/546/459| +|waifu2x-ncnn-vulkan|400x400|800x800|400/200/100|0.95/0.83/0.81|1762/482/142| +|waifu2x-caffe-cui|400x400|800x800|400/200/100|2.08/2.12/2.11|995/546/459| +|waifu2x-ncnn-vulkan|1000x1000|2000x2000|400/200/100|1.52/1.41/1.44|1778/482/142| +|waifu2x-caffe-cui|1000x1000|2000x2000|400/200/100|2.72/2.60/2.68|1015/570/459| +|waifu2x-ncnn-vulkan|2000x2000|4000x4000|400/200/100|3.45/3.42/3.63|1778/482/142| +|waifu2x-caffe-cui|2000x2000|4000x4000|400/200/100|3.90/4.01/4.35|1015/521/462| +|waifu2x-ncnn-vulkan|4000x4000|8000x8000|400/200/100|11.16/11.29/12.07|1796/498/158| +|waifu2x-caffe-cui|4000x4000|8000x8000|400/200/100|9.24/9.81/11.16|995/546/436| + +## Sample Images + +### Original Image + +![origin](images/0.jpg) + +### Upscale 2x with ImageMagick + +```shell +convert origin.jpg -resize 200% output.png +``` + +![browser](images/1.png) + +### Upscale 2x with ImageMagick Lanczo4 Filter + +```shell +convert origin.jpg -filter Lanczos -resize 200% output.png +``` + +![browser](images/4.png) + +### Upscale 2x with waifu2x noise=2 scale=2 + +```shell +waifu2x-ncnn-vulkan.exe -i origin.jpg -o output.png -n 2 -s 2 +``` + +![waifu2x](images/2.png) + +## Original waifu2x Project + +- https://github.com/nagadomi/waifu2x +- https://github.com/lltcggie/waifu2x-caffe + +## Other Open-Source Code Used + +- https://github.com/Tencent/ncnn for fast neural network inference on ALL PLATFORMS +- https://github.com/webmproject/libwebp for encoding and decoding Webp images on ALL PLATFORMS +- https://github.com/nothings/stb for decoding and encoding image on Linux / MacOS +- https://github.com/tronkko/dirent for listing files in directory on Windows diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_model.bin new file mode 100644 index 0000000..b8d10da Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_model.param new file mode 100644 index 0000000..86534c1 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_model.param @@ -0,0 +1,61 @@ +7767517 +59 71 +Input input 0 1 Input1 0=312 1=312 2=3 +Convolution Convolution1 1 1 Input1 Convolution1_ReLU1 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution2 1 1 Convolution1_ReLU1 Convolution2_ReLU2 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_0 1 2 Convolution2_ReLU2 Convolution2_ReLU2_splitncnn_0 Convolution2_ReLU2_splitncnn_1 +Convolution Convolution3 1 1 Convolution2_ReLU2_splitncnn_1 Convolution3_ReLU3 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution4 1 1 Convolution3_ReLU3 Convolution4_ReLU4 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution5 1 1 Convolution4_ReLU4 Convolution5_ReLU5 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_1 1 2 Convolution5_ReLU5 Convolution5_ReLU5_splitncnn_0 Convolution5_ReLU5_splitncnn_1 +Pooling Pooling1 1 1 Convolution5_ReLU5_splitncnn_1 Pooling1 0=1 4=1 +InnerProduct Convolution6 1 1 Pooling1 Convolution6_ReLU6 0=8 1=1 2=512 9=1 +InnerProduct Convolution7 1 1 Convolution6_ReLU6 Flatten1 0=64 1=1 2=512 9=4 +Scale Scale1 2 1 Convolution5_ReLU5_splitncnn_0 Flatten1 Scale1 0=-233 +Deconvolution Deconvolution1 1 1 Scale1 Deconvolution1_ReLU7 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_2 1 2 Deconvolution1_ReLU7 Deconvolution1_ReLU7_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 +Crop Crop1 2 1 Convolution2_ReLU2_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 Crop1 0=4 1=4 +Eltwise Eltwise1 2 1 Crop1 Deconvolution1_ReLU7_splitncnn_0 Eltwise1 0=1 +Convolution Convolution8 1 1 Eltwise1 Convolution8_ReLU8 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution9 1 1 Convolution8_ReLU8 Convolution9 0=3 1=3 5=1 6=1728 +Split splitncnn_3 1 2 Convolution9 Convolution9_splitncnn_0 Convolution9_splitncnn_1 +Convolution Convolution10 1 1 Convolution9_splitncnn_1 Convolution10_ReLU9 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution11 1 1 Convolution10_ReLU9 Convolution11_ReLU10 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_4 1 2 Convolution11_ReLU10 Convolution11_ReLU10_splitncnn_0 Convolution11_ReLU10_splitncnn_1 +Convolution Convolution12 1 1 Convolution11_ReLU10_splitncnn_1 Convolution12_ReLU11 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution13 1 1 Convolution12_ReLU11 Convolution13_ReLU12 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution14 1 1 Convolution13_ReLU12 Convolution14_ReLU13 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_5 1 2 Convolution14_ReLU13 Convolution14_ReLU13_splitncnn_0 Convolution14_ReLU13_splitncnn_1 +Pooling Pooling2 1 1 Convolution14_ReLU13_splitncnn_1 Pooling2 0=1 4=1 +InnerProduct Convolution15 1 1 Pooling2 Convolution15_ReLU14 0=16 1=1 2=2048 9=1 +InnerProduct Convolution16 1 1 Convolution15_ReLU14 Flatten2 0=128 1=1 2=2048 9=4 +Scale Scale2 2 1 Convolution14_ReLU13_splitncnn_0 Flatten2 Scale2 0=-233 +Split splitncnn_6 1 2 Scale2 Scale2_splitncnn_0 Scale2_splitncnn_1 +Convolution Convolution17 1 1 Scale2_splitncnn_1 Convolution17_ReLU15 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Convolution Convolution18 1 1 Convolution17_ReLU15 Convolution18_ReLU16 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Convolution Convolution19 1 1 Convolution18_ReLU16 Convolution19_ReLU17 0=128 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Split splitncnn_7 1 2 Convolution19_ReLU17 Convolution19_ReLU17_splitncnn_0 Convolution19_ReLU17_splitncnn_1 +Pooling Pooling3 1 1 Convolution19_ReLU17_splitncnn_1 Pooling3 0=1 4=1 +InnerProduct Convolution20 1 1 Pooling3 Convolution20_ReLU18 0=16 1=1 2=2048 9=1 +InnerProduct Convolution21 1 1 Convolution20_ReLU18 Flatten3 0=128 1=1 2=2048 9=4 +Scale Scale3 2 1 Convolution19_ReLU17_splitncnn_0 Flatten3 Scale3 0=-233 +Deconvolution Deconvolution2 1 1 Scale3 Deconvolution2_ReLU19 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Split splitncnn_8 1 2 Deconvolution2_ReLU19 Deconvolution2_ReLU19_splitncnn_0 Deconvolution2_ReLU19_splitncnn_1 +Crop Crop2 2 1 Scale2_splitncnn_0 Deconvolution2_ReLU19_splitncnn_1 Crop2 0=4 1=4 +Eltwise Eltwise2 2 1 Crop2 Deconvolution2_ReLU19_splitncnn_0 Eltwise2 0=1 +Convolution Convolution22 1 1 Eltwise2 Convolution22_ReLU20 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution23 1 1 Convolution22_ReLU20 Convolution23_ReLU21 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Split splitncnn_9 1 2 Convolution23_ReLU21 Convolution23_ReLU21_splitncnn_0 Convolution23_ReLU21_splitncnn_1 +Pooling Pooling4 1 1 Convolution23_ReLU21_splitncnn_1 Pooling4 0=1 4=1 +InnerProduct Convolution24 1 1 Pooling4 Convolution24_ReLU22 0=8 1=1 2=512 9=1 +InnerProduct Convolution25 1 1 Convolution24_ReLU22 Flatten4 0=64 1=1 2=512 9=4 +Scale Scale4 2 1 Convolution23_ReLU21_splitncnn_0 Flatten4 Scale4 0=-233 +Deconvolution Deconvolution3 1 1 Scale4 Deconvolution3_ReLU23 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_10 1 2 Deconvolution3_ReLU23 Deconvolution3_ReLU23_splitncnn_0 Deconvolution3_ReLU23_splitncnn_1 +Crop Crop3 2 1 Convolution11_ReLU10_splitncnn_0 Deconvolution3_ReLU23_splitncnn_1 Crop3 0=16 1=16 +Eltwise Eltwise3 2 1 Crop3 Deconvolution3_ReLU23_splitncnn_0 Eltwise3 0=1 +Convolution Convolution26 1 1 Eltwise3 Convolution26_ReLU24 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution27 1 1 Convolution26_ReLU24 Convolution27 0=3 1=3 5=1 6=1728 +Split splitncnn_11 1 2 Convolution27 Convolution27_splitncnn_0 Convolution27_splitncnn_1 +Crop Crop4 2 1 Convolution9_splitncnn_0 Convolution27_splitncnn_1 Crop4 0=20 1=20 +Eltwise Eltwise4 2 1 Crop4 Convolution27_splitncnn_0 Eltwise4 0=1 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_scale2.0x_model.bin new file mode 100644 index 0000000..a6e1abe Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_scale2.0x_model.param new file mode 100644 index 0000000..d2bf329 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise0_scale2.0x_model.param @@ -0,0 +1,61 @@ +7767517 +59 71 +Input input 0 1 Input1 0=200 1=200 2=3 +Convolution Convolution1 1 1 Input1 Convolution1_ReLU1 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution2 1 1 Convolution1_ReLU1 Convolution2_ReLU2 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_0 1 2 Convolution2_ReLU2 Convolution2_ReLU2_splitncnn_0 Convolution2_ReLU2_splitncnn_1 +Convolution Convolution3 1 1 Convolution2_ReLU2_splitncnn_1 Convolution3_ReLU3 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution4 1 1 Convolution3_ReLU3 Convolution4_ReLU4 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution5 1 1 Convolution4_ReLU4 Convolution5_ReLU5 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_1 1 2 Convolution5_ReLU5 Convolution5_ReLU5_splitncnn_0 Convolution5_ReLU5_splitncnn_1 +Pooling Pooling1 1 1 Convolution5_ReLU5_splitncnn_1 Pooling1 0=1 4=1 +InnerProduct Convolution6 1 1 Pooling1 Convolution6_ReLU6 0=8 1=1 2=512 9=1 +InnerProduct Convolution7 1 1 Convolution6_ReLU6 Flatten1 0=64 1=1 2=512 9=4 +Scale Scale1 2 1 Convolution5_ReLU5_splitncnn_0 Flatten1 Scale1 0=-233 +Deconvolution Deconvolution1 1 1 Scale1 Deconvolution1_ReLU7 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_2 1 2 Deconvolution1_ReLU7 Deconvolution1_ReLU7_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 +Crop Crop1 2 1 Convolution2_ReLU2_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 Crop1 0=4 1=4 +Eltwise Eltwise1 2 1 Crop1 Deconvolution1_ReLU7_splitncnn_0 Eltwise1 0=1 +Convolution Convolution8 1 1 Eltwise1 Convolution8_ReLU8 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Deconvolution Deconvolution2 1 1 Convolution8_ReLU8 Deconvolution2 0=3 1=4 3=2 4=3 5=1 6=3072 +Split splitncnn_3 1 2 Deconvolution2 Deconvolution2_splitncnn_0 Deconvolution2_splitncnn_1 +Convolution Convolution9 1 1 Deconvolution2_splitncnn_1 Convolution9_ReLU9 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution10 1 1 Convolution9_ReLU9 Convolution10_ReLU10 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_4 1 2 Convolution10_ReLU10 Convolution10_ReLU10_splitncnn_0 Convolution10_ReLU10_splitncnn_1 +Convolution Convolution11 1 1 Convolution10_ReLU10_splitncnn_1 Convolution11_ReLU11 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution12 1 1 Convolution11_ReLU11 Convolution12_ReLU12 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution13 1 1 Convolution12_ReLU12 Convolution13_ReLU13 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_5 1 2 Convolution13_ReLU13 Convolution13_ReLU13_splitncnn_0 Convolution13_ReLU13_splitncnn_1 +Pooling Pooling2 1 1 Convolution13_ReLU13_splitncnn_1 Pooling2 0=1 4=1 +InnerProduct Convolution14 1 1 Pooling2 Convolution14_ReLU14 0=16 1=1 2=2048 9=1 +InnerProduct Convolution15 1 1 Convolution14_ReLU14 Flatten2 0=128 1=1 2=2048 9=4 +Scale Scale2 2 1 Convolution13_ReLU13_splitncnn_0 Flatten2 Scale2 0=-233 +Split splitncnn_6 1 2 Scale2 Scale2_splitncnn_0 Scale2_splitncnn_1 +Convolution Convolution16 1 1 Scale2_splitncnn_1 Convolution16_ReLU15 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Convolution Convolution17 1 1 Convolution16_ReLU15 Convolution17_ReLU16 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Convolution Convolution18 1 1 Convolution17_ReLU16 Convolution18_ReLU17 0=128 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Split splitncnn_7 1 2 Convolution18_ReLU17 Convolution18_ReLU17_splitncnn_0 Convolution18_ReLU17_splitncnn_1 +Pooling Pooling3 1 1 Convolution18_ReLU17_splitncnn_1 Pooling3 0=1 4=1 +InnerProduct Convolution19 1 1 Pooling3 Convolution19_ReLU18 0=16 1=1 2=2048 9=1 +InnerProduct Convolution20 1 1 Convolution19_ReLU18 Flatten3 0=128 1=1 2=2048 9=4 +Scale Scale3 2 1 Convolution18_ReLU17_splitncnn_0 Flatten3 Scale3 0=-233 +Deconvolution Deconvolution3 1 1 Scale3 Deconvolution3_ReLU19 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Split splitncnn_8 1 2 Deconvolution3_ReLU19 Deconvolution3_ReLU19_splitncnn_0 Deconvolution3_ReLU19_splitncnn_1 +Crop Crop2 2 1 Scale2_splitncnn_0 Deconvolution3_ReLU19_splitncnn_1 Crop2 0=4 1=4 +Eltwise Eltwise2 2 1 Crop2 Deconvolution3_ReLU19_splitncnn_0 Eltwise2 0=1 +Convolution Convolution21 1 1 Eltwise2 Convolution21_ReLU20 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution22 1 1 Convolution21_ReLU20 Convolution22_ReLU21 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Split splitncnn_9 1 2 Convolution22_ReLU21 Convolution22_ReLU21_splitncnn_0 Convolution22_ReLU21_splitncnn_1 +Pooling Pooling4 1 1 Convolution22_ReLU21_splitncnn_1 Pooling4 0=1 4=1 +InnerProduct Convolution23 1 1 Pooling4 Convolution23_ReLU22 0=8 1=1 2=512 9=1 +InnerProduct Convolution24 1 1 Convolution23_ReLU22 Flatten4 0=64 1=1 2=512 9=4 +Scale Scale4 2 1 Convolution22_ReLU21_splitncnn_0 Flatten4 Scale4 0=-233 +Deconvolution Deconvolution4 1 1 Scale4 Deconvolution4_ReLU23 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_10 1 2 Deconvolution4_ReLU23 Deconvolution4_ReLU23_splitncnn_0 Deconvolution4_ReLU23_splitncnn_1 +Crop Crop3 2 1 Convolution10_ReLU10_splitncnn_0 Deconvolution4_ReLU23_splitncnn_1 Crop3 0=16 1=16 +Eltwise Eltwise3 2 1 Crop3 Deconvolution4_ReLU23_splitncnn_0 Eltwise3 0=1 +Convolution Convolution25 1 1 Eltwise3 Convolution25_ReLU24 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution26 1 1 Convolution25_ReLU24 Convolution26 0=3 1=3 5=1 6=1728 +Split splitncnn_11 1 2 Convolution26 Convolution26_splitncnn_0 Convolution26_splitncnn_1 +Crop Crop4 2 1 Deconvolution2_splitncnn_0 Convolution26_splitncnn_1 Crop4 0=20 1=20 +Eltwise Eltwise4 2 1 Crop4 Convolution26_splitncnn_0 Eltwise4 0=1 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_model.bin new file mode 100644 index 0000000..ac9dc8a Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_model.param new file mode 100644 index 0000000..86534c1 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_model.param @@ -0,0 +1,61 @@ +7767517 +59 71 +Input input 0 1 Input1 0=312 1=312 2=3 +Convolution Convolution1 1 1 Input1 Convolution1_ReLU1 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution2 1 1 Convolution1_ReLU1 Convolution2_ReLU2 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_0 1 2 Convolution2_ReLU2 Convolution2_ReLU2_splitncnn_0 Convolution2_ReLU2_splitncnn_1 +Convolution Convolution3 1 1 Convolution2_ReLU2_splitncnn_1 Convolution3_ReLU3 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution4 1 1 Convolution3_ReLU3 Convolution4_ReLU4 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution5 1 1 Convolution4_ReLU4 Convolution5_ReLU5 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_1 1 2 Convolution5_ReLU5 Convolution5_ReLU5_splitncnn_0 Convolution5_ReLU5_splitncnn_1 +Pooling Pooling1 1 1 Convolution5_ReLU5_splitncnn_1 Pooling1 0=1 4=1 +InnerProduct Convolution6 1 1 Pooling1 Convolution6_ReLU6 0=8 1=1 2=512 9=1 +InnerProduct Convolution7 1 1 Convolution6_ReLU6 Flatten1 0=64 1=1 2=512 9=4 +Scale Scale1 2 1 Convolution5_ReLU5_splitncnn_0 Flatten1 Scale1 0=-233 +Deconvolution Deconvolution1 1 1 Scale1 Deconvolution1_ReLU7 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_2 1 2 Deconvolution1_ReLU7 Deconvolution1_ReLU7_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 +Crop Crop1 2 1 Convolution2_ReLU2_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 Crop1 0=4 1=4 +Eltwise Eltwise1 2 1 Crop1 Deconvolution1_ReLU7_splitncnn_0 Eltwise1 0=1 +Convolution Convolution8 1 1 Eltwise1 Convolution8_ReLU8 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution9 1 1 Convolution8_ReLU8 Convolution9 0=3 1=3 5=1 6=1728 +Split splitncnn_3 1 2 Convolution9 Convolution9_splitncnn_0 Convolution9_splitncnn_1 +Convolution Convolution10 1 1 Convolution9_splitncnn_1 Convolution10_ReLU9 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution11 1 1 Convolution10_ReLU9 Convolution11_ReLU10 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_4 1 2 Convolution11_ReLU10 Convolution11_ReLU10_splitncnn_0 Convolution11_ReLU10_splitncnn_1 +Convolution Convolution12 1 1 Convolution11_ReLU10_splitncnn_1 Convolution12_ReLU11 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution13 1 1 Convolution12_ReLU11 Convolution13_ReLU12 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution14 1 1 Convolution13_ReLU12 Convolution14_ReLU13 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_5 1 2 Convolution14_ReLU13 Convolution14_ReLU13_splitncnn_0 Convolution14_ReLU13_splitncnn_1 +Pooling Pooling2 1 1 Convolution14_ReLU13_splitncnn_1 Pooling2 0=1 4=1 +InnerProduct Convolution15 1 1 Pooling2 Convolution15_ReLU14 0=16 1=1 2=2048 9=1 +InnerProduct Convolution16 1 1 Convolution15_ReLU14 Flatten2 0=128 1=1 2=2048 9=4 +Scale Scale2 2 1 Convolution14_ReLU13_splitncnn_0 Flatten2 Scale2 0=-233 +Split splitncnn_6 1 2 Scale2 Scale2_splitncnn_0 Scale2_splitncnn_1 +Convolution Convolution17 1 1 Scale2_splitncnn_1 Convolution17_ReLU15 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Convolution Convolution18 1 1 Convolution17_ReLU15 Convolution18_ReLU16 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Convolution Convolution19 1 1 Convolution18_ReLU16 Convolution19_ReLU17 0=128 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Split splitncnn_7 1 2 Convolution19_ReLU17 Convolution19_ReLU17_splitncnn_0 Convolution19_ReLU17_splitncnn_1 +Pooling Pooling3 1 1 Convolution19_ReLU17_splitncnn_1 Pooling3 0=1 4=1 +InnerProduct Convolution20 1 1 Pooling3 Convolution20_ReLU18 0=16 1=1 2=2048 9=1 +InnerProduct Convolution21 1 1 Convolution20_ReLU18 Flatten3 0=128 1=1 2=2048 9=4 +Scale Scale3 2 1 Convolution19_ReLU17_splitncnn_0 Flatten3 Scale3 0=-233 +Deconvolution Deconvolution2 1 1 Scale3 Deconvolution2_ReLU19 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Split splitncnn_8 1 2 Deconvolution2_ReLU19 Deconvolution2_ReLU19_splitncnn_0 Deconvolution2_ReLU19_splitncnn_1 +Crop Crop2 2 1 Scale2_splitncnn_0 Deconvolution2_ReLU19_splitncnn_1 Crop2 0=4 1=4 +Eltwise Eltwise2 2 1 Crop2 Deconvolution2_ReLU19_splitncnn_0 Eltwise2 0=1 +Convolution Convolution22 1 1 Eltwise2 Convolution22_ReLU20 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution23 1 1 Convolution22_ReLU20 Convolution23_ReLU21 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Split splitncnn_9 1 2 Convolution23_ReLU21 Convolution23_ReLU21_splitncnn_0 Convolution23_ReLU21_splitncnn_1 +Pooling Pooling4 1 1 Convolution23_ReLU21_splitncnn_1 Pooling4 0=1 4=1 +InnerProduct Convolution24 1 1 Pooling4 Convolution24_ReLU22 0=8 1=1 2=512 9=1 +InnerProduct Convolution25 1 1 Convolution24_ReLU22 Flatten4 0=64 1=1 2=512 9=4 +Scale Scale4 2 1 Convolution23_ReLU21_splitncnn_0 Flatten4 Scale4 0=-233 +Deconvolution Deconvolution3 1 1 Scale4 Deconvolution3_ReLU23 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_10 1 2 Deconvolution3_ReLU23 Deconvolution3_ReLU23_splitncnn_0 Deconvolution3_ReLU23_splitncnn_1 +Crop Crop3 2 1 Convolution11_ReLU10_splitncnn_0 Deconvolution3_ReLU23_splitncnn_1 Crop3 0=16 1=16 +Eltwise Eltwise3 2 1 Crop3 Deconvolution3_ReLU23_splitncnn_0 Eltwise3 0=1 +Convolution Convolution26 1 1 Eltwise3 Convolution26_ReLU24 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution27 1 1 Convolution26_ReLU24 Convolution27 0=3 1=3 5=1 6=1728 +Split splitncnn_11 1 2 Convolution27 Convolution27_splitncnn_0 Convolution27_splitncnn_1 +Crop Crop4 2 1 Convolution9_splitncnn_0 Convolution27_splitncnn_1 Crop4 0=20 1=20 +Eltwise Eltwise4 2 1 Crop4 Convolution27_splitncnn_0 Eltwise4 0=1 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_scale2.0x_model.bin new file mode 100644 index 0000000..7696191 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_scale2.0x_model.param new file mode 100644 index 0000000..d2bf329 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise1_scale2.0x_model.param @@ -0,0 +1,61 @@ +7767517 +59 71 +Input input 0 1 Input1 0=200 1=200 2=3 +Convolution Convolution1 1 1 Input1 Convolution1_ReLU1 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution2 1 1 Convolution1_ReLU1 Convolution2_ReLU2 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_0 1 2 Convolution2_ReLU2 Convolution2_ReLU2_splitncnn_0 Convolution2_ReLU2_splitncnn_1 +Convolution Convolution3 1 1 Convolution2_ReLU2_splitncnn_1 Convolution3_ReLU3 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution4 1 1 Convolution3_ReLU3 Convolution4_ReLU4 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution5 1 1 Convolution4_ReLU4 Convolution5_ReLU5 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_1 1 2 Convolution5_ReLU5 Convolution5_ReLU5_splitncnn_0 Convolution5_ReLU5_splitncnn_1 +Pooling Pooling1 1 1 Convolution5_ReLU5_splitncnn_1 Pooling1 0=1 4=1 +InnerProduct Convolution6 1 1 Pooling1 Convolution6_ReLU6 0=8 1=1 2=512 9=1 +InnerProduct Convolution7 1 1 Convolution6_ReLU6 Flatten1 0=64 1=1 2=512 9=4 +Scale Scale1 2 1 Convolution5_ReLU5_splitncnn_0 Flatten1 Scale1 0=-233 +Deconvolution Deconvolution1 1 1 Scale1 Deconvolution1_ReLU7 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_2 1 2 Deconvolution1_ReLU7 Deconvolution1_ReLU7_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 +Crop Crop1 2 1 Convolution2_ReLU2_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 Crop1 0=4 1=4 +Eltwise Eltwise1 2 1 Crop1 Deconvolution1_ReLU7_splitncnn_0 Eltwise1 0=1 +Convolution Convolution8 1 1 Eltwise1 Convolution8_ReLU8 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Deconvolution Deconvolution2 1 1 Convolution8_ReLU8 Deconvolution2 0=3 1=4 3=2 4=3 5=1 6=3072 +Split splitncnn_3 1 2 Deconvolution2 Deconvolution2_splitncnn_0 Deconvolution2_splitncnn_1 +Convolution Convolution9 1 1 Deconvolution2_splitncnn_1 Convolution9_ReLU9 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution10 1 1 Convolution9_ReLU9 Convolution10_ReLU10 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_4 1 2 Convolution10_ReLU10 Convolution10_ReLU10_splitncnn_0 Convolution10_ReLU10_splitncnn_1 +Convolution Convolution11 1 1 Convolution10_ReLU10_splitncnn_1 Convolution11_ReLU11 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution12 1 1 Convolution11_ReLU11 Convolution12_ReLU12 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution13 1 1 Convolution12_ReLU12 Convolution13_ReLU13 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_5 1 2 Convolution13_ReLU13 Convolution13_ReLU13_splitncnn_0 Convolution13_ReLU13_splitncnn_1 +Pooling Pooling2 1 1 Convolution13_ReLU13_splitncnn_1 Pooling2 0=1 4=1 +InnerProduct Convolution14 1 1 Pooling2 Convolution14_ReLU14 0=16 1=1 2=2048 9=1 +InnerProduct Convolution15 1 1 Convolution14_ReLU14 Flatten2 0=128 1=1 2=2048 9=4 +Scale Scale2 2 1 Convolution13_ReLU13_splitncnn_0 Flatten2 Scale2 0=-233 +Split splitncnn_6 1 2 Scale2 Scale2_splitncnn_0 Scale2_splitncnn_1 +Convolution Convolution16 1 1 Scale2_splitncnn_1 Convolution16_ReLU15 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Convolution Convolution17 1 1 Convolution16_ReLU15 Convolution17_ReLU16 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Convolution Convolution18 1 1 Convolution17_ReLU16 Convolution18_ReLU17 0=128 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Split splitncnn_7 1 2 Convolution18_ReLU17 Convolution18_ReLU17_splitncnn_0 Convolution18_ReLU17_splitncnn_1 +Pooling Pooling3 1 1 Convolution18_ReLU17_splitncnn_1 Pooling3 0=1 4=1 +InnerProduct Convolution19 1 1 Pooling3 Convolution19_ReLU18 0=16 1=1 2=2048 9=1 +InnerProduct Convolution20 1 1 Convolution19_ReLU18 Flatten3 0=128 1=1 2=2048 9=4 +Scale Scale3 2 1 Convolution18_ReLU17_splitncnn_0 Flatten3 Scale3 0=-233 +Deconvolution Deconvolution3 1 1 Scale3 Deconvolution3_ReLU19 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Split splitncnn_8 1 2 Deconvolution3_ReLU19 Deconvolution3_ReLU19_splitncnn_0 Deconvolution3_ReLU19_splitncnn_1 +Crop Crop2 2 1 Scale2_splitncnn_0 Deconvolution3_ReLU19_splitncnn_1 Crop2 0=4 1=4 +Eltwise Eltwise2 2 1 Crop2 Deconvolution3_ReLU19_splitncnn_0 Eltwise2 0=1 +Convolution Convolution21 1 1 Eltwise2 Convolution21_ReLU20 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution22 1 1 Convolution21_ReLU20 Convolution22_ReLU21 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Split splitncnn_9 1 2 Convolution22_ReLU21 Convolution22_ReLU21_splitncnn_0 Convolution22_ReLU21_splitncnn_1 +Pooling Pooling4 1 1 Convolution22_ReLU21_splitncnn_1 Pooling4 0=1 4=1 +InnerProduct Convolution23 1 1 Pooling4 Convolution23_ReLU22 0=8 1=1 2=512 9=1 +InnerProduct Convolution24 1 1 Convolution23_ReLU22 Flatten4 0=64 1=1 2=512 9=4 +Scale Scale4 2 1 Convolution22_ReLU21_splitncnn_0 Flatten4 Scale4 0=-233 +Deconvolution Deconvolution4 1 1 Scale4 Deconvolution4_ReLU23 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_10 1 2 Deconvolution4_ReLU23 Deconvolution4_ReLU23_splitncnn_0 Deconvolution4_ReLU23_splitncnn_1 +Crop Crop3 2 1 Convolution10_ReLU10_splitncnn_0 Deconvolution4_ReLU23_splitncnn_1 Crop3 0=16 1=16 +Eltwise Eltwise3 2 1 Crop3 Deconvolution4_ReLU23_splitncnn_0 Eltwise3 0=1 +Convolution Convolution25 1 1 Eltwise3 Convolution25_ReLU24 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution26 1 1 Convolution25_ReLU24 Convolution26 0=3 1=3 5=1 6=1728 +Split splitncnn_11 1 2 Convolution26 Convolution26_splitncnn_0 Convolution26_splitncnn_1 +Crop Crop4 2 1 Deconvolution2_splitncnn_0 Convolution26_splitncnn_1 Crop4 0=20 1=20 +Eltwise Eltwise4 2 1 Crop4 Convolution26_splitncnn_0 Eltwise4 0=1 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_model.bin new file mode 100644 index 0000000..07bf0d8 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_model.param new file mode 100644 index 0000000..86534c1 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_model.param @@ -0,0 +1,61 @@ +7767517 +59 71 +Input input 0 1 Input1 0=312 1=312 2=3 +Convolution Convolution1 1 1 Input1 Convolution1_ReLU1 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution2 1 1 Convolution1_ReLU1 Convolution2_ReLU2 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_0 1 2 Convolution2_ReLU2 Convolution2_ReLU2_splitncnn_0 Convolution2_ReLU2_splitncnn_1 +Convolution Convolution3 1 1 Convolution2_ReLU2_splitncnn_1 Convolution3_ReLU3 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution4 1 1 Convolution3_ReLU3 Convolution4_ReLU4 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution5 1 1 Convolution4_ReLU4 Convolution5_ReLU5 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_1 1 2 Convolution5_ReLU5 Convolution5_ReLU5_splitncnn_0 Convolution5_ReLU5_splitncnn_1 +Pooling Pooling1 1 1 Convolution5_ReLU5_splitncnn_1 Pooling1 0=1 4=1 +InnerProduct Convolution6 1 1 Pooling1 Convolution6_ReLU6 0=8 1=1 2=512 9=1 +InnerProduct Convolution7 1 1 Convolution6_ReLU6 Flatten1 0=64 1=1 2=512 9=4 +Scale Scale1 2 1 Convolution5_ReLU5_splitncnn_0 Flatten1 Scale1 0=-233 +Deconvolution Deconvolution1 1 1 Scale1 Deconvolution1_ReLU7 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_2 1 2 Deconvolution1_ReLU7 Deconvolution1_ReLU7_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 +Crop Crop1 2 1 Convolution2_ReLU2_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 Crop1 0=4 1=4 +Eltwise Eltwise1 2 1 Crop1 Deconvolution1_ReLU7_splitncnn_0 Eltwise1 0=1 +Convolution Convolution8 1 1 Eltwise1 Convolution8_ReLU8 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution9 1 1 Convolution8_ReLU8 Convolution9 0=3 1=3 5=1 6=1728 +Split splitncnn_3 1 2 Convolution9 Convolution9_splitncnn_0 Convolution9_splitncnn_1 +Convolution Convolution10 1 1 Convolution9_splitncnn_1 Convolution10_ReLU9 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution11 1 1 Convolution10_ReLU9 Convolution11_ReLU10 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_4 1 2 Convolution11_ReLU10 Convolution11_ReLU10_splitncnn_0 Convolution11_ReLU10_splitncnn_1 +Convolution Convolution12 1 1 Convolution11_ReLU10_splitncnn_1 Convolution12_ReLU11 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution13 1 1 Convolution12_ReLU11 Convolution13_ReLU12 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution14 1 1 Convolution13_ReLU12 Convolution14_ReLU13 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_5 1 2 Convolution14_ReLU13 Convolution14_ReLU13_splitncnn_0 Convolution14_ReLU13_splitncnn_1 +Pooling Pooling2 1 1 Convolution14_ReLU13_splitncnn_1 Pooling2 0=1 4=1 +InnerProduct Convolution15 1 1 Pooling2 Convolution15_ReLU14 0=16 1=1 2=2048 9=1 +InnerProduct Convolution16 1 1 Convolution15_ReLU14 Flatten2 0=128 1=1 2=2048 9=4 +Scale Scale2 2 1 Convolution14_ReLU13_splitncnn_0 Flatten2 Scale2 0=-233 +Split splitncnn_6 1 2 Scale2 Scale2_splitncnn_0 Scale2_splitncnn_1 +Convolution Convolution17 1 1 Scale2_splitncnn_1 Convolution17_ReLU15 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Convolution Convolution18 1 1 Convolution17_ReLU15 Convolution18_ReLU16 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Convolution Convolution19 1 1 Convolution18_ReLU16 Convolution19_ReLU17 0=128 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Split splitncnn_7 1 2 Convolution19_ReLU17 Convolution19_ReLU17_splitncnn_0 Convolution19_ReLU17_splitncnn_1 +Pooling Pooling3 1 1 Convolution19_ReLU17_splitncnn_1 Pooling3 0=1 4=1 +InnerProduct Convolution20 1 1 Pooling3 Convolution20_ReLU18 0=16 1=1 2=2048 9=1 +InnerProduct Convolution21 1 1 Convolution20_ReLU18 Flatten3 0=128 1=1 2=2048 9=4 +Scale Scale3 2 1 Convolution19_ReLU17_splitncnn_0 Flatten3 Scale3 0=-233 +Deconvolution Deconvolution2 1 1 Scale3 Deconvolution2_ReLU19 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Split splitncnn_8 1 2 Deconvolution2_ReLU19 Deconvolution2_ReLU19_splitncnn_0 Deconvolution2_ReLU19_splitncnn_1 +Crop Crop2 2 1 Scale2_splitncnn_0 Deconvolution2_ReLU19_splitncnn_1 Crop2 0=4 1=4 +Eltwise Eltwise2 2 1 Crop2 Deconvolution2_ReLU19_splitncnn_0 Eltwise2 0=1 +Convolution Convolution22 1 1 Eltwise2 Convolution22_ReLU20 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution23 1 1 Convolution22_ReLU20 Convolution23_ReLU21 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Split splitncnn_9 1 2 Convolution23_ReLU21 Convolution23_ReLU21_splitncnn_0 Convolution23_ReLU21_splitncnn_1 +Pooling Pooling4 1 1 Convolution23_ReLU21_splitncnn_1 Pooling4 0=1 4=1 +InnerProduct Convolution24 1 1 Pooling4 Convolution24_ReLU22 0=8 1=1 2=512 9=1 +InnerProduct Convolution25 1 1 Convolution24_ReLU22 Flatten4 0=64 1=1 2=512 9=4 +Scale Scale4 2 1 Convolution23_ReLU21_splitncnn_0 Flatten4 Scale4 0=-233 +Deconvolution Deconvolution3 1 1 Scale4 Deconvolution3_ReLU23 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_10 1 2 Deconvolution3_ReLU23 Deconvolution3_ReLU23_splitncnn_0 Deconvolution3_ReLU23_splitncnn_1 +Crop Crop3 2 1 Convolution11_ReLU10_splitncnn_0 Deconvolution3_ReLU23_splitncnn_1 Crop3 0=16 1=16 +Eltwise Eltwise3 2 1 Crop3 Deconvolution3_ReLU23_splitncnn_0 Eltwise3 0=1 +Convolution Convolution26 1 1 Eltwise3 Convolution26_ReLU24 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution27 1 1 Convolution26_ReLU24 Convolution27 0=3 1=3 5=1 6=1728 +Split splitncnn_11 1 2 Convolution27 Convolution27_splitncnn_0 Convolution27_splitncnn_1 +Crop Crop4 2 1 Convolution9_splitncnn_0 Convolution27_splitncnn_1 Crop4 0=20 1=20 +Eltwise Eltwise4 2 1 Crop4 Convolution27_splitncnn_0 Eltwise4 0=1 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_scale2.0x_model.bin new file mode 100644 index 0000000..e6f39fe Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_scale2.0x_model.param new file mode 100644 index 0000000..d2bf329 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise2_scale2.0x_model.param @@ -0,0 +1,61 @@ +7767517 +59 71 +Input input 0 1 Input1 0=200 1=200 2=3 +Convolution Convolution1 1 1 Input1 Convolution1_ReLU1 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution2 1 1 Convolution1_ReLU1 Convolution2_ReLU2 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_0 1 2 Convolution2_ReLU2 Convolution2_ReLU2_splitncnn_0 Convolution2_ReLU2_splitncnn_1 +Convolution Convolution3 1 1 Convolution2_ReLU2_splitncnn_1 Convolution3_ReLU3 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution4 1 1 Convolution3_ReLU3 Convolution4_ReLU4 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution5 1 1 Convolution4_ReLU4 Convolution5_ReLU5 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_1 1 2 Convolution5_ReLU5 Convolution5_ReLU5_splitncnn_0 Convolution5_ReLU5_splitncnn_1 +Pooling Pooling1 1 1 Convolution5_ReLU5_splitncnn_1 Pooling1 0=1 4=1 +InnerProduct Convolution6 1 1 Pooling1 Convolution6_ReLU6 0=8 1=1 2=512 9=1 +InnerProduct Convolution7 1 1 Convolution6_ReLU6 Flatten1 0=64 1=1 2=512 9=4 +Scale Scale1 2 1 Convolution5_ReLU5_splitncnn_0 Flatten1 Scale1 0=-233 +Deconvolution Deconvolution1 1 1 Scale1 Deconvolution1_ReLU7 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_2 1 2 Deconvolution1_ReLU7 Deconvolution1_ReLU7_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 +Crop Crop1 2 1 Convolution2_ReLU2_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 Crop1 0=4 1=4 +Eltwise Eltwise1 2 1 Crop1 Deconvolution1_ReLU7_splitncnn_0 Eltwise1 0=1 +Convolution Convolution8 1 1 Eltwise1 Convolution8_ReLU8 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Deconvolution Deconvolution2 1 1 Convolution8_ReLU8 Deconvolution2 0=3 1=4 3=2 4=3 5=1 6=3072 +Split splitncnn_3 1 2 Deconvolution2 Deconvolution2_splitncnn_0 Deconvolution2_splitncnn_1 +Convolution Convolution9 1 1 Deconvolution2_splitncnn_1 Convolution9_ReLU9 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution10 1 1 Convolution9_ReLU9 Convolution10_ReLU10 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_4 1 2 Convolution10_ReLU10 Convolution10_ReLU10_splitncnn_0 Convolution10_ReLU10_splitncnn_1 +Convolution Convolution11 1 1 Convolution10_ReLU10_splitncnn_1 Convolution11_ReLU11 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution12 1 1 Convolution11_ReLU11 Convolution12_ReLU12 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution13 1 1 Convolution12_ReLU12 Convolution13_ReLU13 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_5 1 2 Convolution13_ReLU13 Convolution13_ReLU13_splitncnn_0 Convolution13_ReLU13_splitncnn_1 +Pooling Pooling2 1 1 Convolution13_ReLU13_splitncnn_1 Pooling2 0=1 4=1 +InnerProduct Convolution14 1 1 Pooling2 Convolution14_ReLU14 0=16 1=1 2=2048 9=1 +InnerProduct Convolution15 1 1 Convolution14_ReLU14 Flatten2 0=128 1=1 2=2048 9=4 +Scale Scale2 2 1 Convolution13_ReLU13_splitncnn_0 Flatten2 Scale2 0=-233 +Split splitncnn_6 1 2 Scale2 Scale2_splitncnn_0 Scale2_splitncnn_1 +Convolution Convolution16 1 1 Scale2_splitncnn_1 Convolution16_ReLU15 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Convolution Convolution17 1 1 Convolution16_ReLU15 Convolution17_ReLU16 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Convolution Convolution18 1 1 Convolution17_ReLU16 Convolution18_ReLU17 0=128 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Split splitncnn_7 1 2 Convolution18_ReLU17 Convolution18_ReLU17_splitncnn_0 Convolution18_ReLU17_splitncnn_1 +Pooling Pooling3 1 1 Convolution18_ReLU17_splitncnn_1 Pooling3 0=1 4=1 +InnerProduct Convolution19 1 1 Pooling3 Convolution19_ReLU18 0=16 1=1 2=2048 9=1 +InnerProduct Convolution20 1 1 Convolution19_ReLU18 Flatten3 0=128 1=1 2=2048 9=4 +Scale Scale3 2 1 Convolution18_ReLU17_splitncnn_0 Flatten3 Scale3 0=-233 +Deconvolution Deconvolution3 1 1 Scale3 Deconvolution3_ReLU19 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Split splitncnn_8 1 2 Deconvolution3_ReLU19 Deconvolution3_ReLU19_splitncnn_0 Deconvolution3_ReLU19_splitncnn_1 +Crop Crop2 2 1 Scale2_splitncnn_0 Deconvolution3_ReLU19_splitncnn_1 Crop2 0=4 1=4 +Eltwise Eltwise2 2 1 Crop2 Deconvolution3_ReLU19_splitncnn_0 Eltwise2 0=1 +Convolution Convolution21 1 1 Eltwise2 Convolution21_ReLU20 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution22 1 1 Convolution21_ReLU20 Convolution22_ReLU21 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Split splitncnn_9 1 2 Convolution22_ReLU21 Convolution22_ReLU21_splitncnn_0 Convolution22_ReLU21_splitncnn_1 +Pooling Pooling4 1 1 Convolution22_ReLU21_splitncnn_1 Pooling4 0=1 4=1 +InnerProduct Convolution23 1 1 Pooling4 Convolution23_ReLU22 0=8 1=1 2=512 9=1 +InnerProduct Convolution24 1 1 Convolution23_ReLU22 Flatten4 0=64 1=1 2=512 9=4 +Scale Scale4 2 1 Convolution22_ReLU21_splitncnn_0 Flatten4 Scale4 0=-233 +Deconvolution Deconvolution4 1 1 Scale4 Deconvolution4_ReLU23 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_10 1 2 Deconvolution4_ReLU23 Deconvolution4_ReLU23_splitncnn_0 Deconvolution4_ReLU23_splitncnn_1 +Crop Crop3 2 1 Convolution10_ReLU10_splitncnn_0 Deconvolution4_ReLU23_splitncnn_1 Crop3 0=16 1=16 +Eltwise Eltwise3 2 1 Crop3 Deconvolution4_ReLU23_splitncnn_0 Eltwise3 0=1 +Convolution Convolution25 1 1 Eltwise3 Convolution25_ReLU24 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution26 1 1 Convolution25_ReLU24 Convolution26 0=3 1=3 5=1 6=1728 +Split splitncnn_11 1 2 Convolution26 Convolution26_splitncnn_0 Convolution26_splitncnn_1 +Crop Crop4 2 1 Deconvolution2_splitncnn_0 Convolution26_splitncnn_1 Crop4 0=20 1=20 +Eltwise Eltwise4 2 1 Crop4 Convolution26_splitncnn_0 Eltwise4 0=1 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_model.bin new file mode 100644 index 0000000..b112695 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_model.param new file mode 100644 index 0000000..86534c1 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_model.param @@ -0,0 +1,61 @@ +7767517 +59 71 +Input input 0 1 Input1 0=312 1=312 2=3 +Convolution Convolution1 1 1 Input1 Convolution1_ReLU1 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution2 1 1 Convolution1_ReLU1 Convolution2_ReLU2 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_0 1 2 Convolution2_ReLU2 Convolution2_ReLU2_splitncnn_0 Convolution2_ReLU2_splitncnn_1 +Convolution Convolution3 1 1 Convolution2_ReLU2_splitncnn_1 Convolution3_ReLU3 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution4 1 1 Convolution3_ReLU3 Convolution4_ReLU4 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution5 1 1 Convolution4_ReLU4 Convolution5_ReLU5 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_1 1 2 Convolution5_ReLU5 Convolution5_ReLU5_splitncnn_0 Convolution5_ReLU5_splitncnn_1 +Pooling Pooling1 1 1 Convolution5_ReLU5_splitncnn_1 Pooling1 0=1 4=1 +InnerProduct Convolution6 1 1 Pooling1 Convolution6_ReLU6 0=8 1=1 2=512 9=1 +InnerProduct Convolution7 1 1 Convolution6_ReLU6 Flatten1 0=64 1=1 2=512 9=4 +Scale Scale1 2 1 Convolution5_ReLU5_splitncnn_0 Flatten1 Scale1 0=-233 +Deconvolution Deconvolution1 1 1 Scale1 Deconvolution1_ReLU7 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_2 1 2 Deconvolution1_ReLU7 Deconvolution1_ReLU7_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 +Crop Crop1 2 1 Convolution2_ReLU2_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 Crop1 0=4 1=4 +Eltwise Eltwise1 2 1 Crop1 Deconvolution1_ReLU7_splitncnn_0 Eltwise1 0=1 +Convolution Convolution8 1 1 Eltwise1 Convolution8_ReLU8 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution9 1 1 Convolution8_ReLU8 Convolution9 0=3 1=3 5=1 6=1728 +Split splitncnn_3 1 2 Convolution9 Convolution9_splitncnn_0 Convolution9_splitncnn_1 +Convolution Convolution10 1 1 Convolution9_splitncnn_1 Convolution10_ReLU9 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution11 1 1 Convolution10_ReLU9 Convolution11_ReLU10 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_4 1 2 Convolution11_ReLU10 Convolution11_ReLU10_splitncnn_0 Convolution11_ReLU10_splitncnn_1 +Convolution Convolution12 1 1 Convolution11_ReLU10_splitncnn_1 Convolution12_ReLU11 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution13 1 1 Convolution12_ReLU11 Convolution13_ReLU12 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution14 1 1 Convolution13_ReLU12 Convolution14_ReLU13 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_5 1 2 Convolution14_ReLU13 Convolution14_ReLU13_splitncnn_0 Convolution14_ReLU13_splitncnn_1 +Pooling Pooling2 1 1 Convolution14_ReLU13_splitncnn_1 Pooling2 0=1 4=1 +InnerProduct Convolution15 1 1 Pooling2 Convolution15_ReLU14 0=16 1=1 2=2048 9=1 +InnerProduct Convolution16 1 1 Convolution15_ReLU14 Flatten2 0=128 1=1 2=2048 9=4 +Scale Scale2 2 1 Convolution14_ReLU13_splitncnn_0 Flatten2 Scale2 0=-233 +Split splitncnn_6 1 2 Scale2 Scale2_splitncnn_0 Scale2_splitncnn_1 +Convolution Convolution17 1 1 Scale2_splitncnn_1 Convolution17_ReLU15 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Convolution Convolution18 1 1 Convolution17_ReLU15 Convolution18_ReLU16 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Convolution Convolution19 1 1 Convolution18_ReLU16 Convolution19_ReLU17 0=128 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Split splitncnn_7 1 2 Convolution19_ReLU17 Convolution19_ReLU17_splitncnn_0 Convolution19_ReLU17_splitncnn_1 +Pooling Pooling3 1 1 Convolution19_ReLU17_splitncnn_1 Pooling3 0=1 4=1 +InnerProduct Convolution20 1 1 Pooling3 Convolution20_ReLU18 0=16 1=1 2=2048 9=1 +InnerProduct Convolution21 1 1 Convolution20_ReLU18 Flatten3 0=128 1=1 2=2048 9=4 +Scale Scale3 2 1 Convolution19_ReLU17_splitncnn_0 Flatten3 Scale3 0=-233 +Deconvolution Deconvolution2 1 1 Scale3 Deconvolution2_ReLU19 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Split splitncnn_8 1 2 Deconvolution2_ReLU19 Deconvolution2_ReLU19_splitncnn_0 Deconvolution2_ReLU19_splitncnn_1 +Crop Crop2 2 1 Scale2_splitncnn_0 Deconvolution2_ReLU19_splitncnn_1 Crop2 0=4 1=4 +Eltwise Eltwise2 2 1 Crop2 Deconvolution2_ReLU19_splitncnn_0 Eltwise2 0=1 +Convolution Convolution22 1 1 Eltwise2 Convolution22_ReLU20 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution23 1 1 Convolution22_ReLU20 Convolution23_ReLU21 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Split splitncnn_9 1 2 Convolution23_ReLU21 Convolution23_ReLU21_splitncnn_0 Convolution23_ReLU21_splitncnn_1 +Pooling Pooling4 1 1 Convolution23_ReLU21_splitncnn_1 Pooling4 0=1 4=1 +InnerProduct Convolution24 1 1 Pooling4 Convolution24_ReLU22 0=8 1=1 2=512 9=1 +InnerProduct Convolution25 1 1 Convolution24_ReLU22 Flatten4 0=64 1=1 2=512 9=4 +Scale Scale4 2 1 Convolution23_ReLU21_splitncnn_0 Flatten4 Scale4 0=-233 +Deconvolution Deconvolution3 1 1 Scale4 Deconvolution3_ReLU23 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_10 1 2 Deconvolution3_ReLU23 Deconvolution3_ReLU23_splitncnn_0 Deconvolution3_ReLU23_splitncnn_1 +Crop Crop3 2 1 Convolution11_ReLU10_splitncnn_0 Deconvolution3_ReLU23_splitncnn_1 Crop3 0=16 1=16 +Eltwise Eltwise3 2 1 Crop3 Deconvolution3_ReLU23_splitncnn_0 Eltwise3 0=1 +Convolution Convolution26 1 1 Eltwise3 Convolution26_ReLU24 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution27 1 1 Convolution26_ReLU24 Convolution27 0=3 1=3 5=1 6=1728 +Split splitncnn_11 1 2 Convolution27 Convolution27_splitncnn_0 Convolution27_splitncnn_1 +Crop Crop4 2 1 Convolution9_splitncnn_0 Convolution27_splitncnn_1 Crop4 0=20 1=20 +Eltwise Eltwise4 2 1 Crop4 Convolution27_splitncnn_0 Eltwise4 0=1 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_scale2.0x_model.bin new file mode 100644 index 0000000..ed8e90f Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_scale2.0x_model.param new file mode 100644 index 0000000..d2bf329 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/noise3_scale2.0x_model.param @@ -0,0 +1,61 @@ +7767517 +59 71 +Input input 0 1 Input1 0=200 1=200 2=3 +Convolution Convolution1 1 1 Input1 Convolution1_ReLU1 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution2 1 1 Convolution1_ReLU1 Convolution2_ReLU2 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_0 1 2 Convolution2_ReLU2 Convolution2_ReLU2_splitncnn_0 Convolution2_ReLU2_splitncnn_1 +Convolution Convolution3 1 1 Convolution2_ReLU2_splitncnn_1 Convolution3_ReLU3 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution4 1 1 Convolution3_ReLU3 Convolution4_ReLU4 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution5 1 1 Convolution4_ReLU4 Convolution5_ReLU5 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_1 1 2 Convolution5_ReLU5 Convolution5_ReLU5_splitncnn_0 Convolution5_ReLU5_splitncnn_1 +Pooling Pooling1 1 1 Convolution5_ReLU5_splitncnn_1 Pooling1 0=1 4=1 +InnerProduct Convolution6 1 1 Pooling1 Convolution6_ReLU6 0=8 1=1 2=512 9=1 +InnerProduct Convolution7 1 1 Convolution6_ReLU6 Flatten1 0=64 1=1 2=512 9=4 +Scale Scale1 2 1 Convolution5_ReLU5_splitncnn_0 Flatten1 Scale1 0=-233 +Deconvolution Deconvolution1 1 1 Scale1 Deconvolution1_ReLU7 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_2 1 2 Deconvolution1_ReLU7 Deconvolution1_ReLU7_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 +Crop Crop1 2 1 Convolution2_ReLU2_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 Crop1 0=4 1=4 +Eltwise Eltwise1 2 1 Crop1 Deconvolution1_ReLU7_splitncnn_0 Eltwise1 0=1 +Convolution Convolution8 1 1 Eltwise1 Convolution8_ReLU8 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Deconvolution Deconvolution2 1 1 Convolution8_ReLU8 Deconvolution2 0=3 1=4 3=2 4=3 5=1 6=3072 +Split splitncnn_3 1 2 Deconvolution2 Deconvolution2_splitncnn_0 Deconvolution2_splitncnn_1 +Convolution Convolution9 1 1 Deconvolution2_splitncnn_1 Convolution9_ReLU9 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution10 1 1 Convolution9_ReLU9 Convolution10_ReLU10 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_4 1 2 Convolution10_ReLU10 Convolution10_ReLU10_splitncnn_0 Convolution10_ReLU10_splitncnn_1 +Convolution Convolution11 1 1 Convolution10_ReLU10_splitncnn_1 Convolution11_ReLU11 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution12 1 1 Convolution11_ReLU11 Convolution12_ReLU12 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution13 1 1 Convolution12_ReLU12 Convolution13_ReLU13 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_5 1 2 Convolution13_ReLU13 Convolution13_ReLU13_splitncnn_0 Convolution13_ReLU13_splitncnn_1 +Pooling Pooling2 1 1 Convolution13_ReLU13_splitncnn_1 Pooling2 0=1 4=1 +InnerProduct Convolution14 1 1 Pooling2 Convolution14_ReLU14 0=16 1=1 2=2048 9=1 +InnerProduct Convolution15 1 1 Convolution14_ReLU14 Flatten2 0=128 1=1 2=2048 9=4 +Scale Scale2 2 1 Convolution13_ReLU13_splitncnn_0 Flatten2 Scale2 0=-233 +Split splitncnn_6 1 2 Scale2 Scale2_splitncnn_0 Scale2_splitncnn_1 +Convolution Convolution16 1 1 Scale2_splitncnn_1 Convolution16_ReLU15 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Convolution Convolution17 1 1 Convolution16_ReLU15 Convolution17_ReLU16 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Convolution Convolution18 1 1 Convolution17_ReLU16 Convolution18_ReLU17 0=128 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Split splitncnn_7 1 2 Convolution18_ReLU17 Convolution18_ReLU17_splitncnn_0 Convolution18_ReLU17_splitncnn_1 +Pooling Pooling3 1 1 Convolution18_ReLU17_splitncnn_1 Pooling3 0=1 4=1 +InnerProduct Convolution19 1 1 Pooling3 Convolution19_ReLU18 0=16 1=1 2=2048 9=1 +InnerProduct Convolution20 1 1 Convolution19_ReLU18 Flatten3 0=128 1=1 2=2048 9=4 +Scale Scale3 2 1 Convolution18_ReLU17_splitncnn_0 Flatten3 Scale3 0=-233 +Deconvolution Deconvolution3 1 1 Scale3 Deconvolution3_ReLU19 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Split splitncnn_8 1 2 Deconvolution3_ReLU19 Deconvolution3_ReLU19_splitncnn_0 Deconvolution3_ReLU19_splitncnn_1 +Crop Crop2 2 1 Scale2_splitncnn_0 Deconvolution3_ReLU19_splitncnn_1 Crop2 0=4 1=4 +Eltwise Eltwise2 2 1 Crop2 Deconvolution3_ReLU19_splitncnn_0 Eltwise2 0=1 +Convolution Convolution21 1 1 Eltwise2 Convolution21_ReLU20 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution22 1 1 Convolution21_ReLU20 Convolution22_ReLU21 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Split splitncnn_9 1 2 Convolution22_ReLU21 Convolution22_ReLU21_splitncnn_0 Convolution22_ReLU21_splitncnn_1 +Pooling Pooling4 1 1 Convolution22_ReLU21_splitncnn_1 Pooling4 0=1 4=1 +InnerProduct Convolution23 1 1 Pooling4 Convolution23_ReLU22 0=8 1=1 2=512 9=1 +InnerProduct Convolution24 1 1 Convolution23_ReLU22 Flatten4 0=64 1=1 2=512 9=4 +Scale Scale4 2 1 Convolution22_ReLU21_splitncnn_0 Flatten4 Scale4 0=-233 +Deconvolution Deconvolution4 1 1 Scale4 Deconvolution4_ReLU23 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_10 1 2 Deconvolution4_ReLU23 Deconvolution4_ReLU23_splitncnn_0 Deconvolution4_ReLU23_splitncnn_1 +Crop Crop3 2 1 Convolution10_ReLU10_splitncnn_0 Deconvolution4_ReLU23_splitncnn_1 Crop3 0=16 1=16 +Eltwise Eltwise3 2 1 Crop3 Deconvolution4_ReLU23_splitncnn_0 Eltwise3 0=1 +Convolution Convolution25 1 1 Eltwise3 Convolution25_ReLU24 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution26 1 1 Convolution25_ReLU24 Convolution26 0=3 1=3 5=1 6=1728 +Split splitncnn_11 1 2 Convolution26 Convolution26_splitncnn_0 Convolution26_splitncnn_1 +Crop Crop4 2 1 Deconvolution2_splitncnn_0 Convolution26_splitncnn_1 Crop4 0=20 1=20 +Eltwise Eltwise4 2 1 Crop4 Convolution26_splitncnn_0 Eltwise4 0=1 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/scale2.0x_model.bin new file mode 100644 index 0000000..a455510 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/scale2.0x_model.param new file mode 100644 index 0000000..d2bf329 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-cunet/scale2.0x_model.param @@ -0,0 +1,61 @@ +7767517 +59 71 +Input input 0 1 Input1 0=200 1=200 2=3 +Convolution Convolution1 1 1 Input1 Convolution1_ReLU1 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution2 1 1 Convolution1_ReLU1 Convolution2_ReLU2 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_0 1 2 Convolution2_ReLU2 Convolution2_ReLU2_splitncnn_0 Convolution2_ReLU2_splitncnn_1 +Convolution Convolution3 1 1 Convolution2_ReLU2_splitncnn_1 Convolution3_ReLU3 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution4 1 1 Convolution3_ReLU3 Convolution4_ReLU4 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution5 1 1 Convolution4_ReLU4 Convolution5_ReLU5 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_1 1 2 Convolution5_ReLU5 Convolution5_ReLU5_splitncnn_0 Convolution5_ReLU5_splitncnn_1 +Pooling Pooling1 1 1 Convolution5_ReLU5_splitncnn_1 Pooling1 0=1 4=1 +InnerProduct Convolution6 1 1 Pooling1 Convolution6_ReLU6 0=8 1=1 2=512 9=1 +InnerProduct Convolution7 1 1 Convolution6_ReLU6 Flatten1 0=64 1=1 2=512 9=4 +Scale Scale1 2 1 Convolution5_ReLU5_splitncnn_0 Flatten1 Scale1 0=-233 +Deconvolution Deconvolution1 1 1 Scale1 Deconvolution1_ReLU7 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_2 1 2 Deconvolution1_ReLU7 Deconvolution1_ReLU7_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 +Crop Crop1 2 1 Convolution2_ReLU2_splitncnn_0 Deconvolution1_ReLU7_splitncnn_1 Crop1 0=4 1=4 +Eltwise Eltwise1 2 1 Crop1 Deconvolution1_ReLU7_splitncnn_0 Eltwise1 0=1 +Convolution Convolution8 1 1 Eltwise1 Convolution8_ReLU8 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Deconvolution Deconvolution2 1 1 Convolution8_ReLU8 Deconvolution2 0=3 1=4 3=2 4=3 5=1 6=3072 +Split splitncnn_3 1 2 Deconvolution2 Deconvolution2_splitncnn_0 Deconvolution2_splitncnn_1 +Convolution Convolution9 1 1 Deconvolution2_splitncnn_1 Convolution9_ReLU9 0=32 1=3 5=1 6=864 9=2 -23310=1,0.100000 +Convolution Convolution10 1 1 Convolution9_ReLU9 Convolution10_ReLU10 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Split splitncnn_4 1 2 Convolution10_ReLU10 Convolution10_ReLU10_splitncnn_0 Convolution10_ReLU10_splitncnn_1 +Convolution Convolution11 1 1 Convolution10_ReLU10_splitncnn_1 Convolution11_ReLU11 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Convolution Convolution12 1 1 Convolution11_ReLU11 Convolution12_ReLU12 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution13 1 1 Convolution12_ReLU12 Convolution13_ReLU13 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Split splitncnn_5 1 2 Convolution13_ReLU13 Convolution13_ReLU13_splitncnn_0 Convolution13_ReLU13_splitncnn_1 +Pooling Pooling2 1 1 Convolution13_ReLU13_splitncnn_1 Pooling2 0=1 4=1 +InnerProduct Convolution14 1 1 Pooling2 Convolution14_ReLU14 0=16 1=1 2=2048 9=1 +InnerProduct Convolution15 1 1 Convolution14_ReLU14 Flatten2 0=128 1=1 2=2048 9=4 +Scale Scale2 2 1 Convolution13_ReLU13_splitncnn_0 Flatten2 Scale2 0=-233 +Split splitncnn_6 1 2 Scale2 Scale2_splitncnn_0 Scale2_splitncnn_1 +Convolution Convolution16 1 1 Scale2_splitncnn_1 Convolution16_ReLU15 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Convolution Convolution17 1 1 Convolution16_ReLU15 Convolution17_ReLU16 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Convolution Convolution18 1 1 Convolution17_ReLU16 Convolution18_ReLU17 0=128 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Split splitncnn_7 1 2 Convolution18_ReLU17 Convolution18_ReLU17_splitncnn_0 Convolution18_ReLU17_splitncnn_1 +Pooling Pooling3 1 1 Convolution18_ReLU17_splitncnn_1 Pooling3 0=1 4=1 +InnerProduct Convolution19 1 1 Pooling3 Convolution19_ReLU18 0=16 1=1 2=2048 9=1 +InnerProduct Convolution20 1 1 Convolution19_ReLU18 Flatten3 0=128 1=1 2=2048 9=4 +Scale Scale3 2 1 Convolution18_ReLU17_splitncnn_0 Flatten3 Scale3 0=-233 +Deconvolution Deconvolution3 1 1 Scale3 Deconvolution3_ReLU19 0=128 1=2 3=2 5=1 6=65536 9=2 -23310=1,0.100000 +Split splitncnn_8 1 2 Deconvolution3_ReLU19 Deconvolution3_ReLU19_splitncnn_0 Deconvolution3_ReLU19_splitncnn_1 +Crop Crop2 2 1 Scale2_splitncnn_0 Deconvolution3_ReLU19_splitncnn_1 Crop2 0=4 1=4 +Eltwise Eltwise2 2 1 Crop2 Deconvolution3_ReLU19_splitncnn_0 Eltwise2 0=1 +Convolution Convolution21 1 1 Eltwise2 Convolution21_ReLU20 0=64 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution Convolution22 1 1 Convolution21_ReLU20 Convolution22_ReLU21 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Split splitncnn_9 1 2 Convolution22_ReLU21 Convolution22_ReLU21_splitncnn_0 Convolution22_ReLU21_splitncnn_1 +Pooling Pooling4 1 1 Convolution22_ReLU21_splitncnn_1 Pooling4 0=1 4=1 +InnerProduct Convolution23 1 1 Pooling4 Convolution23_ReLU22 0=8 1=1 2=512 9=1 +InnerProduct Convolution24 1 1 Convolution23_ReLU22 Flatten4 0=64 1=1 2=512 9=4 +Scale Scale4 2 1 Convolution22_ReLU21_splitncnn_0 Flatten4 Scale4 0=-233 +Deconvolution Deconvolution4 1 1 Scale4 Deconvolution4_ReLU23 0=64 1=2 3=2 5=1 6=16384 9=2 -23310=1,0.100000 +Split splitncnn_10 1 2 Deconvolution4_ReLU23 Deconvolution4_ReLU23_splitncnn_0 Deconvolution4_ReLU23_splitncnn_1 +Crop Crop3 2 1 Convolution10_ReLU10_splitncnn_0 Deconvolution4_ReLU23_splitncnn_1 Crop3 0=16 1=16 +Eltwise Eltwise3 2 1 Crop3 Deconvolution4_ReLU23_splitncnn_0 Eltwise3 0=1 +Convolution Convolution25 1 1 Eltwise3 Convolution25_ReLU24 0=64 1=3 5=1 6=36864 9=2 -23310=1,0.100000 +Convolution Convolution26 1 1 Convolution25_ReLU24 Convolution26 0=3 1=3 5=1 6=1728 +Split splitncnn_11 1 2 Convolution26 Convolution26_splitncnn_0 Convolution26_splitncnn_1 +Crop Crop4 2 1 Deconvolution2_splitncnn_0 Convolution26_splitncnn_1 Crop4 0=20 1=20 +Eltwise Eltwise4 2 1 Crop4 Convolution26_splitncnn_0 Eltwise4 0=1 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise0_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise0_scale2.0x_model.bin new file mode 100644 index 0000000..da22dec Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise0_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise0_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise0_scale2.0x_model.param new file mode 100644 index 0000000..b180240 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise0_scale2.0x_model.param @@ -0,0 +1,10 @@ +7767517 +8 8 +Input input 0 1 Input1 0=156 1=156 2=3 +Convolution conv1_layer 1 1 Input1 conv1_conv1_relu_layer 0=16 1=3 5=1 6=432 9=2 -23310=1,0.100000 +Convolution conv2_layer 1 1 conv1_conv1_relu_layer conv2_conv2_relu_layer 0=32 1=3 5=1 6=4608 9=2 -23310=1,0.100000 +Convolution conv3_layer 1 1 conv2_conv2_relu_layer conv3_conv3_relu_layer 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Convolution conv4_layer 1 1 conv3_conv3_relu_layer conv4_conv4_relu_layer 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution conv5_layer 1 1 conv4_conv4_relu_layer conv5_conv5_relu_layer 0=128 1=3 5=1 6=147456 9=2 -23310=1,0.100000 +Convolution conv6_layer 1 1 conv5_conv5_relu_layer conv6_conv6_relu_layer 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Deconvolution conv7_layer 1 1 conv6_conv6_relu_layer Eltwise4 0=3 1=4 3=2 4=3 5=1 6=12288 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise1_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise1_scale2.0x_model.bin new file mode 100644 index 0000000..e2ca18e Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise1_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise1_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise1_scale2.0x_model.param new file mode 100644 index 0000000..b180240 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise1_scale2.0x_model.param @@ -0,0 +1,10 @@ +7767517 +8 8 +Input input 0 1 Input1 0=156 1=156 2=3 +Convolution conv1_layer 1 1 Input1 conv1_conv1_relu_layer 0=16 1=3 5=1 6=432 9=2 -23310=1,0.100000 +Convolution conv2_layer 1 1 conv1_conv1_relu_layer conv2_conv2_relu_layer 0=32 1=3 5=1 6=4608 9=2 -23310=1,0.100000 +Convolution conv3_layer 1 1 conv2_conv2_relu_layer conv3_conv3_relu_layer 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Convolution conv4_layer 1 1 conv3_conv3_relu_layer conv4_conv4_relu_layer 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution conv5_layer 1 1 conv4_conv4_relu_layer conv5_conv5_relu_layer 0=128 1=3 5=1 6=147456 9=2 -23310=1,0.100000 +Convolution conv6_layer 1 1 conv5_conv5_relu_layer conv6_conv6_relu_layer 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Deconvolution conv7_layer 1 1 conv6_conv6_relu_layer Eltwise4 0=3 1=4 3=2 4=3 5=1 6=12288 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise2_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise2_scale2.0x_model.bin new file mode 100644 index 0000000..d320dd7 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise2_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise2_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise2_scale2.0x_model.param new file mode 100644 index 0000000..b180240 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise2_scale2.0x_model.param @@ -0,0 +1,10 @@ +7767517 +8 8 +Input input 0 1 Input1 0=156 1=156 2=3 +Convolution conv1_layer 1 1 Input1 conv1_conv1_relu_layer 0=16 1=3 5=1 6=432 9=2 -23310=1,0.100000 +Convolution conv2_layer 1 1 conv1_conv1_relu_layer conv2_conv2_relu_layer 0=32 1=3 5=1 6=4608 9=2 -23310=1,0.100000 +Convolution conv3_layer 1 1 conv2_conv2_relu_layer conv3_conv3_relu_layer 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Convolution conv4_layer 1 1 conv3_conv3_relu_layer conv4_conv4_relu_layer 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution conv5_layer 1 1 conv4_conv4_relu_layer conv5_conv5_relu_layer 0=128 1=3 5=1 6=147456 9=2 -23310=1,0.100000 +Convolution conv6_layer 1 1 conv5_conv5_relu_layer conv6_conv6_relu_layer 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Deconvolution conv7_layer 1 1 conv6_conv6_relu_layer Eltwise4 0=3 1=4 3=2 4=3 5=1 6=12288 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise3_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise3_scale2.0x_model.bin new file mode 100644 index 0000000..872324a Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise3_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise3_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise3_scale2.0x_model.param new file mode 100644 index 0000000..b180240 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/noise3_scale2.0x_model.param @@ -0,0 +1,10 @@ +7767517 +8 8 +Input input 0 1 Input1 0=156 1=156 2=3 +Convolution conv1_layer 1 1 Input1 conv1_conv1_relu_layer 0=16 1=3 5=1 6=432 9=2 -23310=1,0.100000 +Convolution conv2_layer 1 1 conv1_conv1_relu_layer conv2_conv2_relu_layer 0=32 1=3 5=1 6=4608 9=2 -23310=1,0.100000 +Convolution conv3_layer 1 1 conv2_conv2_relu_layer conv3_conv3_relu_layer 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Convolution conv4_layer 1 1 conv3_conv3_relu_layer conv4_conv4_relu_layer 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution conv5_layer 1 1 conv4_conv4_relu_layer conv5_conv5_relu_layer 0=128 1=3 5=1 6=147456 9=2 -23310=1,0.100000 +Convolution conv6_layer 1 1 conv5_conv5_relu_layer conv6_conv6_relu_layer 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Deconvolution conv7_layer 1 1 conv6_conv6_relu_layer Eltwise4 0=3 1=4 3=2 4=3 5=1 6=12288 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/scale2.0x_model.bin new file mode 100644 index 0000000..00f60a4 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/scale2.0x_model.param new file mode 100644 index 0000000..b180240 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_anime_style_art_rgb/scale2.0x_model.param @@ -0,0 +1,10 @@ +7767517 +8 8 +Input input 0 1 Input1 0=156 1=156 2=3 +Convolution conv1_layer 1 1 Input1 conv1_conv1_relu_layer 0=16 1=3 5=1 6=432 9=2 -23310=1,0.100000 +Convolution conv2_layer 1 1 conv1_conv1_relu_layer conv2_conv2_relu_layer 0=32 1=3 5=1 6=4608 9=2 -23310=1,0.100000 +Convolution conv3_layer 1 1 conv2_conv2_relu_layer conv3_conv3_relu_layer 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Convolution conv4_layer 1 1 conv3_conv3_relu_layer conv4_conv4_relu_layer 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution conv5_layer 1 1 conv4_conv4_relu_layer conv5_conv5_relu_layer 0=128 1=3 5=1 6=147456 9=2 -23310=1,0.100000 +Convolution conv6_layer 1 1 conv5_conv5_relu_layer conv6_conv6_relu_layer 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Deconvolution conv7_layer 1 1 conv6_conv6_relu_layer Eltwise4 0=3 1=4 3=2 4=3 5=1 6=12288 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise0_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise0_scale2.0x_model.bin new file mode 100644 index 0000000..8be4d30 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise0_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise0_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise0_scale2.0x_model.param new file mode 100644 index 0000000..b180240 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise0_scale2.0x_model.param @@ -0,0 +1,10 @@ +7767517 +8 8 +Input input 0 1 Input1 0=156 1=156 2=3 +Convolution conv1_layer 1 1 Input1 conv1_conv1_relu_layer 0=16 1=3 5=1 6=432 9=2 -23310=1,0.100000 +Convolution conv2_layer 1 1 conv1_conv1_relu_layer conv2_conv2_relu_layer 0=32 1=3 5=1 6=4608 9=2 -23310=1,0.100000 +Convolution conv3_layer 1 1 conv2_conv2_relu_layer conv3_conv3_relu_layer 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Convolution conv4_layer 1 1 conv3_conv3_relu_layer conv4_conv4_relu_layer 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution conv5_layer 1 1 conv4_conv4_relu_layer conv5_conv5_relu_layer 0=128 1=3 5=1 6=147456 9=2 -23310=1,0.100000 +Convolution conv6_layer 1 1 conv5_conv5_relu_layer conv6_conv6_relu_layer 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Deconvolution conv7_layer 1 1 conv6_conv6_relu_layer Eltwise4 0=3 1=4 3=2 4=3 5=1 6=12288 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise1_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise1_scale2.0x_model.bin new file mode 100644 index 0000000..453ceba Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise1_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise1_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise1_scale2.0x_model.param new file mode 100644 index 0000000..b180240 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise1_scale2.0x_model.param @@ -0,0 +1,10 @@ +7767517 +8 8 +Input input 0 1 Input1 0=156 1=156 2=3 +Convolution conv1_layer 1 1 Input1 conv1_conv1_relu_layer 0=16 1=3 5=1 6=432 9=2 -23310=1,0.100000 +Convolution conv2_layer 1 1 conv1_conv1_relu_layer conv2_conv2_relu_layer 0=32 1=3 5=1 6=4608 9=2 -23310=1,0.100000 +Convolution conv3_layer 1 1 conv2_conv2_relu_layer conv3_conv3_relu_layer 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Convolution conv4_layer 1 1 conv3_conv3_relu_layer conv4_conv4_relu_layer 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution conv5_layer 1 1 conv4_conv4_relu_layer conv5_conv5_relu_layer 0=128 1=3 5=1 6=147456 9=2 -23310=1,0.100000 +Convolution conv6_layer 1 1 conv5_conv5_relu_layer conv6_conv6_relu_layer 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Deconvolution conv7_layer 1 1 conv6_conv6_relu_layer Eltwise4 0=3 1=4 3=2 4=3 5=1 6=12288 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise2_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise2_scale2.0x_model.bin new file mode 100644 index 0000000..35861ef Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise2_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise2_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise2_scale2.0x_model.param new file mode 100644 index 0000000..b180240 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise2_scale2.0x_model.param @@ -0,0 +1,10 @@ +7767517 +8 8 +Input input 0 1 Input1 0=156 1=156 2=3 +Convolution conv1_layer 1 1 Input1 conv1_conv1_relu_layer 0=16 1=3 5=1 6=432 9=2 -23310=1,0.100000 +Convolution conv2_layer 1 1 conv1_conv1_relu_layer conv2_conv2_relu_layer 0=32 1=3 5=1 6=4608 9=2 -23310=1,0.100000 +Convolution conv3_layer 1 1 conv2_conv2_relu_layer conv3_conv3_relu_layer 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Convolution conv4_layer 1 1 conv3_conv3_relu_layer conv4_conv4_relu_layer 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution conv5_layer 1 1 conv4_conv4_relu_layer conv5_conv5_relu_layer 0=128 1=3 5=1 6=147456 9=2 -23310=1,0.100000 +Convolution conv6_layer 1 1 conv5_conv5_relu_layer conv6_conv6_relu_layer 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Deconvolution conv7_layer 1 1 conv6_conv6_relu_layer Eltwise4 0=3 1=4 3=2 4=3 5=1 6=12288 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise3_scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise3_scale2.0x_model.bin new file mode 100644 index 0000000..ddbf8a1 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise3_scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise3_scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise3_scale2.0x_model.param new file mode 100644 index 0000000..b180240 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/noise3_scale2.0x_model.param @@ -0,0 +1,10 @@ +7767517 +8 8 +Input input 0 1 Input1 0=156 1=156 2=3 +Convolution conv1_layer 1 1 Input1 conv1_conv1_relu_layer 0=16 1=3 5=1 6=432 9=2 -23310=1,0.100000 +Convolution conv2_layer 1 1 conv1_conv1_relu_layer conv2_conv2_relu_layer 0=32 1=3 5=1 6=4608 9=2 -23310=1,0.100000 +Convolution conv3_layer 1 1 conv2_conv2_relu_layer conv3_conv3_relu_layer 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Convolution conv4_layer 1 1 conv3_conv3_relu_layer conv4_conv4_relu_layer 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution conv5_layer 1 1 conv4_conv4_relu_layer conv5_conv5_relu_layer 0=128 1=3 5=1 6=147456 9=2 -23310=1,0.100000 +Convolution conv6_layer 1 1 conv5_conv5_relu_layer conv6_conv6_relu_layer 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Deconvolution conv7_layer 1 1 conv6_conv6_relu_layer Eltwise4 0=3 1=4 3=2 4=3 5=1 6=12288 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/scale2.0x_model.bin b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/scale2.0x_model.bin new file mode 100644 index 0000000..fafff0b Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/scale2.0x_model.bin differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/scale2.0x_model.param b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/scale2.0x_model.param new file mode 100644 index 0000000..b180240 --- /dev/null +++ b/upscale/waifu2x-ncnn-vulkan-20220728-macos/models-upconv_7_photo/scale2.0x_model.param @@ -0,0 +1,10 @@ +7767517 +8 8 +Input input 0 1 Input1 0=156 1=156 2=3 +Convolution conv1_layer 1 1 Input1 conv1_conv1_relu_layer 0=16 1=3 5=1 6=432 9=2 -23310=1,0.100000 +Convolution conv2_layer 1 1 conv1_conv1_relu_layer conv2_conv2_relu_layer 0=32 1=3 5=1 6=4608 9=2 -23310=1,0.100000 +Convolution conv3_layer 1 1 conv2_conv2_relu_layer conv3_conv3_relu_layer 0=64 1=3 5=1 6=18432 9=2 -23310=1,0.100000 +Convolution conv4_layer 1 1 conv3_conv3_relu_layer conv4_conv4_relu_layer 0=128 1=3 5=1 6=73728 9=2 -23310=1,0.100000 +Convolution conv5_layer 1 1 conv4_conv4_relu_layer conv5_conv5_relu_layer 0=128 1=3 5=1 6=147456 9=2 -23310=1,0.100000 +Convolution conv6_layer 1 1 conv5_conv5_relu_layer conv6_conv6_relu_layer 0=256 1=3 5=1 6=294912 9=2 -23310=1,0.100000 +Deconvolution conv7_layer 1 1 conv6_conv6_relu_layer Eltwise4 0=3 1=4 3=2 4=3 5=1 6=12288 diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_240p.mp4 b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_240p.mp4 new file mode 100644 index 0000000..0cb711c Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_240p.mp4 differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_360p.mp4 b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_360p.mp4 new file mode 100644 index 0000000..dc0a324 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_360p.mp4 differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_480p.mp4 b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_480p.mp4 new file mode 100644 index 0000000..33d59d9 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_480p.mp4 differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_720p.mp4 b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_720p.mp4 new file mode 100644 index 0000000..a1011b8 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_720p.mp4 differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_1080p.jpg b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_1080p.jpg new file mode 100644 index 0000000..928fe98 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_1080p.jpg differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_240p.jpg b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_240p.jpg new file mode 100644 index 0000000..2befe30 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_240p.jpg differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_240p_up.jpg b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_240p_up.jpg new file mode 100644 index 0000000..91c5783 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_240p_up.jpg differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_360p.jpg b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_360p.jpg new file mode 100644 index 0000000..613bac7 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_360p.jpg differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_360p_up.jpg b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_360p_up.jpg new file mode 100644 index 0000000..97a80f0 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_360p_up.jpg differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_480p.jpg b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_480p.jpg new file mode 100644 index 0000000..fbd4d75 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_480p.jpg differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_480p_up.jpg b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_480p_up.jpg new file mode 100644 index 0000000..5d779d9 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_480p_up.jpg differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_720p.jpg b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_720p.jpg new file mode 100644 index 0000000..1a44703 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_720p.jpg differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_720p_up.jpg b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_720p_up.jpg new file mode 100644 index 0000000..a4e3e85 Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/output_frame_720p_up.jpg differ diff --git a/upscale/waifu2x-ncnn-vulkan-20220728-macos/waifu2x-ncnn-vulkan b/upscale/waifu2x-ncnn-vulkan-20220728-macos/waifu2x-ncnn-vulkan new file mode 100755 index 0000000..9429a9d Binary files /dev/null and b/upscale/waifu2x-ncnn-vulkan-20220728-macos/waifu2x-ncnn-vulkan differ diff --git a/yolov7-setup/track.md b/yolov7-setup/track.md index fcccc57..756a1f1 100644 --- a/yolov7-setup/track.md +++ b/yolov7-setup/track.md @@ -1,29 +1,54 @@ -Images : +# Images : +```bash +python3 tracker/track_demo.py --device cpu/0 --obj /tracking_images --detector yolov7 --tracker sort --detector_model_path best.pt --save_dir /tracking --save_images +``` + +Ex : ```bash python3 tracker/track_demo.py --device cpu --obj /Users/noham/Documents/GitHub/Stage-2024/VoTT-v2/tracking_images --detector yolov7 --tracker sort --detector_model_path /Users/noham/Documents/GitHub/Stage-2024/VoTT-v2/yolov7x-datasetv2_2024072211/weights/best.pt --save_dir /Users/noham/Documents/GitHub/Stage-2024/VoTT-v2/tracking --save_images ``` -Video : +# Video : +```bash +python3 tracker/track_demo.py --device cpu/0 --obj video.mp4 --detector yolov7 --tracker sort --detector_model_path best.pt --save_dir /tracking --save_videos +``` + +Ex : ```bash python3 tracker/track_demo.py --device cpu --obj /Users/noham/Documents/GitHub/Stage-2024/VoTT-v2/sources/2016-100m.mp4 --detector yolov7 --tracker sort --detector_model_path /Users/noham/Documents/GitHub/Stage-2024/VoTT-v2/yolov7x-datasetv2_2024072211/weights/best.pt --save_dir /Users/noham/Documents/GitHub/Stage-2024/VoTT-v2/tracking --save_videos ``` - + + +# Examples : +- [2016-200m_tracked.mp4](../tracking/2016-200m_tracked.mp4) ([2016-200m.mp4](../VoTT-v2/2016-200m.mp4)) +- [2018-100m_tracked.mp4](../tracking/2018-100m_tracked.mp4) ([2018-100m.mp4](../VoTT-v2/2018-100m.mp4)) +- [2023-100m_tracked.mp4](../tracking/2023-100m_tracked.mp4) ([2023-100m.mp4](../VoTT-v2/2023-100m.mp4)) -Fixes : +# Fixes : +```text self.other_param['stride'] -> 32 -np.float64 in /tracker/trackers/tracklet.py +np.float -> np.float64 in /tracker/trackers/tracklet.py +```` +Error : +``` File "/Users/noham/Documents/GitHub/Stage-2024/test/yolov7-tracker/tracker/trackers/tracklet.py", line 44, in __init__ self.kalman_filter = MOTION_MODEL_DICT[motion]() KeyError: 'default' +``` + +Fix : +``` line 43 : self.motion = 'sort' motion = 'sort' +```` +Les méthodes de tracking disponibles (seulement testé SortTracker) : ```python TRACKER_DICT = { 'sort': SortTracker,