RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 17:32:06 +00:00
Code Issues Projects Releases Wiki Activity

dnn_backend_native_layer_mathunary: add round support

Browse Source 
Signed-off-by: Mingyu Yin <mingyu.yin@intel.com>
Reviewed-by: Guo, Yejun <yejun.guo@intel.com>
This commit is contained in:
Mingyu Yin 2020-08-10 19:05:42 +08:00 committed by Guo, Yejun
parent ed39d28ce7
commit 4ed6bca4ae
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/dnn/dnn_backend_native_layer_mathunary.c
View File

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

1
libavfilter/dnn/dnn_backend_native_layer_mathunary.h
View File

@ -45,6 +45,7 @@ typedef enum {
DMUO_ATANH = 12,
DMUO_CEIL = 13,
DMUO_FLOOR = 14,
DMUO_ROUND = 15,
DMUO_COUNT
} DNNMathUnaryOperation;

4
tests/dnn/dnn-layer-mathunary-test.c
View File

@ -60,6 +60,8 @@ static float get_expected(float f, DNNMathUnaryOperation op)
return ceil(f);
case DMUO_FLOOR:
return floor(f);
case DMUO_ROUND:
return round(f);
default:
av_assert0(!"not supported yet");
return 0.f;
@ -136,5 +138,7 @@ int main(int agrc, char **argv)
return 1;
if (test(DMUO_FLOOR))
return 1;
if (test(DMUO_ROUND))
return 1;
return 0;
}

2
tools/python/convert_from_tensorflow.py
View File

@ -76,7 +76,7 @@ class TFConverter:
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,
'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14}
'Acosh':11, 'Atanh':12, 'Ceil':13, 'Floor':14, 'Round':15}
self.mirrorpad_mode = {'CONSTANT':0, 'REFLECT':1, 'SYMMETRIC':2}
self.name_operand_dict = {}

2
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 = 20
minor = 21