From patchwork Mon Jun 29 14:54:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20738 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp2875849ybm; Mon, 29 Jun 2020 08:00:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkqH738kRZ0V9qOjGxTUNYv1x+rBAjk7zE21K7CPUo3dZOYb8SDEti1s58NFIfaH+iDStf X-Received: by 2002:a5d:6b08:: with SMTP id v8mr18172878wrw.2.1593442805141; Mon, 29 Jun 2020 08:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593442805; cv=none; d=google.com; s=arc-20160816; b=vupazSXtHO41LT/Y+sj7weWQ0AsSrz/026MA05I8lrfgtI+4hglBOvyc3IwBWI2ecy x6J4qPI15Fz1USAQ5clmXi2Pp1Fq8LIwfXsUKXjK3bbWsWgR54ht9ydevhzowUE08MPT 2PqZwsH8YHOkHoPoJSyvH8NAnxyRpYgsfPHd/mXyl9Ms7M6WbcRne/6u2raO/qO2ESmh 2fft5/dKl1bxmAgMX+frN+4pQS9vtpfcYTYzUxF15nzuJiSDrahY1Nt9mYlteEnMB743 tWNno0p2pE7E5iIL8brfCyZEyfPYBnbQd9AxUQ/0gTIhQjHRz9iYcH2g+Mk3jRHneC4R eQWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:ironport-sdr :ironport-sdr:delivered-to; bh=sag66jxvXDm7ptyFzZI0Apu9+BIb7UjWN32NfeoLEEg=; b=LAQ45WVbrvJBZAFiDfG8R+jM4nioMR1NwRjR0CMjFFmu5UdVdp8qmwvCGd8pKvBMwS GizdoO8n/Ru2KZakFigbTdmxgRB8x5Bblsy0ZgaNuyOfDW49ONMYHgSX+VCioBDSYfP+ 6hl/6zsqrJSdcFHBjaSu4nv0FyNBiGv0sYJ/BTvlT7+9CaCQz7yAeIHl+ta8NCKSeC/f r5Dq1t5Ln2LefcKviqDXvWKW/c9fWyP7X2nsfQLOJcvRK3rB9a8FdaUceTBsfICHK7xn bVUVYGPL7goOxjXedJm5iQwlR31JhF95WTsfgsTK/knQWQ7SNdlhbZo8AODX/bb2eS1H 09zA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s11si165896wri.53.2020.06.29.08.00.04; Mon, 29 Jun 2020 08:00:05 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6EC196882CE; Mon, 29 Jun 2020 18:00:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05490687FC7 for ; Mon, 29 Jun 2020 17:59:55 +0300 (EEST) IronPort-SDR: iXZFbxdB9rARbJGIHaaBVzdtuW0YRltPOq6ZhaPpKDsJlkP0TsSot2qSDDCMaNl+quP4PvgvHZ y6+y3MpCLH2g== X-IronPort-AV: E=McAfee;i="6000,8403,9666"; a="144173124" X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="144173124" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2020 07:59:54 -0700 IronPort-SDR: hhKeK5eoVCkMYVr2X5Ris/3ESfCkBIEBGjPvctOORRXur18WgIpu9UEezSTmxxJYm9V3MU0BUI 9izjl76tlx7w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="313069741" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.54]) by fmsmga002.fm.intel.com with ESMTP; 29 Jun 2020 07:59:53 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 22:54:00 +0800 Message-Id: <20200629145411.24005-1-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH V2 01/12] dnn_backend_native_layer_mathunary: add sinh 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" X-TUID: NOUz07jYixID Content-Length: 3915 Signed-off-by: Ting Fu --- V2: Add more test number Fix incorrect atanh unit test libavfilter/dnn/dnn_backend_native_layer_mathunary.c | 4 ++++ libavfilter/dnn/dnn_backend_native_layer_mathunary.h | 1 + tools/python/convert_from_tensorflow.py | 2 +- tools/python/convert_header.py | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c index 42615c43d5..2630fe07e2 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -104,6 +104,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = atan(src[i]); return 0; + case DMUO_SINH: + for (int i = 0; i < dims_count; ++i) + dst[i] = sinh(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 13fa33178a..760930c60e 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -37,6 +37,7 @@ typedef enum { DMUO_ASIN = 4, DMUO_ACOS = 5, DMUO_ATAN = 6, + DMUO_SINH = 7, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index b90c31c495..6f34a71ab4 100644 --- a/tools/python/convert_from_tensorflow.py +++ b/tools/python/convert_from_tensorflow.py @@ -72,7 +72,7 @@ class TFConverter: self.conv2d_scopename_inputname_dict = {} self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4, 'MathBinary':5, 'MathUnary':6} 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} + self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5, 'Atan':6, 'Sinh':7} 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 73cf23bf53..4747f41395 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 = 12 +minor = 13