From patchwork Thu Jun 18 09:15:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20453 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6B44444B58B for ; Thu, 18 Jun 2020 12:21:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3FCE368B6F6; Thu, 18 Jun 2020 12:21:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36F6768B6A1 for ; Thu, 18 Jun 2020 12:21:33 +0300 (EEST) IronPort-SDR: RZ7nbLRoH+YKmKXL1mDhT46KbHOeXF4ONymP+YvbXPz2saPRCNzk2SaPc0OXHFCJGkRqy8P1yt W5XQHgn6dIsQ== X-IronPort-AV: E=McAfee;i="6000,8403,9655"; a="207748151" X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="207748151" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2020 02:21:23 -0700 IronPort-SDR: mKimAnJk4v8a5USk0hCe6tNHHMvAW5AyigsRqg5xgkp2wfy5eKz6CGUXiQ7epuh9us9lP/qba5 QlY0jrfAJhiw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="477130692" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.126]) by fmsmga006.fm.intel.com with ESMTP; 18 Jun 2020 02:21:22 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jun 2020 17:15:31 +0800 Message-Id: <20200618091536.8733-1-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/6] dnn_backend_native_layer_mathunary: add asin 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" 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') x1 = tf.asin(x) x2 = tf.divide(x1, 3.1416/2) # pi/2 y = tf.identity(x2, name='dnn_out') 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 90fac6aa67..3a147c2b3c 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -92,6 +92,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = tan(src[i]); return 0; + case DMUO_ASIN: + for (int i = 0; i < dims_count; ++i) + dst[i] = asin(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 40a9bb5fb8..1c25db5a42 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -34,6 +34,7 @@ typedef enum { DMUO_SIN = 1, DMUO_COS = 2, DMUO_TAN = 3, + DMUO_ASIN = 4, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 9da6a43612..5e526e31ce 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} + self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4} 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 b7fb0f797a..2b6afe8d13 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 = 9 +minor = 10 From patchwork Thu Jun 18 09:15:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20454 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4DE8744B58B for ; Thu, 18 Jun 2020 12:21:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A42368B6A1; Thu, 18 Jun 2020 12:21:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 292F968AFF5 for ; Thu, 18 Jun 2020 12:21:39 +0300 (EEST) IronPort-SDR: niPbT+e5F5Rsi1Pi8jW4GL8AkH92xkmLfMqAMrMkARJTzFzwwlt+1ttVmBudRF7CNQ8Z7HbuLU CPLbbvZQS1mw== X-IronPort-AV: E=McAfee;i="6000,8403,9655"; a="207748152" X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="207748152" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2020 02:21:24 -0700 IronPort-SDR: C58LjoyhqSqjjvjVG4BLZBJXdDkAWcmxRaFbD/lriiHdq/F+yO8p4A4ukMVN5mHf9plRka2AqU 0tfAsv9mY+bQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="477130695" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.126]) by fmsmga006.fm.intel.com with ESMTP; 18 Jun 2020 02:21:23 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jun 2020 17:15:32 +0800 Message-Id: <20200618091536.8733-2-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200618091536.8733-1-ting.fu@intel.com> References: <20200618091536.8733-1-ting.fu@intel.com> Subject: [FFmpeg-devel] [PATCH 2/6] dnn-layer-math-unary-test: add unit test for asin 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" Signed-off-by: Ting Fu --- tests/dnn/dnn-layer-mathunary-test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/dnn/dnn-layer-mathunary-test.c b/tests/dnn/dnn-layer-mathunary-test.c index 9a7e07c98c..ac26f7445f 100644 --- a/tests/dnn/dnn-layer-mathunary-test.c +++ b/tests/dnn/dnn-layer-mathunary-test.c @@ -38,6 +38,8 @@ static float get_expected(float f, DNNMathUnaryOperation op) return cos(f); case DMUO_TAN: return tan(f); + case DMUO_ASIN: + return asin(f); default: av_assert0(!"not supported yet"); return 0.f; @@ -89,5 +91,7 @@ int main(int agrc, char **argv) return 1; if (test(DMUO_TAN)) return 1; + if (test(DMUO_ASIN)) + return 1; return 0; } From patchwork Thu Jun 18 09:15:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20455 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 44E6F44B58B for ; Thu, 18 Jun 2020 12:21:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A74F68B75C; Thu, 18 Jun 2020 12:21:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D72C68B6A1 for ; Thu, 18 Jun 2020 12:21:41 +0300 (EEST) IronPort-SDR: 5vk3LMv7jAKLiLxnIgSe33UMgvx6t/w5Lk1PVYm9zmbLQgpJf2jOWJn01ilJck/JPHbYCGzwri 59RefuVxvGXw== X-IronPort-AV: E=McAfee;i="6000,8403,9655"; a="207748154" X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="207748154" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2020 02:21:25 -0700 IronPort-SDR: MzyRjr6ZpooOAxY2So919HY9aWuVMRJBI32SJvr6RDZolax8cs4sAi+8C/y4Ah4t+7YNUenwoR xzE4oZnxeoYA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="477130698" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.126]) by fmsmga006.fm.intel.com with ESMTP; 18 Jun 2020 02:21:24 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jun 2020 17:15:33 +0800 Message-Id: <20200618091536.8733-3-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200618091536.8733-1-ting.fu@intel.com> References: <20200618091536.8733-1-ting.fu@intel.com> Subject: [FFmpeg-devel] [PATCH 3/6] dnn_backend_native_layer_mathunary: add acos 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" 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') x1 = tf.acos(x) x2 = tf.divide(x1, 3.1416/2) # pi/2 y = tf.identity(x2, name='dnn_out') 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 3a147c2b3c..d130058546 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -96,6 +96,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = asin(src[i]); return 0; + case DMUO_ACOS: + for (int i = 0; i < dims_count; ++i) + dst[i] = acos(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 1c25db5a42..f146248567 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -35,6 +35,7 @@ typedef enum { DMUO_COS = 2, DMUO_TAN = 3, DMUO_ASIN = 4, + DMUO_ACOS = 5, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 5e526e31ce..78297e48a9 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} + self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5} 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 2b6afe8d13..4a8e44b4aa 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 = 10 +minor = 11 From patchwork Thu Jun 18 09:15:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20456 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1150644B58B for ; Thu, 18 Jun 2020 12:21:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F101268B76B; Thu, 18 Jun 2020 12:21:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E3F768B708 for ; Thu, 18 Jun 2020 12:21:45 +0300 (EEST) IronPort-SDR: m7nH88zWUfZ/0RNzDnssEy1misUhCte3vFbVPnpVzluWdgaufih2oHSRYj82clGOfRsxNowNZB D+qIFoT3x+Cw== X-IronPort-AV: E=McAfee;i="6000,8403,9655"; a="207748155" X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="207748155" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2020 02:21:26 -0700 IronPort-SDR: VzuIrTLUN/ByX2BwURrMMSvHByeiAith5eD6ZxQjmTe7K+E/eT4NSahYnpnrk97g1ewDxdhXp4 jHyutQtsXIHw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="477130703" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.126]) by fmsmga006.fm.intel.com with ESMTP; 18 Jun 2020 02:21:25 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jun 2020 17:15:34 +0800 Message-Id: <20200618091536.8733-4-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200618091536.8733-1-ting.fu@intel.com> References: <20200618091536.8733-1-ting.fu@intel.com> Subject: [FFmpeg-devel] [PATCH 4/6] dnn-layer-math-unary-test: add unit test for acos 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" Signed-off-by: Ting Fu --- tests/dnn/dnn-layer-mathunary-test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/dnn/dnn-layer-mathunary-test.c b/tests/dnn/dnn-layer-mathunary-test.c index ac26f7445f..540ea4cef5 100644 --- a/tests/dnn/dnn-layer-mathunary-test.c +++ b/tests/dnn/dnn-layer-mathunary-test.c @@ -40,6 +40,8 @@ static float get_expected(float f, DNNMathUnaryOperation op) return tan(f); case DMUO_ASIN: return asin(f); + case DMUO_ACOS: + return acos(f); default: av_assert0(!"not supported yet"); return 0.f; @@ -93,5 +95,7 @@ int main(int agrc, char **argv) return 1; if (test(DMUO_ASIN)) return 1; + if (test(DMUO_ACOS)) + return 1; return 0; } From patchwork Thu Jun 18 09:15:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20457 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D23E744B58B for ; Thu, 18 Jun 2020 12:21:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C08FE68B780; Thu, 18 Jun 2020 12:21:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4167B68B74D for ; Thu, 18 Jun 2020 12:21:47 +0300 (EEST) IronPort-SDR: iNT83czEQFpSAXER7ySepI+sYHjWLHWNZ7H3Bfm+RALH8YQK0R1BLdB7aC5GrfyAQW5SY3J0Di SiuEpK+MeX3A== X-IronPort-AV: E=McAfee;i="6000,8403,9655"; a="207748157" X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="207748157" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2020 02:21:27 -0700 IronPort-SDR: BqlUgsQsXwyct0mzBDr8mwB7i7bD81KUHbOO+bwLKv1R1VO9qONgwOvJP3J9cVtm0Mew2dFpjY Ui/2lYJ9QH/g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="477130708" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.126]) by fmsmga006.fm.intel.com with ESMTP; 18 Jun 2020 02:21:26 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jun 2020 17:15:35 +0800 Message-Id: <20200618091536.8733-5-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200618091536.8733-1-ting.fu@intel.com> References: <20200618091536.8733-1-ting.fu@intel.com> Subject: [FFmpeg-devel] [PATCH 5/6] dnn_backend_native_layer_mathunary: add atan 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" 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') x1 = tf.atan(x) x2 = tf.divide(x1, 3.1416/4) # pi/4 y = tf.identity(x2, name='dnn_out') 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 d130058546..42615c43d5 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -100,6 +100,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = acos(src[i]); return 0; + case DMUO_ATAN: + for (int i = 0; i < dims_count; ++i) + dst[i] = atan(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 f146248567..13fa33178a 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -36,6 +36,7 @@ typedef enum { DMUO_TAN = 3, DMUO_ASIN = 4, DMUO_ACOS = 5, + DMUO_ATAN = 6, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 78297e48a9..b90c31c495 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} + self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5, 'Atan':6} 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 4a8e44b4aa..73cf23bf53 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 = 11 +minor = 12 From patchwork Thu Jun 18 09:15:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 20458 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id ADFE544B58B for ; Thu, 18 Jun 2020 12:21:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A032268B78C; Thu, 18 Jun 2020 12:21:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5569B68B766 for ; Thu, 18 Jun 2020 12:21:47 +0300 (EEST) IronPort-SDR: GYW6KCj9sRq1bo2jbLm+AyevIdAykaeGEMQJEg6uO8y1qo1phek1DbZR2TXz65TmdtZ0Q1UNwl JQrpFvGrouTw== X-IronPort-AV: E=McAfee;i="6000,8403,9655"; a="207748158" X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="207748158" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2020 02:21:28 -0700 IronPort-SDR: B/5SLocl0uqJ/Jeo4VWMdMDvTyDl587zlZE7QA7cdK+lgwNyAATdyZU+QqrZy0HHBWaPqPlO4p VVNLQNQy+gSg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,526,1583222400"; d="scan'208";a="477130713" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.126]) by fmsmga006.fm.intel.com with ESMTP; 18 Jun 2020 02:21:27 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jun 2020 17:15:36 +0800 Message-Id: <20200618091536.8733-6-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200618091536.8733-1-ting.fu@intel.com> References: <20200618091536.8733-1-ting.fu@intel.com> Subject: [FFmpeg-devel] [PATCH 6/6] dnn-layer-math-unary-test: add unit test for atan 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" Signed-off-by: Ting Fu --- tests/dnn/dnn-layer-mathunary-test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/dnn/dnn-layer-mathunary-test.c b/tests/dnn/dnn-layer-mathunary-test.c index 540ea4cef5..bf77c44bbe 100644 --- a/tests/dnn/dnn-layer-mathunary-test.c +++ b/tests/dnn/dnn-layer-mathunary-test.c @@ -42,6 +42,8 @@ static float get_expected(float f, DNNMathUnaryOperation op) return asin(f); case DMUO_ACOS: return acos(f); + case DMUO_ATAN: + return atan(f); default: av_assert0(!"not supported yet"); return 0.f; @@ -97,5 +99,7 @@ int main(int agrc, char **argv) return 1; if (test(DMUO_ACOS)) return 1; + if (test(DMUO_ATAN)) + return 1; return 0; }