From patchwork Mon Jun 29 14:54:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20726 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp2876518ybm; Mon, 29 Jun 2020 08:00:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQJHcVtH9D9+KgjyLUJLw4WG7Tp3F8aGpJiM9QH1voa8kucd9BDrJRCAGoH8Z2hgHEI2fW X-Received: by 2002:a5d:5310:: with SMTP id e16mr16607432wrv.289.1593442852571; Mon, 29 Jun 2020 08:00:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593442852; cv=none; d=google.com; s=arc-20160816; b=a9tZf7/sloojgRevJUtMT5lDwPqoRMJMJEe2mgDwb7T6xiwUND+6zOx9tl1Qm+hHqf YR7g8HoxLAk7O3sh5fvwOKnPQAKPbaDsXivLJdf4MWh7J2AisowutWxbkvinZtGC3Le6 69BF7u4HRhbsUDBq39ewBE0ezOzD9EL6IYzR0J/W49NlOnCsLJ3D0s0ymxQdU2XUccYa SnOWHqaUWUOBwx+tAOb8LRBwKdT+MhBqhTQqBWL5i5eZeh707kzjBMwizMqbVw4bKvrO 3h/0kmguTZ2Z4N66dbCprgyCAdgWGqo0tfgJQquChxVxE/uxea8yaqCuA271xn4bJ2cD 4Y9A== 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=Lh3IRztxkSxWuy/eX0fx0o3VcNmZqAiT1XVxVYaxi28=; b=J7aUtiWSoDNaOihuyIXw1ZyAJFDEhT1SvVMXouit2MbyYOzeO4gOJmcglY/RRQU01v jGCQDLRCqBURu0aVsAXPCC/IRxSnQAiiccvD0OlGmr6QJiXVpNTLoCuVxkHTNPzyodgY PbtLtLhrfoHvZhXag6YwF5XdoJQOfY0WI4DcUjSucO4fu04ABZ1NfacCXowsZ8Tid+4y HVFHc+oCsYkewbT1s0NvvnxJZBIiyxlUa+WUuU5CJ9zhjnPKCSpoD1WT2obPNVYQ2TDs b2i37bLqQfFxlnrblBqxYwjvliig2ydfKfSOaaM3AgxiB0SPpRwsbDZJu3YByRkMG2zf 0udQ== 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 i3si149669wri.274.2020.06.29.08.00.52; Mon, 29 Jun 2020 08:00:52 -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 0839968AAD8; Mon, 29 Jun 2020 18:00:11 +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 8038C6881F5 for ; Mon, 29 Jun 2020 18:00:03 +0300 (EEST) IronPort-SDR: 8AKZF1PfnBlDtSVXcmOVhRqb/OUuQwoirXv+92UUGI9TD/Aoda5DcZaf9YeKkAANdFL3TZiSnU +4SnZIYbWAJg== X-IronPort-AV: E=McAfee;i="6000,8403,9666"; a="144173133" X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="144173133" 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:57 -0700 IronPort-SDR: JdXpmkgXOMK4QU8tZ575hyzazXWmJh0O6JcfYRjjmvAo38SyAdYOMZynfQXw/5OZznfC9aXgai /Lvpj/2t5h+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="313069756" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.54]) by fmsmga002.fm.intel.com with ESMTP; 29 Jun 2020 07:59:56 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 22:54:04 +0800 Message-Id: <20200629145411.24005-5-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 05/12] dnn_backend_native_layer_mathunary: add tanh 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: 0/Wa7Kyc5N9P Content-Length: 3883 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 ddb70996e7..ccdbcc21e0 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -112,6 +112,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = cosh(src[i]); return 0; + case DMUO_TANH: + for (int i = 0; i < dims_count; ++i) + dst[i] = tanh(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 5a486b4f5f..ae0c1e1cdd 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -39,6 +39,7 @@ typedef enum { DMUO_ATAN = 6, DMUO_SINH = 7, DMUO_COSH = 8, + DMUO_TANH = 9, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 96da44c4a8..f98a3cae3d 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} + self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9} 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 a73f51ba48..d2753f0af0 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 = 14 +minor = 15