diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2018-09-24 20:39:41 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-09-24 20:43:58 -0700 |
| commit | 626fef2af7d4bc49aeeef7ffd195dc30235bcd1e (patch) | |
| tree | f81c1a5b95696897957619b5635537c73942b8fe /tensorflow/contrib/lite/kernels/internal | |
| parent | 6ba60e051409a5346c2aab21160c9c311de1cb03 (diff) | |
Update kernel evals to use new kernel signatures.
PiperOrigin-RevId: 214377809
Diffstat (limited to 'tensorflow/contrib/lite/kernels/internal')
| -rw-r--r-- | tensorflow/contrib/lite/kernels/internal/optimized/cblas_conv.h | 19 | ||||
| -rw-r--r-- | tensorflow/contrib/lite/kernels/internal/optimized/multithreaded_conv.h | 4 |
2 files changed, 16 insertions, 7 deletions
diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/cblas_conv.h b/tensorflow/contrib/lite/kernels/internal/optimized/cblas_conv.h index 4a90e7e640..40d42bbae9 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/cblas_conv.h +++ b/tensorflow/contrib/lite/kernels/internal/optimized/cblas_conv.h @@ -49,9 +49,18 @@ inline void Conv(const float* input_data, const Dims<4>& input_dims, filter_width != 1 || filter_height != 1; if (need_im2col) { TFLITE_DCHECK(im2col_data); - optimized_ops::Im2col(input_data, input_dims, stride_width, stride_height, - pad_width, pad_height, filter_height, filter_width, 0, - im2col_data, im2col_dims); + ConvParams op_params; + op_params.padding_type = PaddingType::kSame; + op_params.padding_values.width = pad_width; + op_params.padding_values.height = pad_height; + op_params.stride_width = stride_width; + op_params.stride_height = stride_height; + op_params.dilation_width_factor = 1; + op_params.dilation_height_factor = 1; + optimized_ops::Im2col(op_params, filter_height, filter_width, 0, + DimsToShape(input_dims), input_data, + DimsToShape(im2col_dims), im2col_data); + gemm_input_data = im2col_data; gemm_input_dims = &im2col_dims; } else { @@ -82,8 +91,8 @@ inline void Conv(const float* input_data, const Dims<4>& input_dims, stride_a, b, stride_b, 0.0f, c, stride_c); optimized_ops::AddBiasAndEvalActivationFunction( - bias_data, bias_dims, output_data, output_dims, output_activation_min, - output_activation_max); + output_activation_min, output_activation_max, DimsToShape(bias_dims), + bias_data, DimsToShape(output_dims), output_data); } } // namespace cblas_ops diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/multithreaded_conv.h b/tensorflow/contrib/lite/kernels/internal/optimized/multithreaded_conv.h index 59f0e3c927..b5d001cc9e 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/multithreaded_conv.h +++ b/tensorflow/contrib/lite/kernels/internal/optimized/multithreaded_conv.h @@ -157,8 +157,8 @@ inline void Conv(const Eigen::ThreadPoolDevice& device, const float* input_data, output_width); optimized_ops::AddBiasAndEvalActivationFunction( - bias_data, bias_dims, output_data, output_dims, output_activation_min, - output_activation_max); + output_activation_min, output_activation_max, DimsToShape(bias_dims), + bias_data, DimsToShape(output_dims), output_data); } } // namespace multithreaded_ops |