diff options
| author | Ting Fu <ting.fu@intel.com> | 2020-06-29 22:54:08 +0800 |
|---|---|---|
| committer | Guo, Yejun <yejun.guo@intel.com> | 2020-07-06 12:45:14 +0800 |
| commit | cd2e3a864d167be32e119ac44fd65a322121bf3b (patch) | |
| tree | 51382ee1a4c119b66cd5cfc392ef1f177630468d | |
| parent | 33374bdbd88197512eccb7cdf5fceca340b3e49f (diff) | |
| download | ffmpeg-cd2e3a864d167be32e119ac44fd65a322121bf3b.tar.gz | |
dnn_backend_native_layer_mathunary: add acosh support
Signed-off-by: Ting Fu <ting.fu@intel.com>
| -rw-r--r-- | libavfilter/dnn/dnn_backend_native_layer_mathunary.c | 4 | ||||
| -rw-r--r-- | libavfilter/dnn/dnn_backend_native_layer_mathunary.h | 1 | ||||
| -rw-r--r-- | tools/python/convert_from_tensorflow.py | 2 | ||||
| -rw-r--r-- | tools/python/convert_header.py | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c index 83df98d0f8..b77b84a794 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -120,6 +120,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper for (int i = 0; i < dims_count; ++i) dst[i] = asinh(src[i]); return 0; + case DMUO_ACOSH: + for (int i = 0; i < dims_count; ++i) + dst[i] = acosh(src[i]); + return 0; default: return -1; } diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h index fbe9af5c7d..eb30231549 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.h +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.h @@ -41,6 +41,7 @@ typedef enum { DMUO_COSH = 8, DMUO_TANH = 9, DMUO_ASINH = 10, + DMUO_ACOSH = 11, DMUO_COUNT } DNNMathUnaryOperation; diff --git a/tools/python/convert_from_tensorflow.py b/tools/python/convert_from_tensorflow.py index 0d756c8109..1e73e3aefe 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, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10} + self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10, 'Acosh':11} 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 3211c13f6d..8fc3438552 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 = 16 +minor = 17 |