From patchwork Mon Jun 29 14:54:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20720 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp2877443ybm; Mon, 29 Jun 2020 08:01:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9YgwKZ4UT2vCPuHFLe1aymrVHOebzYYuNjArs9vDhz/AXshmpcdxochf1k/1mS9gEtQPQ X-Received: by 2002:adf:f452:: with SMTP id f18mr17143747wrp.389.1593442916052; Mon, 29 Jun 2020 08:01:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593442916; cv=none; d=google.com; s=arc-20160816; b=OCnGP94DqJ4stVswpG3UxTSBJbA/ohEGKgZOkDM/vbHC2VXAQifdsFl3nZMJ3WDohw AJYHgwM+MgGUzuny8VVJ+ewvVvwbFlBZwrHtx6cRhPQqsAonfp7VHpM76Uqk6EoyeiJX 08zFbFiqL8JQUSsQG5G+XkxvBe1vUi3x951YRMvULv40eYVnD1HzqQSbhMPpaHRDG4T8 OxpgRD/ss72wk7Uy1nlurWQgvQVI3LQJ9jziOqlz1XXTAnTQ4Nq6wMD3Ke5q0ZLlVy6E ka1OqD0SLFi3YBD7sGSQK9gKqdQn/28DPCtosJw9XmzG/EF0cQko9bBstR3djicIagYW UPUw== 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=ePkitFRsvTfJQbikwP8S0tFErgHEb3okXHrITZLkXfk=; b=fbS+1t9lBeO1v6J33VVFRWg7ioHfSqnY8d0b6/ytKBjSFYhrzblBskwohONPR16xqR 7z06yToQdjsYpDoe22KcHxbzwE4sC9nmMdkNtXFs32iPO1sqesqVSb8WnZK077SQdvZC h/JKiEfFE+1lo+iGOmViidb46utPYCYkuHLAUfxP8UZECehpD240KPn/nQpyWOAaAyiK D1RKP9zL1U8eccpTD364H4MZQza3nUyeuUg+ym7IUgbwRk9Pghp+VTHgUtVtsVv+yZ29 e0hqRfFvNtqL1SLG7J239JPNzSczAv3zOk/mQkaGQoWSWo9slf7E3ZO6r41F/RqDvkJt mtwQ== 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 r26si176234wra.116.2020.06.29.08.01.55; Mon, 29 Jun 2020 08:01:56 -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 B347568A427; Mon, 29 Jun 2020 18:00:19 +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 ECD8168AABE for ; Mon, 29 Jun 2020 18:00:12 +0300 (EEST) IronPort-SDR: vi81ANYTcSMh+eMqtROlZSEayHhlgUqOYyzr/M1hodPHc3bqS9bfI243zzbgD7EqvbOfcU1/bL Gd7J6JXxXTlA== X-IronPort-AV: E=McAfee;i="6000,8403,9666"; a="144173152" X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="144173152" 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:03 -0700 IronPort-SDR: MMSftCdtG84dG2TLP1FYvrVs3p2XfAv66L8OVx0GSug4DA+2JLcZJ3Ki5DNob2wsPC7ziQb32f f+ipeeoXPUmw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="313069810" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.54]) by fmsmga002.fm.intel.com with ESMTP; 29 Jun 2020 08:00:02 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 22:54:10 +0800 Message-Id: <20200629145411.24005-11-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 11/12] dnn_backend_native_layer_mathunary: add atanh 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: fQbOoTaf0D5I Content-Length: 5925 It can be tested with the model generated with below python script: import tensorflow as tf import numpy as np import imageio in_img = imageio.imread('input.jpeg') in_img = in_img.astype(np.float32)/255.0 in_data = in_img[np.newaxis, :] x = tf.placeholder(tf.float32, shape=[1, None, None, 3], name='dnn_in') please uncomment the part you want to test x_sinh_1 = tf.sinh(x) x_out = tf.divide(x_sinh_1, 1.176) # sinh(1.0) x_cosh_1 = tf.cosh(x) x_out = tf.divide(x_cosh_1, 1.55) # cosh(1.0) x_tanh_1 = tf.tanh(x) x__out = tf.divide(x_tanh_1, 0.77) # tanh(1.0) x_asinh_1 = tf.asinh(x) x_out = tf.divide(x_asinh_1, 0.89) # asinh(1.0/1.1) x_acosh_1 = tf.add(x, 1.1) x_acosh_2 = tf.acosh(x_acosh_1) # accept (1, inf) x_out = tf.divide(x_acosh_2, 1.4) # acosh(2.1) x_atanh_1 = tf.divide(x, 1.1) x_atanh_2 = tf.atanh(x_atanh_1) # accept (-1, 1) x_out = tf.divide(x_atanh_2, 1.55) # atanhh(1.0/1.1) y = tf.identity(x_out, name='dnn_out') #please only preserve the x_out you want to test sess=tf.Session() sess.run(tf.global_variables_initializer()) graph_def = tf.graph_util.convert_variables_to_constants(sess, sess.graph_def, ['dnn_out']) tf.train.write_graph(graph_def, '.', 'image_process.pb', as_text=False) print("image_process.pb generated, please use \ path_to_ffmpeg/tools/python/convert.py to generate image_process.model\n") output = sess.run(y, feed_dict={x: in_data}) imageio.imsave("out.jpg", np.squeeze(output)) 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 b77b84a794..c83d50db64 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -124,6 +124,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = acosh(src[i]); return 0; + case DMUO_ATANH: + for (int i = 0; i < dims_count; ++i) + dst[i] = atanh(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 eb30231549..8076356ba4 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -42,6 +42,7 @@ typedef enum { DMUO_TANH = 9, DMUO_ASINH = 10, DMUO_ACOSH = 11, + DMUO_ATANH = 12, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 1e73e3aefe..85db7bf710 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, 'Acosh':11} + 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} 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 8fc3438552..9851d84144 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 = 17 +minor = 18