History

avfilter/dnn: add DLT prefix for enum DNNLayerType to avoid potential conflicts

and also change CONV to DLT_CONV2D for better description

Guo, Yejun committed 7 years ago

Commit b78dc271 parent dd019473 files · +27 −20Browse files

Unified · Split

3 files
  1. libavfilter/dnn/dnn_backend_native.c +11 −14
  2. libavfilter/dnn/dnn_backend_native.h +11 −1
  3. libavfilter/dnn/dnn_backend_tf.c +5 −5
libavfilter/dnn/dnn_backend_native.c+11−14
@@ -188,8 +188,9 @@ DNNModel *ff_dnn_load_model_native(const char *model_filename) · 187 unmodified lines
188188 for (layer = 0; layer < network->layers_num; ++layer){
189189 layer_type = (int32_t)avio_rl32(model_file_context);
190190 dnn_size += 4;
191+ network->layers[layer].type = layer_type;
191192 switch (layer_type){
192− case CONV:
193+ case DLT_CONV2D:
193194 conv_params = av_malloc(sizeof(ConvolutionalParams));
194195 if (!conv_params){
195196 avio_closep(&model_file_context);
@@ -231,10 +232,9 @@ DNNModel *ff_dnn_load_model_native(const char *model_filename) · 35 unmodified lines
231232 network->layers[layer].input_operand_indexes[0] = (int32_t)avio_rl32(model_file_context);
232233 network->layers[layer].output_operand_index = (int32_t)avio_rl32(model_file_context);
233234 dnn_size += 8;
234− network->layers[layer].type = CONV;
235235 network->layers[layer].params = conv_params;
236236 break;
237− case DEPTH_TO_SPACE:
237+ case DLT_DEPTH_TO_SPACE:
238238 depth_to_space_params = av_malloc(sizeof(DepthToSpaceParams));
239239 if (!depth_to_space_params){
240240 avio_closep(&model_file_context);
@@ -246,10 +246,9 @@ DNNModel *ff_dnn_load_model_native(const char *model_filename) · 5 unmodified lines
246246 network->layers[layer].input_operand_indexes[0] = (int32_t)avio_rl32(model_file_context);
247247 network->layers[layer].output_operand_index = (int32_t)avio_rl32(model_file_context);
248248 dnn_size += 8;
249− network->layers[layer].type = DEPTH_TO_SPACE;
250249 network->layers[layer].params = depth_to_space_params;
251250 break;
252− case MIRROR_PAD:
251+ case DLT_MIRROR_PAD:
253252 pad_params = av_malloc(sizeof(LayerPadParams));
254253 if (!pad_params){
255254 avio_closep(&model_file_context);
@@ -266,10 +265,9 @@ DNNModel *ff_dnn_load_model_native(const char *model_filename) · 10 unmodified lines
266265 network->layers[layer].input_operand_indexes[0] = (int32_t)avio_rl32(model_file_context);
267266 network->layers[layer].output_operand_index = (int32_t)avio_rl32(model_file_context);
268267 dnn_size += 8;
269− network->layers[layer].type = MIRROR_PAD;
270268 network->layers[layer].params = pad_params;
271269 break;
272− case MAXIMUM:
270+ case DLT_MAXIMUM:
273271 maximum_params = av_malloc(sizeof(*maximum_params));
274272 if (!maximum_params){
275273 avio_closep(&model_file_context);
@@ -278,7 +276,6 @@ DNNModel *ff_dnn_load_model_native(const char *model_filename) · 2 unmodified lines
278276 }
279277 maximum_params->val.u32 = avio_rl32(model_file_context);
280278 dnn_size += 4;
281− network->layers[layer].type = MAXIMUM;
282279 network->layers[layer].params = maximum_params;
283280 network->layers[layer].input_operand_indexes[0] = (int32_t)avio_rl32(model_file_context);
284281 network->layers[layer].output_operand_index = (int32_t)avio_rl32(model_file_context);
@@ -347,27 +344,27 @@ DNNReturnType ff_dnn_execute_model_native(const DNNModel *model, DNNData *output · 62 unmodified lines
347344
348345 for (layer = 0; layer < network->layers_num; ++layer){
349346 switch (network->layers[layer].type){
350− case CONV:
347+ case DLT_CONV2D:
351348 conv_params = (ConvolutionalParams *)network->layers[layer].params;
352349 convolve(network->operands, network->layers[layer].input_operand_indexes,
353350 network->layers[layer].output_operand_index, conv_params);
354351 break;
355− case DEPTH_TO_SPACE:
352+ case DLT_DEPTH_TO_SPACE:
356353 depth_to_space_params = (DepthToSpaceParams *)network->layers[layer].params;
357354 depth_to_space(network->operands, network->layers[layer].input_operand_indexes,
358355 network->layers[layer].output_operand_index, depth_to_space_params->block_size);
359356 break;
360− case MIRROR_PAD:
357+ case DLT_MIRROR_PAD:
361358 pad_params = (LayerPadParams *)network->layers[layer].params;
362359 dnn_execute_layer_pad(network->operands, network->layers[layer].input_operand_indexes,
363360 network->layers[layer].output_operand_index, pad_params);
364361 break;
365− case MAXIMUM:
362+ case DLT_MAXIMUM:
366363 maximum_params = (DnnLayerMaximumParams *)network->layers[layer].params;
367364 dnn_execute_layer_maximum(network->operands, network->layers[layer].input_operand_indexes,
368365 network->layers[layer].output_operand_index, maximum_params);
369366 break;
370− case INPUT:
367+ case DLT_INPUT:
371368 return DNN_ERROR;
372369 }
373370 }
@@ -408,7 +405,7 @@ void ff_dnn_free_model_native(DNNModel **model) · 34 unmodified lines
408405 {
409406 network = (ConvolutionalNetwork *)(*model)->model;
410407 for (layer = 0; layer < network->layers_num; ++layer){
411− if (network->layers[layer].type == CONV){
408+ if (network->layers[layer].type == DLT_CONV2D){
412409 conv_params = (ConvolutionalParams *)network->layers[layer].params;
413410 av_freep(&conv_params->kernel);
414411 av_freep(&conv_params->biases);
libavfilter/dnn/dnn_backend_native.h+11−1
@@ -30,7 +30,17 @@ · 29 unmodified lines
3030 #include "../dnn_interface.h"
3131 #include "libavformat/avio.h"
3232
33−typedef enum {INPUT = 0, CONV = 1, DEPTH_TO_SPACE = 2, MIRROR_PAD = 3, MAXIMUM = 4} DNNLayerType;
33+/**
34+ * the enum value of DNNLayerType should not be changed,
35+ * the same values are used in convert_from_tensorflow.py
36+ */
37+typedef enum {
38+ DLT_INPUT = 0,
39+ DLT_CONV2D = 1,
40+ DLT_DEPTH_TO_SPACE = 2,
41+ DLT_MIRROR_PAD = 3,
42+ DLT_MAXIMUM = 4
43+} DNNLayerType;
3444
3545 typedef enum {DOT_INPUT = 1, DOT_OUTPUT = 2, DOT_INTERMEDIATE = DOT_INPUT | DOT_INPUT} DNNOperandType;
3646
libavfilter/dnn/dnn_backend_tf.c+5−5
@@ -499,22 +499,22 @@ static DNNReturnType load_native_model(TFModel *tf_model, const char *model_file · 498 unmodified lines
499499
500500 for (layer = 0; layer < conv_network->layers_num; ++layer){
501501 switch (conv_network->layers[layer].type){
502− case INPUT:
502+ case DLT_INPUT:
503503 layer_add_res = DNN_SUCCESS;
504504 break;
505− case CONV:
505+ case DLT_CONV2D:
506506 layer_add_res = add_conv_layer(tf_model, transpose_op, &op,
507507 (ConvolutionalParams *)conv_network->layers[layer].params, layer);
508508 break;
509− case DEPTH_TO_SPACE:
509+ case DLT_DEPTH_TO_SPACE:
510510 layer_add_res = add_depth_to_space_layer(tf_model, &op,
511511 (DepthToSpaceParams *)conv_network->layers[layer].params, layer);
512512 break;
513− case MIRROR_PAD:
513+ case DLT_MIRROR_PAD:
514514 layer_add_res = add_pad_layer(tf_model, &op,
515515 (LayerPadParams *)conv_network->layers[layer].params, layer);
516516 break;
517− case MAXIMUM:
517+ case DLT_MAXIMUM:
518518 layer_add_res = add_maximum_layer(tf_model, &op,
519519 (DnnLayerMaximumParams *)conv_network->layers[layer].params, layer);
520520 break;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t