History

dnn/native: add native support for minimum

it can be tested with model file generated with below python script: import tensorflow as tf import numpy as np import imageio in_img = imageio.imread('input.jpg') 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.minimum(0.7, x) x2 = tf.maximum(x1, 0.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))

Guo, Yejun committed 6 years ago

Commit 71e28c51 parent 607b85f4 files · +18 −9Browse files

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

Unified · Split

2 files
  1. libavfilter/dnn/dnn_backend_native_layer_mathbinary.c +13 −0
  2. libavfilter/dnn/dnn_backend_native_layer_mathbinary.h +1 −0
libavfilter/dnn/dnn_backend_native_layer_mathbinary.c+13−0
@@ -150,6 +150,19 @@ int dnn_execute_layer_math_binary(DnnOperand *operands, const int32_t *input_ope · 149 unmodified lines
150150 }
151151 }
152152 return 0;
153+ case DMBO_MINIMUM:
154+ if (params->input0_broadcast || params->input1_broadcast) {
155+ for (int i = 0; i < dims_count; ++i) {
156+ dst[i] = FFMIN(params->v, src[i]);
157+ }
158+ } else {
159+ const DnnOperand *input1 = &operands[input_operand_indexes[1]];
160+ const float *src1 = input1->data;
161+ for (int i = 0; i < dims_count; ++i) {
162+ dst[i] = FFMIN(src[i], src1[i]);
163+ }
164+ }
165+ return 0;
153166 default:
154167 return -1;
155168 }
libavfilter/dnn/dnn_backend_native_layer_mathbinary.h+1−0
@@ -35,6 +35,7 @@ typedef enum { · 34 unmodified lines
3535 DMBO_ADD = 1,
3636 DMBO_MUL = 2,
3737 DMBO_REALDIV = 3,
38+ DMBO_MINIMUM = 4,
3839 DMBO_COUNT
3940 } DNNMathBinaryOperation;
4041

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