Skip to content

Commit

Permalink
update ncnn, allow more threads per gpu device
Browse files Browse the repository at this point in the history
  • Loading branch information
nihui committed May 20, 2021
1 parent 11ccf46 commit a82cf91
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ cmake --build . -j 4
| rife-v2.3 | 2.3 |
| rife-v2.4 | 2.4 |
| rife-v3.0 | 3.0 |
| rife-v3.1 | 3.1 |

## Sample Images

Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,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)
Expand Down
2 changes: 0 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -762,8 +762,6 @@ int main(int argc, char** argv)
}
else
{
int gpu_queue_count = ncnn::get_gpu_info(gpuid[i]).compute_queue_count();
jobs_proc[i] = std::min(jobs_proc[i], gpu_queue_count);
total_jobs_proc += jobs_proc[i];
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/ncnn
Submodule ncnn updated 46 files
+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
+80 −12 src/gpu.cpp
+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

0 comments on commit a82cf91

Please sign in to comment.