Skip to content

Commit 97674c8

Browse files
Automated Code Change
PiperOrigin-RevId: 919407165
1 parent ed559ab commit 97674c8

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

tensorflow_lite_support/cc/task/vision/utils/frame_buffer_utils.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ OrientParams GetOrientParams(FrameBuffer::Orientation from_orientation,
265265
int from_index = GetOrientationIndex(from_orientation);
266266
int to_index = GetOrientationIndex(to_orientation);
267267
int angle = 0;
268-
absl::optional<OrientParams::FlipType> flip;
268+
std::optional<OrientParams::FlipType> flip;
269269

270270
TFLITE_DCHECK(from_index > -1 && to_index > -1);
271271

@@ -584,7 +584,7 @@ absl::Status FrameBufferUtils::Execute(
584584
}
585585

586586
absl::Status FrameBufferUtils::Preprocess(
587-
const FrameBuffer& buffer, absl::optional<BoundingBox> bounding_box,
587+
const FrameBuffer& buffer, std::optional<BoundingBox> bounding_box,
588588
FrameBuffer* output_buffer, bool uniform_resizing) {
589589
std::vector<FrameBufferOperation> frame_buffer_operations;
590590
// Handle cropping and resizing.

tensorflow_lite_support/cc/task/vision/utils/image_tensor_specs.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ StatusOr<const ImageProperties*> GetImagePropertiesIfAny(
8989
return tensor_metadata.content()->content_properties_as_ImageProperties();
9090
}
9191

92-
StatusOr<absl::optional<NormalizationOptions>> GetNormalizationOptionsIfAny(
92+
StatusOr<std::optional<NormalizationOptions>> GetNormalizationOptionsIfAny(
9393
const TensorMetadata& tensor_metadata) {
9494
ASSIGN_OR_RETURN(
9595
const tflite::ProcessUnit* normalization_process_unit,
@@ -110,7 +110,7 @@ StatusOr<absl::optional<NormalizationOptions>> GetNormalizationOptionsIfAny(
110110
mean_values->size(), " and ", std_values->size(), "."),
111111
TfLiteSupportStatus::kMetadataInvalidProcessUnitsError);
112112
}
113-
absl::optional<NormalizationOptions> normalization_options;
113+
std::optional<NormalizationOptions> normalization_options;
114114
if (mean_values->size() == 1) {
115115
normalization_options = NormalizationOptions{
116116
/* mean_values= */ {mean_values->Get(0), mean_values->Get(0),
@@ -145,7 +145,7 @@ StatusOr<ImageTensorSpecs> BuildInputImageTensorSpecs(
145145
GetInputTensorMetadataIfAny(metadata_extractor));
146146

147147
const ImageProperties* props = nullptr;
148-
absl::optional<NormalizationOptions> normalization_options;
148+
std::optional<NormalizationOptions> normalization_options;
149149
if (metadata != nullptr) {
150150
ASSIGN_OR_RETURN(props, GetImagePropertiesIfAny(*metadata));
151151
ASSIGN_OR_RETURN(normalization_options,

tensorflow_lite_support/cc/task/vision/utils/score_calibration.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ absl::Status ScoreCalibration::InitializeFromParameters(
159159

160160
float ScoreCalibration::ComputeCalibratedScore(const std::string& label,
161161
float uncalibrated_score) const {
162-
absl::optional<Sigmoid> sigmoid = FindSigmoidParameters(label);
162+
std::optional<Sigmoid> sigmoid = FindSigmoidParameters(label);
163163
if (!sigmoid.has_value() ||
164164
(sigmoid.value().min_uncalibrated_score.has_value() &&
165165
uncalibrated_score < sigmoid.value().min_uncalibrated_score.value())) {
@@ -189,7 +189,7 @@ float ScoreCalibration::ComputeCalibratedScore(const std::string& label,
189189
return std::max(std::min(calibrated_score, sigmoid.value().scale), 0.0f);
190190
}
191191

192-
absl::optional<Sigmoid> ScoreCalibration::FindSigmoidParameters(
192+
std::optional<Sigmoid> ScoreCalibration::FindSigmoidParameters(
193193
const std::string& label) const {
194194
auto it = sigmoid_parameters_map_.find(label);
195195
if (it != sigmoid_parameters_map_.end()) {

0 commit comments

Comments
 (0)