From patchwork Mon Aug 10 11:05:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingyu Yin X-Patchwork-Id: 21580 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8FED944B47E for ; Mon, 10 Aug 2020 14:03:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 64E8C68ACAE; Mon, 10 Aug 2020 14:03:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA39F687FFA for ; Mon, 10 Aug 2020 14:03:34 +0300 (EEST) IronPort-SDR: AGx/vwtzPh/UyDS1yERU32drzRMCFkn08E1VP8SqATB+CFv1kvlclnLsQYg9QVWvAZEa5kjS1H kavti2iBF6nw== X-IronPort-AV: E=McAfee;i="6000,8403,9708"; a="133049585" X-IronPort-AV: E=Sophos;i="5.75,457,1589266800"; d="scan'208";a="133049585" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2020 04:03:32 -0700 IronPort-SDR: A1tPqaos2obIJBJ7dRMykkgbGP8QFAb5uLQ8AVbfLI7aNgPxlxKLQ9tdXvDxxdlaVA7MR5zmhM 66v32hi803VQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,457,1589266800"; d="scan'208";a="317311311" Received: from cyj-pro.sh.intel.com ([10.239.98.50]) by fmsmga004.fm.intel.com with ESMTP; 10 Aug 2020 04:03:31 -0700 From: Mingyu Yin To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Aug 2020 19:05:42 +0800 Message-Id: <20200810110542.18466-1-mingyu.yin@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] dnn_backend_native_layer_mathunary: add round support X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Mingyu Yin --- libavfilter/dnn/dnn_backend_native_layer_mathunary.c | 4 ++++ libavfilter/dnn/dnn_backend_native_layer_mathunary.h | 1 + tests/dnn/dnn-layer-mathunary-test.c | 4 ++++ tools/python/convert_from_tensorflow.py | 2 +- tools/python/convert_header.py | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c index f9f88983f9..58ee0e9d3d 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -138,6 +138,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = floor(src[i]); return 0; + case DMUO_ROUND: + for (int i = 0; i < dims_count; ++i) + dst[i] = round(src[i]); + return 0; default: return -1; } diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h index 1b78fbe1c2..d6a61effd5 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -45,6 +45,7 @@ typedef enum { DMUO_ATANH = 12, DMUO_CEIL = 13, DMUO_FLOOR = 14, + DMUO_ROUND = 15, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tests/dnn/dnn-layer-mathunary-test.c b/tests/dnn/dnn-layer-mathunary-test.c index 0bfcdcbd85..e9235120f3 100644 --- a/tests/dnn/dnn-layer-mathunary-test.c +++ b/tests/dnn/dnn-layer-mathunary-test.c @@ -60,6 +60,8 @@ static float get_expected(float f, DNNMathUnaryOperation op) return ceil(f); case DMUO_FLOOR: return floor(f); + case DMUO_ROUND: + return round(f); default: av_assert0(!"not supported yet"); return 0.f; @@ -136,5 +138,7 @@ int main(int agrc, char **argv) return 1; if (test(DMUO_FLOOR)) return 1; + if (test(DMUO_ROUND)) + return 1; return 0; } diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 2fb8c4c303..65fdbc5d43 100644 --- a/tools/python/convert_from_tensorflow.py +++ b/tools/python/convert_from_tensorflow.py @@ -74,7 +74,7 @@ class TFConverter: self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4} self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10, - 'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14} + 'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14, 'Round':15} self.mirrorpad_mode = {'CONSTANT':0, 'REFLECT':1, 'SYMMETRIC':2} self.name_operand_dict = {} diff --git a/tools/python/convert_header.py b/tools/python/convert_header.py index b12b5079fc..747c8776eb 100644 --- a/tools/python/convert_header.py +++ b/tools/python/convert_header.py @@ -23,4 +23,4 @@ str = 'FFMPEGDNNNATIVE' major = 1 # increase minor when we don't have to re-convert the model file -minor = 20 +minor = 21