From a82cf9188f79707d9f345ac6cae8ccea420dd1f8 Mon Sep 17 00:00:00 2001 From: nihui Date: Thu, 20 May 2021 23:21:42 +0800 Subject: [PATCH] update ncnn, allow more threads per gpu device --- README.md | 1 + src/CMakeLists.txt | 1 + src/main.cpp | 2 -- src/ncnn | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3b53662..8f769de 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 99aa6bb..df0fbc3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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) diff --git a/src/main.cpp b/src/main.cpp index ff16a3c..2e0c768 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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]; } } diff --git a/src/ncnn b/src/ncnn index 5d6f03d..1d80aa0 160000 --- a/src/ncnn +++ b/src/ncnn @@ -1 +1 @@ -Subproject commit 5d6f03dbbd438319c671432ff6d98a60adf12440 +Subproject commit 1d80aa0d83ca90624947cd644584efd97b95105f