From patchwork Mon Jun 29 14:54:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20710 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp2876901ybm; Mon, 29 Jun 2020 08:01:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpo+8A1T2b34CGvE0vmgrujZa6nrFWbF8z/Y8lcdsSoYeJUngRS9LuyBr0F6UeHXiD/Pnb X-Received: by 2002:adf:a51a:: with SMTP id i26mr17041121wrb.406.1593442880295; Mon, 29 Jun 2020 08:01:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593442880; cv=none; d=google.com; s=arc-20160816; b=YUkRw7GmEvHhPueroqLq/kGKHsqdVJALzM7VIiXBFh/iQrp6vkt8NbkozrpE1VPTVf A58U83De0RHyGYMRMgk3ZCZ17gxTO8wbVukIjf4cCB0857vwqAHvD1vnzgh5ZeFG/JOQ KnjNcKULodU6boJuW/tqUxC/A8/4tArfn/W8lJDvW6GM6hn9G8o489MExG6nS++oOJmY eejyCOAStwJcpqtXWRN8ogqFtBBcusDZe8vJkx/dttlyxlsBXbkAHL/A/2PGzz83lip0 DgW7wxE4S1HahW9XqYwpQnV7tO0w70ucp23a/Q7zQ7CwPS+bTFrtSIVBM5ZEXme0bgxM eDTA== 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:references:in-reply-to:message-id:date :to:from:ironport-sdr:ironport-sdr:delivered-to; bh=+eNxQBn9OdI+Uv0EZ1AzKIKu7tdAx2RKJDc+9n9QV80=; b=GAPjvCbvjM/tBihbZSyIy0woxi6Vqyf0wbTWnaRNjccTQcXdRvPFCW5/FEgaIvt29V K9PuQIYkE0TUk4R2UdaDC1lFdR3ZiMxeLGrh6qE/Px49IbYrJQkpBzAQ9uzkgzHV13eP qsf7NEwoSurmBxfNV9tqOYBr3A8JxtnVzrYLtLK/mDhdzr5+xXvL6vS6th1xk8PLBKQQ 5QjzF5io5S21hxrWA8d5368igQKPe2z0+PBKAqPjP3cAwb8T1eri2hCpG4XrkeMGVpYU Khf3IhI2lz7S9e+gyuPtEWpfLpTTllovwb26V98HZRlis7rulLFEBYm43attvkTGd3P3 xREQ== 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 m127si160566wmf.205.2020.06.29.08.01.19; Mon, 29 Jun 2020 08:01:20 -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 E5D8C68AC48; Mon, 29 Jun 2020 18:00:14 +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 09E1E68AAFB for ; Mon, 29 Jun 2020 18:00:10 +0300 (EEST) IronPort-SDR: 7ybMVyl27JajbxT3OlBKwYejRyVQO+GCT093/Yy6Aq+apCfgf1wHrbP88lkuPB8KK4WreBcmUk 5OYz1CvZxsvg== X-IronPort-AV: E=McAfee;i="6000,8403,9666"; a="144173143" X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="144173143" 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 08:00:01 -0700 IronPort-SDR: 5CxAXpjMLZlf/o/CCSmQf7UWmrKSyHjJnckkzFha+e1WbQhaGkaOvrzwacYzHH43Qju/yzkA1T o/LvjzJxoLkQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="313069776" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.54]) by fmsmga002.fm.intel.com with ESMTP; 29 Jun 2020 08:00:00 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 22:54:08 +0800 Message-Id: <20200629145411.24005-9-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200629145411.24005-1-ting.fu@intel.com> References: <20200629145411.24005-1-ting.fu@intel.com> Subject: [FFmpeg-devel] [PATCH V2 09/12] dnn_backend_native_layer_mathunary: add acosh 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: r1R6AW3Wk+I1 Content-Length: 3956 Signed-off-by: Ting Fu --- 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 83df98d0f8..b77b84a794 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -120,6 +120,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = asinh(src[i]); return 0; + case DMUO_ACOSH: + for (int i = 0; i < dims_count; ++i) + dst[i] = acosh(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 fbe9af5c7d..eb30231549 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -41,6 +41,7 @@ typedef enum { DMUO_COSH = 8, DMUO_TANH = 9, DMUO_ASINH = 10, + DMUO_ACOSH = 11, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 0d756c8109..1e73e3aefe 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, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10} + 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} 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 3211c13f6d..8fc3438552 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 = 16 +minor = 17