-
Notifications
You must be signed in to change notification settings - Fork 139
Image postprocessor #720
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jonpsy
wants to merge
19
commits into
tensorflow:master
Choose a base branch
from
jonpsy:image_postprocessor
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Image postprocessor #720
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
3b41352
init push
jonpsy 0344650
Write main logic.
jonpsy 99e709d
build file updated
jonpsy 7c766c3
format file
jonpsy 4cdbbf8
Use "is_input bool to switch input/output.
jonpsy 2a39596
Preprocessor use new API
jonpsy ed455cb
single index instead of multi
jonpsy ae93793
Re-use logic from BuildImageTensorSpecs
jonpsy e24ef95
move in unknwn namespace
jonpsy f4b1607
move has_uint8_output_ to init()
jonpsy 5236b8b
Use populate vector & rm size checks
jonpsy 31c2b31
Pass tensor & metato tensor_spec. rm tensor count.
jonpsy 213acb0
GetTensorMetada() checks subgraph of given meta
jonpsy 9cdcb04
NormProcessUnit check in postprocessor to fallback
jonpsy 352fcdb
store output tensor instead of its type.
jonpsy d1fa720
Remove is_input from image_tensor_specs.h
jonpsy 63846f8
update BuildImageTensorSpec for preprocessor.
jonpsy 8d9dc30
Fix compile error
jonpsy da766a4
Fix namespace
jonpsy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
130 changes: 130 additions & 0 deletions
130
tensorflow_lite_support/cc/task/processor/image_postprocessor.cc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,130 @@ | ||
/* Copyright 2021 The TensorFlow Authors. All Rights Reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
==============================================================================*/ | ||
|
||
#include "tensorflow_lite_support/cc/task/processor/image_postprocessor.h" | ||
|
||
namespace tflite { | ||
namespace task { | ||
namespace processor { | ||
|
||
namespace { | ||
|
||
using ::absl::StatusCode; | ||
using ::tflite::metadata::ModelMetadataExtractor; | ||
using ::tflite::support::CreateStatusWithPayload; | ||
using ::tflite::support::StatusOr; | ||
using ::tflite::support::TfLiteSupportStatus; | ||
|
||
constexpr int kRgbPixelBytes = 3; | ||
|
||
} // namespace | ||
|
||
/* static */ | ||
tflite::support::StatusOr<std::unique_ptr<ImagePostprocessor>> | ||
ImagePostprocessor::Create(core::TfLiteEngine* engine, const int output_index, | ||
const int input_index) { | ||
ASSIGN_OR_RETURN(auto processor, | ||
Processor::Create<ImagePostprocessor>( | ||
/* num_expected_tensors = */ 1, engine, {output_index}, | ||
/* requires_metadata = */ false)); | ||
|
||
RETURN_IF_ERROR(processor->Init(input_index, output_index)); | ||
return processor; | ||
} | ||
|
||
absl::Status ImagePostprocessor::Init(const int input_index, | ||
const int output_index) { | ||
if (input_index == -1) { | ||
return tflite::support::CreateStatusWithPayload( | ||
absl::StatusCode::kInvalidArgument, | ||
absl::StrFormat("Input image tensor not set. Input index found: %d", | ||
input_index), | ||
tflite::support::TfLiteSupportStatus::kInputTensorNotFoundError); | ||
} | ||
const TensorMetadata* metadata = GetTensorMetadata(output_index); | ||
// Fallback to input metadata if output meta doesn't have norm params. | ||
ASSIGN_OR_RETURN( | ||
const tflite::ProcessUnit* normalization_process_unit, | ||
ModelMetadataExtractor::FindFirstProcessUnit( | ||
*metadata, tflite::ProcessUnitOptions_NormalizationOptions)); | ||
if (normalization_process_unit == nullptr) { | ||
metadata = | ||
engine_->metadata_extractor()->GetInputTensorMetadata(input_index); | ||
} | ||
if (!GetTensor(output_index)->data.raw) { | ||
return tflite::support::CreateStatusWithPayload( | ||
absl::StatusCode::kInternal, | ||
absl::StrFormat("Output tensor (%s) has no raw data.", | ||
GetTensor(output_index)->name)); | ||
} | ||
output_tensor_ = GetTensor(output_index); | ||
ASSIGN_OR_RETURN(auto output_specs, | ||
vision::BuildImageTensorSpecs(*engine_->metadata_extractor(), | ||
metadata, output_tensor_)); | ||
options_ = std::make_unique<vision::NormalizationOptions>( | ||
output_specs.normalization_options.value()); | ||
return absl::OkStatus(); | ||
} | ||
|
||
absl::StatusOr<vision::FrameBuffer> ImagePostprocessor::Postprocess() { | ||
vision::FrameBuffer::Dimension to_buffer_dimension = { | ||
output_tensor_->dims->data[2], output_tensor_->dims->data[1]}; | ||
size_t output_byte_size = | ||
GetBufferByteSize(to_buffer_dimension, vision::FrameBuffer::Format::kRGB); | ||
std::vector<uint8> postprocessed_data(output_byte_size / sizeof(uint8), 0); | ||
|
||
if (output_tensor_->type == kTfLiteUInt8) { // No denormalization required. | ||
core::PopulateVector(output_tensor_, &postprocessed_data); | ||
} else if (output_tensor_->type == | ||
kTfLiteFloat32) { // Denormalize to [0, 255] range. | ||
uint8* denormalized_output_data = postprocessed_data.data(); | ||
const float* output_data = | ||
core::AssertAndReturnTypedTensor<float>(output_tensor_).value(); | ||
const auto norm_options = GetNormalizationOptions(); | ||
|
||
if (norm_options.num_values == 1) { | ||
float mean_value = norm_options.mean_values[0]; | ||
float std_value = norm_options.std_values[0]; | ||
|
||
for (size_t i = 0; i < output_byte_size / sizeof(uint8); | ||
++i, ++denormalized_output_data, ++output_data) { | ||
*denormalized_output_data = static_cast<uint8>(std::round(std::min( | ||
255.f, std::max(0.f, (*output_data) * std_value + mean_value)))); | ||
} | ||
} else { | ||
for (size_t i = 0; i < output_byte_size / sizeof(uint8); | ||
++i, ++denormalized_output_data, ++output_data) { | ||
*denormalized_output_data = static_cast<uint8>(std::round(std::min( | ||
255.f, | ||
std::max(0.f, (*output_data) * norm_options.std_values[i % 3] + | ||
norm_options.mean_values[i % 3])))); | ||
} | ||
} | ||
} | ||
|
||
vision::FrameBuffer::Plane postprocessed_plane = { | ||
/*buffer=*/postprocessed_data.data(), | ||
/*stride=*/{output_tensor_->dims->data[2] * kRgbPixelBytes, | ||
kRgbPixelBytes}}; | ||
auto postprocessed_frame_buffer = | ||
vision::FrameBuffer::Create({postprocessed_plane}, to_buffer_dimension, | ||
vision::FrameBuffer::Format::kRGB, | ||
vision::FrameBuffer::Orientation::kTopLeft); | ||
return *postprocessed_frame_buffer.get(); | ||
} | ||
|
||
} // namespace processor | ||
} // namespace task | ||
} // namespace tflite |
68 changes: 68 additions & 0 deletions
68
tensorflow_lite_support/cc/task/processor/image_postprocessor.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
/* Copyright 2021 The TensorFlow Authors. All Rights Reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either exPostss or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
==============================================================================*/ | ||
|
||
#ifndef TENSORFLOW_LITE_SUPPORT_CC_TASK_PROCESSOR_IMAGE_POSTPROCESSOR_H_ | ||
#define TENSORFLOW_LITE_SUPPORT_CC_TASK_PROCESSOR_IMAGE_POSTPROCESSOR_H_ | ||
|
||
#include "tensorflow_lite_support/cc/port/status_macros.h" | ||
#include "tensorflow_lite_support/cc/task/processor/processor.h" | ||
#include "tensorflow_lite_support/cc/task/vision/core/frame_buffer.h" | ||
#include "tensorflow_lite_support/cc/task/vision/utils/frame_buffer_utils.h" | ||
#include "tensorflow_lite_support/cc/task/core/task_utils.h" | ||
#include "tensorflow_lite_support/cc/task/vision/utils/image_tensor_specs.h" | ||
|
||
namespace tflite { | ||
namespace task { | ||
namespace processor { | ||
|
||
// Process the associated output image tensor and convert it to a FrameBuffer. | ||
// Requirement for the output tensor: | ||
// (kTfLiteUInt8/kTfLiteFloat32) | ||
// - image input of size `[batch x height x width x channels]`. | ||
// - batch inference is not supported (`batch` is required to be 1). | ||
// - only RGB inputs are supported (`channels` is required to be 3). | ||
// - if type is kTfLiteFloat32, NormalizationOptions are required to be | ||
// attached to the metadata for output de-normalization. Uses input metadata | ||
// as fallback in case output metadata isn't provided. | ||
class ImagePostprocessor : public Postprocessor { | ||
public: | ||
static tflite::support::StatusOr<std::unique_ptr<ImagePostprocessor>> | ||
Create(core::TfLiteEngine* engine, | ||
const int output_index, | ||
const int input_index = -1); | ||
|
||
// Processes the output tensor to an RGB of FrameBuffer type. | ||
// If output tensor is of type kTfLiteFloat32, denormalize it into [0 - 255] | ||
// via normalization parameters. | ||
absl::StatusOr<vision::FrameBuffer> Postprocess(); | ||
|
||
private: | ||
using Postprocessor::Postprocessor; | ||
|
||
const TfLiteTensor* output_tensor_; | ||
|
||
std::unique_ptr<vision::NormalizationOptions> options_; | ||
|
||
absl::Status Init(const int input_index, const int output_index); | ||
|
||
const vision::NormalizationOptions& GetNormalizationOptions() { | ||
return *options_.get(); | ||
} | ||
}; | ||
} // namespace processor | ||
} // namespace task | ||
} // namespace tflite | ||
|
||
#endif // TENSORFLOW_LITE_SUPPORT_CC_TASK_PROCESSOR_IMAGE_POSTPROCESSOR_H_ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.