From 1af4863179c24118d3ee56c68a39087121a03145 Mon Sep 17 00:00:00 2001 From: Megvii Engine Team Date: Mon, 11 May 2020 17:28:07 +0800 Subject: [PATCH] fix(dnn/fallback): fix conv1x1's is_preferred method GitOrigin-RevId: 6d34080d2557614cea97443d7a8153299714be31 --- dnn/src/aarch64/matrix_mul/opr_impl.cpp | 2 +- dnn/src/armv7/matrix_mul/opr_impl.cpp | 4 ++-- dnn/src/fallback/conv_bias/conv1x1/algos.h | 4 ++++ src/core/impl/comp_node/cpu/comp_node.cpp | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dnn/src/aarch64/matrix_mul/opr_impl.cpp b/dnn/src/aarch64/matrix_mul/opr_impl.cpp index 384b2e12..c9691647 100644 --- a/dnn/src/aarch64/matrix_mul/opr_impl.cpp +++ b/dnn/src/aarch64/matrix_mul/opr_impl.cpp @@ -64,8 +64,8 @@ public: all_algos.emplace_back(&int8x8x32_k8x12x4_dotprod); #else all_algos.emplace_back(&int8x8x32_gemv); - all_algos.emplace_back(&int8x8x32_k8x8x8); all_algos.emplace_back(&int8x8x32_k4x4x16); + all_algos.emplace_back(&int8x8x32_k8x8x8); all_algos.emplace_back(&int8x8x32_mk4_4x4x16); #endif all_algos.emplace_back(&int8x8x16_k4x4x16); diff --git a/dnn/src/armv7/matrix_mul/opr_impl.cpp b/dnn/src/armv7/matrix_mul/opr_impl.cpp index 4244b077..f6a9d91c 100644 --- a/dnn/src/armv7/matrix_mul/opr_impl.cpp +++ b/dnn/src/armv7/matrix_mul/opr_impl.cpp @@ -61,11 +61,11 @@ public: all_algos.emplace_back(&int8x8x32_gemv); #endif all_algos.emplace_back(&int8x8x32_mk4_4x2x16); - all_algos.emplace_back(&int8x8x32_k4x8x8); all_algos.emplace_back(&int8x8x32_k4x2x16); + all_algos.emplace_back(&int8x8x32_k4x8x8); all_algos.emplace_back(&quint8_k4x8x8); - all_algos.emplace_back(&int8x8x16_k4x8x8); all_algos.emplace_back(&int8x8x16_k4x2x16); + all_algos.emplace_back(&int8x8x16_k4x8x8); all_algos.emplace_back(&int16x16x32_k12x4x1); all_algos.emplace_back(&int16x16x32_mk8_4x8); } diff --git a/dnn/src/fallback/conv_bias/conv1x1/algos.h b/dnn/src/fallback/conv_bias/conv1x1/algos.h index 79e05e9b..b5c76664 100644 --- a/dnn/src/fallback/conv_bias/conv1x1/algos.h +++ b/dnn/src/fallback/conv_bias/conv1x1/algos.h @@ -41,6 +41,10 @@ public: SmallVector dispatch_kerns( ConvBiasImpl* opr, const NCBKernSizeParam& param) const override; + bool is_preferred(ConvBiasImpl*, const NCBKernSizeParam&) const override{ + return true; + } + protected: size_t get_oc_tile_size_heuristic(const NCBKernSizeParam& param) const; diff --git a/src/core/impl/comp_node/cpu/comp_node.cpp b/src/core/impl/comp_node/cpu/comp_node.cpp index 3c5375c8..cc71e3ac 100644 --- a/src/core/impl/comp_node/cpu/comp_node.cpp +++ b/src/core/impl/comp_node/cpu/comp_node.cpp @@ -58,7 +58,9 @@ class CpuCompNode::WorkerQueue final void on_async_queue_worker_thread_start() override { mgb_assert(m_locator.device >= 0); if (enable_affinity) { +#if !defined(ANDROID) && !defined(__ANDROID__) sys::set_cpu_affinity({m_locator.device}); +#endif } sys::set_thread_name(m_locator.to_string()); if(m_thread_pool)