diff options
author | Ting Fu <ting.fu@intel.com> | 2020-06-06 20:12:48 +0800 |
---|---|---|
committer | Guo Yejun <yejun.guo@intel.com> | 2020-06-11 11:10:51 +0800 |
commit | 88fb494f42a17eb8472c1172fc08ce1c29ce5e4c (patch) | |
tree | bfac9e636c592a59c7902424490d90c9a006540e /tools | |
parent | 3f7c5a375b8e76d8ebcf6a872c8ae86734e57d0c (diff) | |
download | ffmpeg-88fb494f42a17eb8472c1172fc08ce1c29ce5e4c.tar.gz |
dnn_backend_native_layer_mathunary: add cos support
It can be tested with the model generated with below python scripy
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.multiply(x, 1.5)
x2 = tf.cos(x1)
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 <ting.fu@intel.com>
Signed-off-by: Guo Yejun <yejun.guo@intel.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/python/convert_from_tensorflow.py | 2 | ||||
-rw-r--r-- | tools/python/convert_header.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index b17facdda8..9e99fccdab 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} + self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2} 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 c79fef4be8..ba6d18126e 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 = 7 +minor = 8 |