experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #34164 from lamarrr:patch-3

Browse Source 
PiperOrigin-RevId: 281573806
Change-Id: I6f7ff49f3ad1212a73af7d179498aa1d33f03828
This commit is contained in:
TensorFlower Gardener 2019-11-20 14:22:21 -08:00
commit 9401effbed
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tensorflow/lite/experimental/micro/kernels/cmsis-nn/conv.cc
View File

@ -153,7 +153,6 @@ TfLiteStatus EvalQuantizedPerChannel(
TfLiteContext* context, TfLiteNode* node, TfLiteConvParams* params,
OpData* data, const TfLiteTensor* input, const TfLiteTensor* filter,
const TfLiteTensor* bias, TfLiteTensor* output, TfLiteTensor* im2col) {
#if defined(ARM_MATH_DSP) && defined(ARM_MATH_LOOPUNROLL)
ConvParams op_params;
op_params.input_offset = -input->params.zero_point;
op_params.output_offset = output->params.zero_point;
@ -164,6 +163,8 @@ TfLiteStatus EvalQuantizedPerChannel(
op_params.padding_values.height = data->padding.height;
op_params.padding_values.width = data->padding.width;
#if defined(ARM_MATH_DSP) && defined(ARM_MATH_LOOPUNROLL)
RuntimeShape filter_shape = GetTensorShape(filter);
RuntimeShape input_shape = GetTensorShape(input);
RuntimeShape output_shape = GetTensorShape(output);
@ -235,7 +236,17 @@ TfLiteStatus EvalQuantizedPerChannel(
}
}
#else
#error ARM_MATH_DSP and ARM_MATH_LOOPUNROLL must be set
#pragma message( \
"CMSIS-NN optimization for conv not available for this target. Using reference kernel.")
reference_integer_ops::ConvPerChannel(
op_params, data->per_channel_output_multiplier,
data->per_channel_output_shift, GetTensorShape(input),
GetTensorData<int8>(input), GetTensorShape(filter),
GetTensorData<int8>(filter), GetTensorShape(bias),
GetTensorData<int32>(bias), GetTensorShape(output),
GetTensorData<int8>(output));
#endif
return kTfLiteOk;
}