update to upstream version 20210520 and update README.md mentioning i…

…ssue #1 Signed-off-by: ArchieMeng <[email protected]>
media2x · May 20, 2021 · b599971 · b599971
1 parent 6c84631
commit b599971
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,9 @@ rife-ncnn-vulkan-python wraps [rife-ncnn-vulkan project](https://github.com/nihu
 
 ## Downloads
 
-Linux/Windos/Mac X86_64 build releases are available now. **However, for Linux (Like Ubuntu 18.04) with an older GLIBC (version < 2.29), you may try to use the ubuntu-1804 release or just compile it on your own.**
+Linux/Windos/Mac X86_64 build releases are available now. 
+- **However, for Linux (Like Ubuntu 18.04) with an older GLIBC (version < 2.29), you may try to use the ubuntu-1804 release or just compile it on your own.**
+- **Windows release is not working for all python version. The version of Windows build is for python 3.9. This is a known issue: [ImportError: DLL load failed while importing _rife_ncnn_vulkan_wrapper: The specified module could not be found.](https://github.com/ArchieMeng/rife-ncnn-vulkan-python/issues/1)**
 
 ## Build
 
@@ -30,9 +32,10 @@ I used Visual Studio 2019 and msvc v142 to build this project for Windows.
 
 Install visual studio and open the project directory, and build. Job done.
 
-The only problem on Windows is that, you cannot use [CMake for Windows](https://cmake.org/download/) to generate the Visual Studio solution file and build it. This will make the lib crash on loading.
+The only problem on Windows is that, you cannot use [CMake for Windows](https://cmake.org/download/) GUI to generate the Visual Studio solution file and build it. This will make the lib crash on loading.
 
-The only way is [use Visual Studio to open the project as directory](https://www.microfocus.com/documentation/visual-cobol/vc50/VS2019/GUID-BE1C48AA-DB22-4F38-9644-E9B48658EF36.html), and build it from Visual Studio.
+~~The only way is~~ One way is [use Visual Studio to open the project as directory](https://www.microfocus.com/documentation/visual-cobol/vc50/VS2019/GUID-BE1C48AA-DB22-4F38-9644-E9B48658EF36.html), and build it from Visual Studio. 
+And another way is build it from powershell just like what is wrote in [release.yml](.github/workflows/release.yml)
 
 ## About RIFE
 

diff --git a/models/rife-v3.1/contextnet.bin b/models/rife-v3.1/contextnet.bin
diff --git a/models/rife-v3.1/contextnet.param b/models/rife-v3.1/contextnet.param
diff --git a/models/rife-v3.1/flownet.bin b/models/rife-v3.1/flownet.bin
diff --git a/models/rife-v3.1/flownet.param b/models/rife-v3.1/flownet.param
diff --git a/models/rife-v3.1/fusionnet.bin b/models/rife-v3.1/fusionnet.bin
diff --git a/models/rife-v3.1/fusionnet.param b/models/rife-v3.1/fusionnet.param
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -109,6 +109,7 @@ if(NOT USE_SYSTEM_NCNN)
     option(NCNN_INSTALL_SDK "" OFF)
     option(NCNN_PIXEL_ROTATE "" OFF)
     option(NCNN_PIXEL_AFFINE "" OFF)
+    option(NCNN_PIXEL_DRAWING "" OFF)
     option(NCNN_VULKAN "" ON)
     option(NCNN_VULKAN_ONLINE_SPIRV "" ON)
     option(NCNN_BUILD_BENCHMARK "" OFF)

diff --git a/src/ncnn b/src/ncnn
+4 −4		.github/workflows/linux-aarch64-cpu-gcc.yml
+40 −4		.github/workflows/release.yml
+3 −3		.github/workflows/web-assembly.yml
+3 −0		.restyled.yaml
+7 −2		CMakeLists.txt
+4 −5		README.md
+9 −4		benchmark/benchncnn.cpp
+259 −0		benchmark/efficientnetv2_b0.param
+69 −5		cmake/ncnn_add_layer.cmake
+14 −0		cmake/ncnn_generate_arm82dot_source.cmake
+6 −4		codeformat.sh
+10 −1		docs/how-to-use-and-FAQ/build-minimal-library.md
+8 −0		python/src/main.cpp
+7 −4		python/tests/benchmark.py
+4 −0		python/tests/test_net.py
+4 −2		src/CMakeLists.txt
+20 −0		src/cpu.cpp
+2 −0		src/cpu.h
+13 −0		src/layer.cpp
+1 −1		src/layer/concat.cpp
+5 −0		src/layer_registry_arm82dot.h.in
+52 −0		src/mat.h
+1,527 −0		src/mat_pixel_drawing.cpp
+3,911 −0		src/mat_pixel_drawing_font.h
+ −		src/mat_pixel_drawing_font.png
+100 −48		src/net.cpp
+8 −0		src/net.h
+2 −0		src/platform.h.in
+303 −34		src/simpleocv.cpp
+195 −35		src/simpleocv.h
+7,762 −0		src/stb_image.h
+1,690 −0		src/stb_image_write.h
+4 −0		tests/CMakeLists.txt
+753 −0		tests/test_mat_pixel_drawing.cpp
+24 −6		tools/mlir/mlir2ncnn.cpp
+3 −0		tools/mlir/ncnn_dialect.h
+10 −11		tools/mlir/ncnn_ops.td
+14 −25		tools/mlir/ncnn_rewriter.cpp
+18 −0		tools/mlir/ncnn_rewriter.td
+3 −0		tools/modelwriter.h
+87 −13		tools/ncnnoptimize.cpp
+30 −25		tools/quantize/CMakeLists.txt
+212 −0		tools/quantize/imreadwrite.cpp
+200 −0		tools/quantize/imreadwrite.h
+6 −2		tools/quantize/ncnn2table.cpp