Unified · Split
| @@ -120,6 +120,10 @@ int dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_oper · 119 unmodified lines | |||
| 120 | for (int i = 0; i < dims_count; ++i) | 120 | for (int i = 0; i < dims_count; ++i) |
| 121 | dst[i] = asinh(src[i]); | 121 | dst[i] = asinh(src[i]); |
| 122 | return 0; | 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 | default: | 127 | default: |
| 124 | return -1; | 128 | return -1; |
| 125 | } | 129 | } |
| @@ -41,6 +41,7 @@ typedef enum { · 40 unmodified lines | |||
| 41 | DMUO_COSH = 8, | 41 | DMUO_COSH = 8, |
| 42 | DMUO_TANH = 9, | 42 | DMUO_TANH = 9, |
| 43 | DMUO_ASINH = 10, | 43 | DMUO_ASINH = 10, |
| 44 | DMUO_ACOSH = 11, | ||
| 44 | DMUO_COUNT | 45 | DMUO_COUNT |
| 45 | } DNNMathUnaryOperation; | 46 | } DNNMathUnaryOperation; |
| 46 | 47 | ||
| @@ -72,7 +72,7 @@ class TFConverter: · 71 unmodified lines | |||
| 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, 'MathUnary':6} | 73 | self.op2code = {'Conv2D':1, 'DepthToSpace':2, 'MirrorPad':3, 'Maximum':4, 'MathBinary':5, 'MathUnary':6} |
| 74 | self.mathbin2code = {'Sub':0, 'Add':1, 'Mul':2, 'RealDiv':3, 'Minimum':4} | 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 | self.mirrorpad_mode = {'CONSTANT':0, 'REFLECT':1, 'SYMMETRIC':2} | 76 | self.mirrorpad_mode = {'CONSTANT':0, 'REFLECT':1, 'SYMMETRIC':2} |
| 77 | self.name_operand_dict = {} | 77 | self.name_operand_dict = {} |
| 78 | 78 | ||
| @@ -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 = 16 | 26 | minor = 17 |