remove ambiguous reference to int64.

This commit is contained in:
Peng Sun 2020-02-05 20:13:22 +00:00
parent 0be4b1808b
commit 3b917d6549
2 changed files with 3 additions and 5 deletions
tensorflow/lite/kernels/internal
compatibility.h
reference/integer_ops

View File

@ -83,8 +83,6 @@ using int16 = std::int16_t;
using uint16 = std::uint16_t;
using int32 = std::int32_t;
using uint32 = std::uint32_t;
using int64 = std::int64_t;
using uint64 = std::uint64_t;
// TFLITE_DEPRECATED()
//

View File

@ -120,7 +120,7 @@ inline void TransposeConv(
const int16* input_data, const RuntimeShape& filter_shape,
const int8* filter_data, const RuntimeShape& output_shape,
int16* output_data, const RuntimeShape& im2col_shape, int8* im2col_data,
int64* scratch_buffer) {
std::int64_t* scratch_buffer) {
const int stride_width = params.stride_width;
const int stride_height = params.stride_height;
const int pad_width = params.padding_values.width;
@ -147,7 +147,7 @@ inline void TransposeConv(
const int num_elements = output_shape.FlatSize();
// We need to initialize scratch_buffer to all 0s, as we apply the same
// 'scatter' based trick as in float version.
memset(scratch_buffer, 0, num_elements * sizeof(int64));
memset(scratch_buffer, 0, num_elements * sizeof(std::int64_t));
// Loop through input elements one at a time.
for (int batch = 0; batch < batches; ++batch) {
@ -188,7 +188,7 @@ inline void TransposeConv(
for (int out_y = 0; out_y < output_height; ++out_y) {
for (int out_x = 0; out_x < output_width; ++out_x) {
for (int out_channel = 0; out_channel < output_depth; ++out_channel) {
int64 acc = scratch_buffer[Offset(output_shape, batch, out_y, out_x,
std::int64_t acc = scratch_buffer[Offset(output_shape, batch, out_y, out_x,
out_channel)];
int32 scaled_acc = MultiplyByQuantizedMultiplier(
acc, output_multiplier[out_channel], output_shift[out_channel]);