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') z1 = 2 / x z2 = 1 / z1 z3 = z2 / 0.25 + 0.3 z4 = z3 - x * 1.5 - 0.3 y = tf.identity(z4, 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))
Unified · Split
| @@ -133,6 +133,23 @@ int dnn_execute_layer_math_binary(DnnOperand *operands, const int32_t *input_ope · 132 unmodified lines | |||
| 133 | } | 133 | } |
| 134 | } | 134 | } |
| 135 | return 0; | 135 | return 0; |
| 136 | case DMBO_REALDIV: | ||
| 137 | if (params->input0_broadcast) { | ||
| 138 | for (int i = 0; i < dims_count; ++i) { | ||
| 139 | dst[i] = params->v / src[i]; | ||
| 140 | } | ||
| 141 | } else if (params->input1_broadcast) { | ||
| 142 | for (int i = 0; i < dims_count; ++i) { | ||
| 143 | dst[i] = src[i] / params->v; | ||
| 144 | } | ||
| 145 | } else { | ||
| 146 | const DnnOperand *input1 = &operands[input_operand_indexes[1]]; | ||
| 147 | const float *src1 = input1->data; | ||
| 148 | for (int i = 0; i < dims_count; ++i) { | ||
| 149 | dst[i] = src[i] / src1[i]; | ||
| 150 | } | ||
| 151 | } | ||
| 152 | return 0; | ||
| 136 | default: | 153 | default: |
| 137 | return -1; | 154 | return -1; |
| 138 | } | 155 | } |
| @@ -34,6 +34,7 @@ typedef enum { · 33 unmodified lines | |||
| 34 | DMBO_SUB = 0, | 34 | DMBO_SUB = 0, |
| 35 | DMBO_ADD = 1, | 35 | DMBO_ADD = 1, |
| 36 | DMBO_MUL = 2, | 36 | DMBO_MUL = 2, |
| 37 | DMBO_REALDIV = 3, | ||
| 37 | DMBO_COUNT | 38 | DMBO_COUNT |
| 38 | } DNNMathBinaryOperation; | 39 | } DNNMathBinaryOperation; |
| 39 | 40 | ||
| @@ -71,7 +71,7 @@ class TFConverter: · 70 unmodified lines | |||
| 71 | self.conv2d_scope_names = set() | 71 | self.conv2d_scope_names = set() |
| 72 | self.conv2d_scopename_inputname_dict = {} | 72 | self.conv2d_scopename_inputname_dict = {} |
| 73 | self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4, 'MathBinary':5} | 73 | self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4, 'MathBinary':5} |
| 74 | self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2} | 74 | self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3} |
| 75 | self.mirrorpad_mode = {'CONSTANT':0, 'REFLECT':1, 'SYMMETRIC':2} | 75 | self.mirrorpad_mode = {'CONSTANT':0, 'REFLECT':1, 'SYMMETRIC':2} |
| 76 | self.name_operand_dict = {} | 76 | self.name_operand_dict = {} |
| 77 | 77 | ||
| @@ -311,7 +311,8 @@ class TFConverter: · 233 unmodified lines | |||
| 311 | self.dump_mathbinary_to_file(node, f) | 311 | self.dump_mathbinary_to_file(node, f) |
| 312 | elif node.op == 'Mul': | 312 | elif node.op == 'Mul': |
| 313 | self.dump_mathbinary_to_file(node, f) | 313 | self.dump_mathbinary_to_file(node, f) |
| 314 | 314 | elif node.op == 'RealDiv': | |
| 315 | self.dump_mathbinary_to_file(node, f) | ||
| 315 | 316 | ||
| 316 | def dump_operands_to_file(self, f): | 317 | def dump_operands_to_file(self, f): |
| 317 | operands = sorted(self.name_operand_dict.values()) | 318 | operands = sorted(self.name_operand_dict.values()) |
| @@ -23,4 +23,4 @@ str = 'FFMPEGDNNNATIVE' · 22 unmodified lines | |||
| 23 | major = 1 | 23 | major = 1 |
| 24 | 24 | ||
| 25 | # increase minor when we don't have to re-convert the model file | 25 | # increase minor when we don't have to re-convert the model file |
| 26 | minor = 3 | 26 | minor = 4 |