History

libavfilter/dnn/dnn_backend_native: find the input operand according to input name

Guo, Yejun committed 7 years ago

Commit 75ca94f1 parent 9ae42c11 file · +23 −16Browse files

Unified · Split

libavfilter/dnn/dnn_backend_native.c+23−16
@@ -33,30 +33,37 @@ · 32 unmodified lines
3333 static DNNReturnType set_input_output_native(void *model, DNNInputData *input, const char *input_name, const char **output_names, uint32_t nb_output)
3434 {
3535 ConvolutionalNetwork *network = (ConvolutionalNetwork *)model;
36+ DnnOperand *oprd = NULL;
3637
3738 if (network->layers_num <= 0 || network->operands_num <= 0)
3839 return DNN_ERROR;
3940
4041 av_assert0(input->dt == DNN_FLOAT);
42+ for (int i = 0; i < network->operands_num; ++i) {
43+ oprd = &network->operands[i];
44+ if (strcmp(oprd->name, input_name) == 0) {
45+ if (oprd->type != DOT_INPUT)
46+ return DNN_ERROR;
47+ break;
48+ }
49+ oprd = NULL;
50+ }
4151
42− /**
43− * as the first step, suppose network->operands[0] is the input operand.
44− */
45− network->operands[0].dims[0] = 1;
46− network->operands[0].dims[1] = input->height;
47− network->operands[0].dims[2] = input->width;
48− network->operands[0].dims[3] = input->channels;
49− network->operands[0].type = DOT_INPUT;
50− network->operands[0].data_type = DNN_FLOAT;
51− network->operands[0].isNHWC = 1;
52−
53− av_freep(&network->operands[0].data);
54− network->operands[0].length = calculate_operand_data_length(&network->operands[0]);
55− network->operands[0].data = av_malloc(network->operands[0].length);
56− if (!network->operands[0].data)
52+ if (!oprd)
53+ return DNN_ERROR;
54+
55+ oprd->dims[0] = 1;
56+ oprd->dims[1] = input->height;
57+ oprd->dims[2] = input->width;
58+ oprd->dims[3] = input->channels;
59+
60+ av_freep(&oprd->data);
61+ oprd->length = calculate_operand_data_length(oprd);
62+ oprd->data = av_malloc(oprd->length);
63+ if (!oprd->data)
5764 return DNN_ERROR;
5865
59− input->data = network->operands[0].data;
66+ input->data = oprd->data;
6067 return DNN_SUCCESS;
6168 }
6269

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