dnn_backend_native_layer_mathunary: add acosh support

Ting Fu committed 6 years ago

Commit cd2e3a81 parent 33374bd4 files · +7 −2Browse files

Unified · Split

4 files

libavfilter/dnn/dnn_backend_native_layer_mathunary.c +4 −0
libavfilter/dnn/dnn_backend_native_layer_mathunary.h +1 −0
tools/python/convert_from_tensorflow.py +1 −1
tools/python/convert_header.py +1 −1

libavfilter/dnn/dnn_backend_native_layer_mathunary.c+4−0

@@ -120,6 +120,10 @@ int dnn_execute_layer_math_unary(DnnOperand operands, const int32_t input_oper · 119 unmodified lines
120	120	for (int i = 0; i < dims_count; ++i)
121	121	dst[i] = asinh(src[i]);
122	122	return 0;
	123	+ case DMUO_ACOSH:
	124	+ for (int i = 0; i < dims_count; ++i)
	125	+ dst[i] = acosh(src[i]);
	126	+ return 0;
123	127	default:
124	128	return -1;
125	129	}

libavfilter/dnn/dnn_backend_native_layer_mathunary.h+1−0

@@ -41,6 +41,7 @@ typedef enum { · 40 unmodified lines
41	41	DMUO_COSH = 8,
42	42	DMUO_TANH = 9,
43	43	DMUO_ASINH = 10,
	44	+ DMUO_ACOSH = 11,
44	45	DMUO_COUNT
45	46	} DNNMathUnaryOperation;
46	47

tools/python/convert_from_tensorflow.py+1−1

@@ -72,7 +72,7 @@ class TFConverter: · 71 unmodified lines
72	72	self.conv2d_scopename_inputname_dict = {}
73	73	self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4, 'MathBinary':5, 'MathUnary':6}
74	74	self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4}
75		− self.mathun2code = {'Abs':0, 'Sin':1, 'Cos':2, 'Tan':3, 'Asin':4, 'Acos':5, 'Atan':6, 'Sinh':7, 'Cosh':8, 'Tanh':9, 'Asinh':10}
	75	+ 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}
76	76	self.mirrorpad_mode = {'CONSTANT':0, 'REFLECT':1, 'SYMMETRIC':2}
77	77	self.name_operand_dict = {}
78	78

tools/python/convert_header.py+1−1

@@ -23,4 +23,4 @@ str = 'FFMPEGDNNNATIVE' · 22 unmodified lines
23	23	major = 1
24	24
25	25	# increase minor when we don't have to re-convert the model file
26		−minor = 16
	26	+minor = 17