Browse Source

dnn_backend_native_layer_mathunary: add tanh support

Signed-off-by: Ting Fu <ting.fu@intel.com>
tags/n4.4
Ting Fu Guo, Yejun 4 years ago
parent
commit
ea71e731f4
4 changed files with 7 additions and 2 deletions
  1. +4
    -0
      libavfilter/dnn/dnn_backend_native_layer_mathunary.c
  2. +1
    -0
      libavfilter/dnn/dnn_backend_native_layer_mathunary.h
  3. +1
    -1
      tools/python/convert_from_tensorflow.py
  4. +1
    -1
      tools/python/convert_header.py

+ 4
- 0
libavfilter/dnn/dnn_backend_native_layer_mathunary.c View File

@@ -112,6 +112,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper
for (int i = 0; i < dims_count; ++i)
dst[i] = cosh(src[i]);
return 0;
case DMUO_TANH:
for (int i = 0; i < dims_count; ++i)
dst[i] = tanh(src[i]);
return 0;
default:
return -1;
}


+ 1
- 0
libavfilter/dnn/dnn_backend_native_layer_mathunary.h View File

@@ -39,6 +39,7 @@ typedef enum {
DMUO_ATAN = 6,
DMUO_SINH = 7,
DMUO_COSH = 8,
DMUO_TANH = 9,
DMUO_COUNT
} DNNMathUnaryOperation;



+ 1
- 1
tools/python/convert_from_tensorflow.py View File

@@ -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, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8}
self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9}
self.mirrorpad_mode = {'CONSTANT':0, 'REFLECT':1, 'SYMMETRIC':2}
self.name_operand_dict = {}



+ 1
- 1
tools/python/convert_header.py View File

@@ -23,4 +23,4 @@ str = 'FFMPEGDNNNATIVE'
major = 1

# increase minor when we don't have to re-convert the model file
minor = 14
minor = 15

Loading…
Cancel
Save