Skip to content

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.

Sign up for GitHub

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
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Image postprocessor #720

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3b41352
init push
jonpsy Dec 3, 2021
0344650
Write main logic.
jonpsy Dec 3, 2021
99e709d
build file updated
jonpsy Dec 3, 2021
7c766c3
format file
jonpsy Dec 3, 2021
4cdbbf8
Use "is_input bool to switch input/output.
jonpsy Dec 9, 2021
2a39596
Preprocessor use new API
jonpsy Dec 9, 2021
ed455cb
single index instead of multi
jonpsy Dec 9, 2021
ae93793
Re-use logic from BuildImageTensorSpecs
jonpsy Dec 9, 2021
e24ef95
move in unknwn namespace
jonpsy Dec 11, 2021
f4b1607
move has_uint8_output_ to init()
jonpsy Dec 11, 2021
5236b8b
Use populate vector & rm size checks
jonpsy Dec 19, 2021
31c2b31
Pass tensor & metato tensor_spec. rm tensor count.
jonpsy Dec 22, 2021
213acb0
GetTensorMetada() checks subgraph of given meta
jonpsy Dec 22, 2021
9cdcb04
NormProcessUnit check in postprocessor to fallback
jonpsy Dec 23, 2021
352fcdb
store output tensor instead of its type.
jonpsy Dec 23, 2021
d1fa720
Remove is_input from image_tensor_specs.h
jonpsy Dec 23, 2021
63846f8
update BuildImageTensorSpec for preprocessor.
jonpsy Dec 23, 2021
8d9dc30
Fix compile error
jonpsy Dec 23, 2021
da766a4
Fix namespace
jonpsy Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Pass tensor & metato tensor_spec. rm tensor count.
  • Loading branch information
@jonpsy
jonpsy authored Dec 22, 2021
commit 31c2b31f4c20db4c5529658126d50cba4aa0e07b
62 changes: 10 additions & 52 deletions tensorflow_lite_support/cc/task/vision/utils/image_tensor_specs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,35 +40,20 @@ using ::tflite::support::TfLiteSupportStatus;
using ::tflite::task::core::TfLiteEngine;

StatusOr<const TensorMetadata*> GetTensorMetadataIfAny(
const ModelMetadataExtractor& metadata_extractor, const bool is_input) {
const ModelMetadataExtractor& metadata_extractor,
const TensorMetadata* tensor_metadata) {
if (metadata_extractor.GetModelMetadata() == nullptr ||
metadata_extractor.GetModelMetadata()->subgraph_metadata() == nullptr) {
// Some models have no metadata at all (or very partial), so exit early.
return nullptr;
} else if (is_input && metadata_extractor.GetInputTensorCount() != 1) {
return CreateStatusWithPayload(
StatusCode::kInvalidArgument,
"Models are assumed to have a single input TensorMetadata.",
TfLiteSupportStatus::kInvalidNumInputTensorsError);
} else if (!is_input && metadata_extractor.GetOutputTensorCount() != 1) {
return CreateStatusWithPayload(
StatusCode::kInvalidArgument,
"Models are assumed to have a single output TensorMetadata.",
TfLiteSupportStatus::kInvalidNumOutputTensorsError);
}

const TensorMetadata* input_metadata =
metadata_extractor.GetInputTensorMetadata(0);
const TensorMetadata* output_metadata =
metadata_extractor.GetOutputTensorMetadata(0);

if (input_metadata == nullptr) {
if (tensor_metadata == nullptr) {
// Should never happen.
return CreateStatusWithPayload(StatusCode::kInternal,
"Input TensorMetadata is null.");
"Provided TensorMetadata is null.");
}

return is_input ? input_metadata : output_metadata;
return tensor_metadata;
}
} // namespace

Expand Down Expand Up @@ -143,41 +128,15 @@ StatusOr<absl::optional<NormalizationOptions>> GetNormalizationOptionsIfAny(

StatusOr<ImageTensorSpecs> BuildImageTensorSpecs(
const TfLiteEngine::Interpreter& interpreter,
const tflite::metadata::ModelMetadataExtractor& metadata_extractor,
const bool is_input) {
ASSIGN_OR_RETURN(const TensorMetadata* metadata,
GetTensorMetadataIfAny(metadata_extractor, is_input));

const TensorMetadata* tensor_metadata, const TfLiteTensor* tensor) {
const ImageProperties* props = nullptr;
absl::optional<NormalizationOptions> normalization_options;
if (metadata != nullptr) {
ASSIGN_OR_RETURN(props, GetImagePropertiesIfAny(*metadata));
if (tensor_metadata != nullptr) {
ASSIGN_OR_RETURN(props, GetImagePropertiesIfAny(*tensor_metadata));
ASSIGN_OR_RETURN(normalization_options,
GetNormalizationOptionsIfAny(*metadata));
if (!is_input && !normalization_options.has_value()) {
ASSIGN_OR_RETURN(normalization_options,
GetNormalizationOptionsIfAny(
*metadata_extractor.GetInputTensorMetadata(0)));
}
GetNormalizationOptionsIfAny(*tensor_metadata));
}

if (is_input && TfLiteEngine::InputCount(&interpreter) != 1) {
return CreateStatusWithPayload(
StatusCode::kInvalidArgument,
"Models are assumed to have a single input.",
TfLiteSupportStatus::kInvalidNumInputTensorsError);
} else if (!is_input && TfLiteEngine::OutputCount(&interpreter) != 1) {
return CreateStatusWithPayload(
StatusCode::kInvalidArgument,
"Models are assumed to have a single output.",
TfLiteSupportStatus::kInvalidNumOutputTensorsError);
}

// Input/output-related specifications.
const TfLiteTensor* tensor = is_input
? TfLiteEngine::GetInput(&interpreter, 0)
: TfLiteEngine::GetOutput(&interpreter, 0);

if (tensor->dims->size != 4) {
return CreateStatusWithPayload(
StatusCode::kInvalidArgument,
Expand Down Expand Up @@ -265,8 +224,7 @@ StatusOr<ImageTensorSpecs> BuildImageTensorSpecs(
result.image_height = height;
result.color_space = ColorSpaceType_RGB;
result.tensor_type = tensor_type;
result.normalization_options =
normalization_options;
result.normalization_options = normalization_options;

return result;
}
Expand Down