From patchwork Tue Aug 18 06:38:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingyu Yin X-Patchwork-Id: 21697 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 C1446447C66 for ; Tue, 18 Aug 2020 09:36:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9EF4068B859; Tue, 18 Aug 2020 09:36:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE97E68B7DF for ; Tue, 18 Aug 2020 09:36:29 +0300 (EEST) IronPort-SDR: TMX00yZteS5YGSGSvJdkOdQrkQ/k9ftZOkxNFwnOgDM5V/CdcrmLPRocbJBDZbZ2mZXTYHxM4I mTCbo/ZI22tg== X-IronPort-AV: E=McAfee;i="6000,8403,9716"; a="154823605" X-IronPort-AV: E=Sophos;i="5.76,326,1592895600"; d="scan'208";a="154823605" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2020 23:36:27 -0700 IronPort-SDR: a21pX/5CqcugcYlxNt3jLh8kYVJaxTtZM4U/gucKeuEvQQNZ9cK6/8x7GkUhU37z8NnO1r8tcV h/AhEZtTsAbg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,326,1592895600"; d="scan'208";a="310337552" Received: from cyj-pro.sh.intel.com ([10.239.98.50]) by orsmga002.jf.intel.com with ESMTP; 17 Aug 2020 23:36:25 -0700 From: Mingyu Yin To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Aug 2020 14:38:45 +0800 Message-Id: <20200818063845.5889-1-mingyu.yin@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [v2] dnn_backend_native_layer_mathbinary: add floormod 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 --- .../dnn/dnn_backend_native_layer_mathbinary.c | 17 +++++++++++++++++ .../dnn/dnn_backend_native_layer_mathbinary.h | 1 + tests/dnn/dnn-layer-mathbinary-test.c | 5 +++++ tools/python/convert_from_tensorflow.py | 2 +- tools/python/convert_header.py | 2 +- 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c index dd42c329a9..6876aaf2c6 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c @@ -175,6 +175,23 @@ int dnn_execute_layer_math_binary(DnnOperand *operands, const int32_t *input_ope } } return 0; + case DMBO_FLOORMOD: + if (params->input0_broadcast) { + for (int i = 0; i < dims_count; ++i) { + dst[i] = (int)(params->v) % (int)(src[i]); + } + } else if (params->input1_broadcast) { + for (int i = 0; i < dims_count; ++i) { + dst[i] = (int)(src[i]) % (int)(params->v); + } + } else { + const DnnOperand *input1 = &operands[input_operand_indexes[1]]; + const float *src1 = input1->data; + for (int i = 0; i < dims_count; ++i) { + dst[i] = (int)(src[i]) % (int)(src1[i]); + } + } + return 0; default: return -1; } diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h index 0acf3b0ea0..9525685afa 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.h @@ -36,6 +36,7 @@ typedef enum { DMBO_MUL = 2, DMBO_REALDIV = 3, DMBO_MINIMUM = 4, + DMBO_FLOORMOD = 5, DMBO_COUNT } DNNMathBinaryOperation; diff --git a/tests/dnn/dnn-layer-mathbinary-test.c b/tests/dnn/dnn-layer-mathbinary-test.c index e7f8f8557c..e5f6a12939 100644 --- a/tests/dnn/dnn-layer-mathbinary-test.c +++ b/tests/dnn/dnn-layer-mathbinary-test.c @@ -40,6 +40,8 @@ static float get_expected(float f1, float f2, DNNMathBinaryOperation op) return f1 / f2; case DMBO_MINIMUM: return (f1 < f2) ? f1 : f2; + case DMBO_FLOORMOD: + return (int)(f1) % (int)(f2); default: av_assert0(!"not supported yet"); return 0.f; @@ -205,5 +207,8 @@ int main(int argc, char **argv) if (test(DMBO_MINIMUM)) return 1; + if (test(DMBO_FLOORMOD)) + return 1; + return 0; } diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 3c14bed487..1762091fdd 100644 --- a/tools/python/convert_from_tensorflow.py +++ b/tools/python/convert_from_tensorflow.py @@ -73,7 +73,7 @@ class TFConverter: self.conv2d_scopename_inputname_dict = {} self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4, 'MathBinary':5, 'MathUnary':6, 'AvgPool':7} - self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4} + self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4, 'FloorMod':5} 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, 'Round':15} diff --git a/tools/python/convert_header.py b/tools/python/convert_header.py index 747c8776eb..782a6341f9 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 = 21 +minor = 22