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

Fix c-style casts and const usage in MicroAllocator.

Browse Source 
This change was introduced in cl/316533499 (PR: https://github.com/tensorflow/tensorflow/pull/38121). Lint was complaining of c-style casts, upon fixing it also was hiding const usage.

PiperOrigin-RevId: 317680917
Change-Id: I4d874564875e58eb5f6905c7b75562f90588bb22
This commit is contained in:
Nick Kreeger 2020-06-22 10:22:18 -07:00 committed by TensorFlower Gardener
parent a6c009467a
commit 75a3975ab8
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tensorflow/lite/micro/micro_allocator.cc
View File

@ -166,11 +166,12 @@ class AllocationInfoBuilder {
// - If there's no metadata available, offline_planner_offsets is not set // - If there's no metadata available, offline_planner_offsets is not set
// - If there's metadata available, offline_planner_offsets will point to the // - If there's metadata available, offline_planner_offsets will point to the
// first offset in the metadata buffer list. // first offset in the metadata buffer list.
TfLiteStatus GetOfflinePlannedOffsets(const Model* model, TfLiteStatus GetOfflinePlannedOffsets(
int32_t** offline_planner_offsets); const Model* model, const int32_t** offline_planner_offsets);
// Add allocaiton information for the tensors. // Add allocaiton information for the tensors.
TfLiteStatus AddTensors(const SubGraph* subgraph, int32_t* offline_offsets, TfLiteStatus AddTensors(const SubGraph* subgraph,
const int32_t* offline_offsets,
TfLiteTensor* runtime_tensors); TfLiteTensor* runtime_tensors);
// Add allocation information for the scratch buffers. // Add allocation information for the scratch buffers.
@ -206,7 +207,7 @@ TfLiteStatus AllocationInfoBuilder::Allocate() {
} }
TfLiteStatus AllocationInfoBuilder::AddTensors(const SubGraph* subgraph, TfLiteStatus AllocationInfoBuilder::AddTensors(const SubGraph* subgraph,
int32_t* offline_offsets, const int32_t* offline_offsets,
TfLiteTensor* runtime_tensors) { TfLiteTensor* runtime_tensors) {
// Set up allocation info for all tensors. // Set up allocation info for all tensors.
for (size_t i = 0; i < tensor_count_; ++i) { for (size_t i = 0; i < tensor_count_; ++i) {
@ -299,7 +300,7 @@ TfLiteStatus AllocationInfoBuilder::AddTensors(const SubGraph* subgraph,
// | 4 | Arena byte offset of tensor #1 or -1 to allocate at runtime | // | 4 | Arena byte offset of tensor #1 or -1 to allocate at runtime |
// | 3+(n-1) | Arena byte offset of tensor #(n-1) or -1 to allocate at runtime | // | 3+(n-1) | Arena byte offset of tensor #(n-1) or -1 to allocate at runtime |
TfLiteStatus AllocationInfoBuilder::GetOfflinePlannedOffsets( TfLiteStatus AllocationInfoBuilder::GetOfflinePlannedOffsets(
const Model* model, int32_t** offline_planner_offsets) { const Model* model, const int32_t** offline_planner_offsets) {
if (model->metadata()) { if (model->metadata()) {
for (size_t i = 0; i < model->metadata()->size(); ++i) { for (size_t i = 0; i < model->metadata()->size(); ++i) {
auto metadata = model->metadata()->Get(i); auto metadata = model->metadata()->Get(i);
@ -309,9 +310,11 @@ TfLiteStatus AllocationInfoBuilder::GetOfflinePlannedOffsets(
model->buffers(); model->buffers();
auto* buffer = (*buffers)[metadata->buffer()]; auto* buffer = (*buffers)[metadata->buffer()];
auto* array = buffer->data(); auto* array = buffer->data();
const uint32_t* metadata_buffer = (uint32_t*)array->data(); const uint32_t* metadata_buffer =
const size_t nbr_tensors = (size_t)metadata_buffer[2]; reinterpret_cast<const uint32_t*>(array->data());
*offline_planner_offsets = (int32_t*)&metadata_buffer[3]; const size_t nbr_tensors = static_cast<size_t>(metadata_buffer[2]);
*offline_planner_offsets =
reinterpret_cast<const int32_t*>(&metadata_buffer[3]);
if (tensor_count_ != nbr_tensors) { if (tensor_count_ != nbr_tensors) {
TF_LITE_REPORT_ERROR(reporter_, TF_LITE_REPORT_ERROR(reporter_,
@ -893,7 +896,7 @@ TfLiteStatus MicroAllocator::CommitStaticMemoryPlan(const Model* model,
TF_LITE_ENSURE_STATUS( TF_LITE_ENSURE_STATUS(
builder.Init(subgraph->tensors()->size(), scratch_buffer_count_)); builder.Init(subgraph->tensors()->size(), scratch_buffer_count_));
int32_t* offline_planner_offsets = nullptr; const int32_t* offline_planner_offsets = nullptr;
TF_LITE_ENSURE_STATUS( TF_LITE_ENSURE_STATUS(
builder.GetOfflinePlannedOffsets(model, &offline_planner_offsets)); builder.GetOfflinePlannedOffsets(model, &offline_planner_offsets));
TF_LITE_ENSURE_STATUS(builder.AddTensors(subgraph, offline_planner_offsets, TF_LITE_ENSURE_STATUS(builder.AddTensors(subgraph, offline_planner_offsets,