From patchwork Mon Jun 29 14:54:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20712 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp2876228ybm; Mon, 29 Jun 2020 08:00:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyq+UJwi7+ZXPbk3BXhLJgN8VK6Mmjh6t8bi3XaI6OcYt/w6US4Yih/udSHW+R60P8So2RN X-Received: by 2002:adf:9525:: with SMTP id 34mr18367351wrs.313.1593442833272; Mon, 29 Jun 2020 08:00:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593442833; cv=none; d=google.com; s=arc-20160816; b=agE3rpNLNd7CNs+GM9BPl6IJmWgQLMCNeFAGxRpsGCre4Q3OoPLOyQMNBSf6AIE/Ik FUwxO5TsGNlWCf5YJHMc9TjSFcM1aOlNJunJ5kGSBUKGU7/b0JdZf8JFD7U+gf5ZtR5c aL2sape+C3ho6u1bL2v5FyFrA0fDVSs/4wOBHSa6hNurquWxIb5YFHemAq0JovC31bdk hme24m0FtYGd2RMRjtpFtm3TqjJtBh5BLunuX4ke+pyzNps5J/7hBnAKjNksBUx+ttj0 7Z5GOXHpmcH06mFAVGaPIsHyeRPTXwxWzhB3jhQ90c167r6yXcPFfTcSgVujauyPiCaU zZzw== 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=IKMWjMB0hGLYnZsx4RyoLTNhMcOuVm5E9Ck9ZyKmB+I=; b=pKamh8ezolcNBHsVxGHZIg9V+dEIIjAgmiLzk/pRZHB7bZrToylm1/hZHxtmovY/b6 uh7iDNKMY3Y0EJI0g7vYwkyl2/0/Es9YUaGtgWP0CuXP5jgqWl1icggHNId/cTLJcc2c Irl2uDSICCtxBRK7AglZvuyAdwiEzwruwYneO7M1CkHF+9yTuq67X+HQ+0IrlEqT4aE/ +9ORNfLO0vYw+WgyjhD3ZTkB+aLneF1CZnWRbBXKGX3/ISYDcIWTTWWJ6undfwBSWSbd M1QgKp68rhpbWlOEKy+MIs6puNuLegEysoDx7U/YHWhZtslasTV5FT9C2khglrELBbBC /64A== 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 t3si160472wrm.3.2020.06.29.08.00.32; Mon, 29 Jun 2020 08:00:33 -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 A774168AA6B; Mon, 29 Jun 2020 18:00:06 +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 29A2468A295 for ; Mon, 29 Jun 2020 17:59:58 +0300 (EEST) IronPort-SDR: rD+hrNVnviLAOi/7qdLcGTP1qb6lKkEZs3D8LHJ5pWgG7kvf444wSkmt9mPNjBdKfET0x5mPoA swtjG0PkMUBg== X-IronPort-AV: E=McAfee;i="6000,8403,9666"; a="144173129" X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="144173129" 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:55 -0700 IronPort-SDR: u6XZcETSFeql8uXROt59saRowh52hB/n6klKb+bXuyzteER8kHOmENztwP6/UFUsP35FvkAu5X 77zp79rOF6mQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="313069746" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.54]) by fmsmga002.fm.intel.com with ESMTP; 29 Jun 2020 07:59:55 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 22:54:02 +0800 Message-Id: <20200629145411.24005-3-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 03/12] dnn_backend_native_layer_mathunary: add cosh 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: HokAnq+O2HB3 Content-Length: 3855 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 2630fe07e2..ddb70996e7 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -108,6 +108,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = sinh(src[i]); return 0; + case DMUO_COSH: + for (int i = 0; i < dims_count; ++i) + dst[i] = cosh(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 760930c60e..5a486b4f5f 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -38,6 +38,7 @@ typedef enum { DMUO_ACOS = 5, DMUO_ATAN = 6, DMUO_SINH = 7, + DMUO_COSH = 8, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 6f34a71ab4..96da44c4a8 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} + self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8} 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 4747f41395..a73f51ba48 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 = 13 +minor = 14