From patchwork Tue Jul 28 11:50:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingyu Yin X-Patchwork-Id: 21336 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 3842B4488AD for ; Tue, 28 Jul 2020 14:48:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22F6968B9A9; Tue, 28 Jul 2020 14:48:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2706168B981 for ; Tue, 28 Jul 2020 14:48:12 +0300 (EEST) IronPort-SDR: l67vI9h4RBPBQabMsnj4RxwiBThWzyI497l1HUbwTaYGThzzvGQ3ZOD0vTnWH/Jb2DjlB6yvdS OggXQejS2sTA== X-IronPort-AV: E=McAfee;i="6000,8403,9695"; a="139224116" X-IronPort-AV: E=Sophos;i="5.75,406,1589266800"; d="scan'208";a="139224116" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2020 04:48:11 -0700 IronPort-SDR: B5jjpErYC4dNStM/0YMnUPRntPfpJO+brvX9bqOpl3fOzPCQJdrgb8p4Is5/xkuSoTT883Fe/C wrUWQqqHgrgw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,406,1589266800"; d="scan'208";a="303826667" Received: from cyj-pro.sh.intel.com ([10.239.98.50]) by orsmga002.jf.intel.com with ESMTP; 28 Jul 2020 04:48:10 -0700 From: Mingyu Yin To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Jul 2020 19:50:06 +0800 Message-Id: <20200728115006.14570-1-mingyu.yin@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 2/2] dnn_backend_native_layer_mathunary: add floor 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 os import numpy as np import imageio from tensorflow.python.framework import graph_util name = 'floor' pb_file_path = os.getcwd() if not os.path.exists(pb_file_path+'/{}_savemodel/'.format(name)): os.mkdir(pb_file_path+'/{}_savemodel/'.format(name)) with tf.Session(graph=tf.Graph()) as sess: in_img = imageio.imread('detection.jpg') in_img = in_img.astype(np.float32) in_data = in_img[np.newaxis, :] input_x = tf.placeholder(tf.float32, shape=[1, None, None, 3], name='dnn_in') if name=='floor': y = tf.math.floor( input_x, name='dnn_out') sess.run(tf.global_variables_initializer()) constant_graph = graph_util.convert_variables_to_constants(sess, sess.graph_def, ['dnn_out']) with tf.gfile.FastGFile(pb_file_path+'/{}_savemodel/model.pb'.format(name), mode='wb') as f: f.write(constant_graph.SerializeToString()) builder = tf.saved_model.builder.SavedModelBuilder(pb_file_path+'/{}_save'.format(name)) builder.add_meta_graph_and_variables(sess, ['{}_meta_graph_server'.format(name)]) print("model.pb generated, please use \ path_to_ffmpeg/tools/python/convert.py to generate model.model\n") output = sess.run(y, feed_dict={ input_x: in_data}) imageio.imsave("out.jpg", np.squeeze(output)) print("To verify, please use\n \n \ ./ffmpeg -i path_to_image -vf format=rgb24,dnn_processing=path_to_tensorflwo_model(.pb):input=dnn_in:output=dnn_out:dnn_backend=tensorflow -f framemd5 path_to_output_result_dir/tensorflow_out.md5\n \n \ to generate output result of tensorflow model\n") print("To verify, please use\n \n \ ./ffmpeg -i path_to_image -vf format=rgb24,dnn_processing=path_to_native_model(.model):input=dnn_in:output=dnn_out:dnn_backend=native -f framemd5 path_to_output_result_dir/native_out.md5\n \n \ to generate output result of native model\n") builder.save() Signed-off-by: Mingyu Yin --- libavfilter/dnn/dnn_backend_native_layer_mathunary.c | 4 ++++ libavfilter/dnn/dnn_backend_native_layer_mathunary.h | 1 + tests/dnn/dnn-layer-mathunary-test.c | 4 ++++ tools/python/convert_from_tensorflow.py | 2 +- tools/python/convert_header.py | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c index a62f6ba6f0..f9f88983f9 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -134,6 +134,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = ceil(src[i]); return 0; + case DMUO_FLOOR: + for (int i = 0; i < dims_count; ++i) + dst[i] = floor(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 82b2d7f4ab..1b78fbe1c2 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -44,6 +44,7 @@ typedef enum { DMUO_ACOSH = 11, DMUO_ATANH = 12, DMUO_CEIL = 13, + DMUO_FLOOR = 14, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tests/dnn/dnn-layer-mathunary-test.c b/tests/dnn/dnn-layer-mathunary-test.c index a653b945c4..b526aac936 100644 --- a/tests/dnn/dnn-layer-mathunary-test.c +++ b/tests/dnn/dnn-layer-mathunary-test.c @@ -58,6 +58,8 @@ static float get_expected(float f, DNNMathUnaryOperation op) return atanh(f); case DMUO_CEIL(f): return ceil(f); + case DMUO_FLOOR(f): + return floor(f); default: av_assert0(!"not supported yet"); return 0.f; @@ -132,5 +134,7 @@ int main(int agrc, char **argv) return 1; if (test(DMUO_CEIL)) return 1; + if (test(DMUO_FLOOR)) + return 1; return 0; } diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 64b7551314..2fb8c4c303 100644 --- a/tools/python/convert_from_tensorflow.py +++ b/tools/python/convert_from_tensorflow.py @@ -74,7 +74,7 @@ class TFConverter: 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, 'Atanh':12, 'Ceil':13} + 'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14} 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 62f1d342f3..b12b5079fc 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 = 19 +minor = 20