History

dnn_backend_native_layer_mathunary: add ceil support

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 = 'ceil' 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') y = tf.math.ceil( 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()) print("model.pb generated, please in ffmpeg path use\n \n \ python tools/python/convert.py ceil_savemodel/model.pb --outdir=ceil_savemodel/ \n \n \ 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 ffmpeg path use\n \n \ ./ffmpeg -i detection.jpg -vf format=rgb24,dnn_processing=model=ceil_savemodel/model.pb:input=dnn_in:output=dnn_out:dnn_backend=tensorflow -f framemd5 ceil_savemodel/tensorflow_out.md5\n \n \ to generate output result of tensorflow model\n") print("To verify, please ffmpeg path use\n \n \ ./ffmpeg -i detection.jpg -vf format=rgb24,dnn_processing=model=ceil_savemodel/model.model:input=dnn_in:output=dnn_out:dnn_backend=native -f framemd5 ceil_savemodel/native_out.md5\n \n \ to generate output result of native model\n")

Mingyu Yin committed 6 years ago

Commit 9fbdd541 parent fa7ad815 files · +13 −2Browse files

Showing the changes to libavfilter (2 of 5 files). Show all

Unified · Split

2 files
  1. libavfilter/dnn/dnn_backend_native_layer_mathunary.c +4 −0
  2. libavfilter/dnn/dnn_backend_native_layer_mathunary.h +1 −0
libavfilter/dnn/dnn_backend_native_layer_mathunary.c+4−0
@@ -130,6 +130,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper · 129 unmodified lines
130 for (int i = 0; i < dims_count; ++i)130 for (int i = 0; i < dims_count; ++i)
131 dst[i] = atanh(src[i]);131 dst[i] = atanh(src[i]);
132 return 0;132 return 0;
133 case DMUO_CEIL:
134 for (int i = 0; i < dims_count; ++i)
135 dst[i] = ceil(src[i]);
136 return 0;
133 default:137 default:
134 return -1;138 return -1;
135 }139 }
libavfilter/dnn/dnn_backend_native_layer_mathunary.h+1−0
@@ -43,6 +43,7 @@ typedef enum { · 42 unmodified lines
43 DMUO_ASINH = 10,43 DMUO_ASINH = 10,
44 DMUO_ACOSH = 11,44 DMUO_ACOSH = 11,
45 DMUO_ATANH = 12,45 DMUO_ATANH = 12,
46 DMUO_CEIL = 13,
46 DMUO_COUNT47 DMUO_COUNT
47} DNNMathUnaryOperation;48} DNNMathUnaryOperation;
48 49

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t