From e1482e480b377750a7193779456836e02d943d30 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Wed, 1 May 2019 11:34:37 -0700 Subject: [PATCH] Change existing call sites of the old deprecated gemmlowp WorkersPool::Execute method, which is a footgun because it destroys the Task object that it takes, to the new more explicit name LegacyExecuteAndDestroyTasks for the same behavior. PiperOrigin-RevId: 246168088 --- .../lite/kernels/internal/optimized/depthwiseconv_uint8.h | 2 +- .../internal/optimized/integer_ops/depthwise_conv.h | 2 +- .../internal/optimized/integer_ops/fully_connected.h | 2 +- .../kernels/internal/optimized/legacy_optimized_ops.h | 8 ++++---- .../lite/kernels/internal/optimized/optimized_ops.h | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8.h b/tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8.h index ef7a08cd681..f3637088142 100644 --- a/tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8.h +++ b/tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8.h @@ -2152,7 +2152,7 @@ inline void DepthwiseConv( thread_end, thread_dim); thread_start = thread_end; } - gemmlowp_context->workers_pool()->Execute(tasks); + gemmlowp_context->workers_pool()->LegacyExecuteAndDestroyTasks(tasks); } } diff --git a/tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv.h b/tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv.h index c97ef629f24..fc4d49352d7 100644 --- a/tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv.h +++ b/tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv.h @@ -2025,7 +2025,7 @@ inline void DepthwiseConvPerChannel( output_data, thread_start, thread_end, thread_dim); thread_start = thread_end; } - gemmlowp_context->workers_pool()->Execute(tasks); + gemmlowp_context->workers_pool()->LegacyExecuteAndDestroyTasks(tasks); } } diff --git a/tensorflow/lite/kernels/internal/optimized/integer_ops/fully_connected.h b/tensorflow/lite/kernels/internal/optimized/integer_ops/fully_connected.h index 033f334a6af..98f4dc30283 100644 --- a/tensorflow/lite/kernels/internal/optimized/integer_ops/fully_connected.h +++ b/tensorflow/lite/kernels/internal/optimized/integer_ops/fully_connected.h @@ -355,7 +355,7 @@ inline void FullyConnectedAsGEMV( row_start = row_end; } TFLITE_DCHECK_EQ(row_start, output_rows); - gemmlowp_context->workers_pool()->Execute(tasks); + gemmlowp_context->workers_pool()->LegacyExecuteAndDestroyTasks(tasks); } #endif // USE_NEON diff --git a/tensorflow/lite/kernels/internal/optimized/legacy_optimized_ops.h b/tensorflow/lite/kernels/internal/optimized/legacy_optimized_ops.h index 8b65e7eb03e..73eca84e2dc 100644 --- a/tensorflow/lite/kernels/internal/optimized/legacy_optimized_ops.h +++ b/tensorflow/lite/kernels/internal/optimized/legacy_optimized_ops.h @@ -396,7 +396,7 @@ inline void DepthwiseConv( thread_end, thread_dim); thread_start = thread_end; } - gemmlowp_context->workers_pool()->Execute(tasks); + gemmlowp_context->workers_pool()->LegacyExecuteAndDestroyTasks(tasks); } } @@ -498,7 +498,7 @@ inline void DepthwiseConvPerChannel( output_data, thread_start, thread_end, thread_dim); thread_start = thread_end; } - gemmlowp_context->workers_pool()->Execute(tasks); + gemmlowp_context->workers_pool()->LegacyExecuteAndDestroyTasks(tasks); } } @@ -697,7 +697,7 @@ inline void FullyConnectedAsGEMV( row_start = row_end; } TFLITE_DCHECK_EQ(row_start, output_rows); - gemmlowp_context->workers_pool()->Execute(tasks); + gemmlowp_context->workers_pool()->LegacyExecuteAndDestroyTasks(tasks); } #endif // USE_NEON @@ -1150,7 +1150,7 @@ inline void ShuffledFullyConnected( row_start = row_end; } TFLITE_DCHECK_EQ(row_start, output_depth); - gemmlowp_context->workers_pool()->Execute(tasks); + gemmlowp_context->workers_pool()->LegacyExecuteAndDestroyTasks(tasks); } inline void ShuffledFullyConnected( diff --git a/tensorflow/lite/kernels/internal/optimized/optimized_ops.h b/tensorflow/lite/kernels/internal/optimized/optimized_ops.h index 5d19e313582..4fdaf37acb5 100644 --- a/tensorflow/lite/kernels/internal/optimized/optimized_ops.h +++ b/tensorflow/lite/kernels/internal/optimized/optimized_ops.h @@ -1141,7 +1141,7 @@ inline void FullyConnectedAsGEMV( row_start = row_end; } TFLITE_DCHECK_EQ(row_start, output_rows); - gemmlowp_context->workers_pool()->Execute(tasks); + gemmlowp_context->workers_pool()->LegacyExecuteAndDestroyTasks(tasks); } #endif // USE_NEON @@ -1768,7 +1768,7 @@ inline void ShuffledFullyConnected( row_start = row_end; } TFLITE_DCHECK_EQ(row_start, output_depth); - gemmlowp_context->workers_pool()->Execute(tasks); + gemmlowp_context->workers_pool()->LegacyExecuteAndDestroyTasks(tasks); } inline void MeanImpl(const tflite::MeanParams& op_params, @@ -1983,7 +1983,7 @@ inline void Mean(const tflite::MeanParams& op_params, output_scale, depth_start, depth_end); depth_start = depth_end; } - gemmlowp_context->workers_pool()->Execute(tasks); + gemmlowp_context->workers_pool()->LegacyExecuteAndDestroyTasks(tasks); } }