From 84f4d79fd6f453c240eb485d149f221d2b247b86 Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Fri, 6 Jan 2023 14:52:24 +0530 Subject: [PATCH] Updated ordering of imports in iOS files --- .../containers/utils/sources/MPPCategory+Helpers.mm | 3 ++- .../utils/sources/MPPClassificationResult+Helpers.mm | 3 ++- .../utils/sources/MPPClassifierOptions+Helpers.mm | 3 ++- mediapipe/tasks/ios/core/sources/MPPTaskInfo.mm | 1 + mediapipe/tasks/ios/core/sources/MPPTaskOptions.m | 1 + mediapipe/tasks/ios/core/sources/MPPTaskRunner.mm | 4 +++- mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.mm | 1 + .../ios/text/text_classifier/sources/MPPTextClassifier.mm | 4 ++-- .../utils/sources/MPPTextClassifierOptions+Helpers.mm | 6 ++++-- .../utils/sources/MPPTextClassifierResult+Helpers.mm | 3 ++- 10 files changed, 20 insertions(+), 9 deletions(-) diff --git a/mediapipe/tasks/ios/components/containers/utils/sources/MPPCategory+Helpers.mm b/mediapipe/tasks/ios/components/containers/utils/sources/MPPCategory+Helpers.mm index f729d9720..1c6c951d0 100644 --- a/mediapipe/tasks/ios/components/containers/utils/sources/MPPCategory+Helpers.mm +++ b/mediapipe/tasks/ios/components/containers/utils/sources/MPPCategory+Helpers.mm @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" #import "mediapipe/tasks/ios/components/containers/utils/sources/MPPCategory+Helpers.h" +#import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" + namespace { using ClassificationProto = ::mediapipe::Classification; } diff --git a/mediapipe/tasks/ios/components/containers/utils/sources/MPPClassificationResult+Helpers.mm b/mediapipe/tasks/ios/components/containers/utils/sources/MPPClassificationResult+Helpers.mm index 6510b0ab1..02ad390cd 100644 --- a/mediapipe/tasks/ios/components/containers/utils/sources/MPPClassificationResult+Helpers.mm +++ b/mediapipe/tasks/ios/components/containers/utils/sources/MPPClassificationResult+Helpers.mm @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#import "mediapipe/tasks/ios/components/containers/utils/sources/MPPClassificationResult+Helpers.h" + #import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" #import "mediapipe/tasks/ios/components/containers/utils/sources/MPPCategory+Helpers.h" -#import "mediapipe/tasks/ios/components/containers/utils/sources/MPPClassificationResult+Helpers.h" namespace { using ClassificationsProto = ::mediapipe::tasks::components::containers::proto::Classifications; diff --git a/mediapipe/tasks/ios/components/processors/utils/sources/MPPClassifierOptions+Helpers.mm b/mediapipe/tasks/ios/components/processors/utils/sources/MPPClassifierOptions+Helpers.mm index 24b54fd6a..94b3270c8 100644 --- a/mediapipe/tasks/ios/components/processors/utils/sources/MPPClassifierOptions+Helpers.mm +++ b/mediapipe/tasks/ios/components/processors/utils/sources/MPPClassifierOptions+Helpers.mm @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" #import "mediapipe/tasks/ios/components/processors/utils/sources/MPPClassifierOptions+Helpers.h" +#import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" + namespace { using ClassifierOptionsProto = ::mediapipe::tasks::components::processors::proto::ClassifierOptions; } diff --git a/mediapipe/tasks/ios/core/sources/MPPTaskInfo.mm b/mediapipe/tasks/ios/core/sources/MPPTaskInfo.mm index 80ff594a2..ae6ed2a70 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTaskInfo.mm +++ b/mediapipe/tasks/ios/core/sources/MPPTaskInfo.mm @@ -13,6 +13,7 @@ // limitations under the License. #import "mediapipe/tasks/ios/core/sources/MPPTaskInfo.h" + #import "mediapipe/tasks/ios/common/sources/MPPCommon.h" #import "mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.h" #import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" diff --git a/mediapipe/tasks/ios/core/sources/MPPTaskOptions.m b/mediapipe/tasks/ios/core/sources/MPPTaskOptions.m index fe74517c3..ad11bbc6e 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTaskOptions.m +++ b/mediapipe/tasks/ios/core/sources/MPPTaskOptions.m @@ -13,6 +13,7 @@ // limitations under the License. #import "mediapipe/tasks/ios/core/sources/MPPTaskOptions.h" + #import "mediapipe/tasks/ios/core/sources/MPPBaseOptions.h" @implementation MPPTaskOptions diff --git a/mediapipe/tasks/ios/core/sources/MPPTaskRunner.mm b/mediapipe/tasks/ios/core/sources/MPPTaskRunner.mm index fd3f780fa..a77f206b2 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTaskRunner.mm +++ b/mediapipe/tasks/ios/core/sources/MPPTaskRunner.mm @@ -13,8 +13,10 @@ // limitations under the License. #import "mediapipe/tasks/ios/core/sources/MPPTaskRunner.h" -#include "mediapipe/tasks/cc/core/mediapipe_builtin_op_resolver.h" + #import "mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.h" + +#include "mediapipe/tasks/cc/core/mediapipe_builtin_op_resolver.h" #include "tensorflow/lite/core/api/op_resolver.h" namespace { diff --git a/mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.mm b/mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.mm index ca86e7a0b..fb59b363d 100644 --- a/mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.mm +++ b/mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.mm @@ -13,6 +13,7 @@ // limitations under the License. #import "mediapipe/tasks/ios/core/sources/MPPTextPacketCreator.h" + #import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" namespace { diff --git a/mediapipe/tasks/ios/text/text_classifier/sources/MPPTextClassifier.mm b/mediapipe/tasks/ios/text/text_classifier/sources/MPPTextClassifier.mm index 8a1116285..afe9b9a40 100644 --- a/mediapipe/tasks/ios/text/text_classifier/sources/MPPTextClassifier.mm +++ b/mediapipe/tasks/ios/text/text_classifier/sources/MPPTextClassifier.mm @@ -13,6 +13,7 @@ // limitations under the License. #import "mediapipe/tasks/ios/text/text_classifier/sources/MPPTextClassifier.h" + #import "mediapipe/tasks/ios/common/utils/sources/MPPCommonUtils.h" #import "mediapipe/tasks/ios/common/utils/sources/NSString+Helpers.h" #import "mediapipe/tasks/ios/core/sources/MPPTaskInfo.h" @@ -21,9 +22,8 @@ #import "mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierOptions+Helpers.h" #import "mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierResult+Helpers.h" -#include "mediapipe/tasks/cc/components/containers/proto/classifications.pb.h" - #include "absl/status/statusor.h" +#include "mediapipe/tasks/cc/components/containers/proto/classifications.pb.h" namespace { using ::mediapipe::Packet; diff --git a/mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierOptions+Helpers.mm b/mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierOptions+Helpers.mm index 79e4a38cc..5a43f2d2f 100644 --- a/mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierOptions+Helpers.mm +++ b/mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierOptions+Helpers.mm @@ -12,10 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "mediapipe/tasks/cc/text/text_classifier/proto/text_classifier_graph_options.pb.h" +#import "mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierOptions+Helpers.h" + #import "mediapipe/tasks/ios/components/processors/utils/sources/MPPClassifierOptions+Helpers.h" #import "mediapipe/tasks/ios/core/utils/sources/MPPBaseOptions+Helpers.h" -#import "mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierOptions+Helpers.h" + +#include "mediapipe/tasks/cc/text/text_classifier/proto/text_classifier_graph_options.pb.h" namespace { using CalculatorOptionsProto = ::mediapipe::CalculatorOptions; diff --git a/mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierResult+Helpers.mm b/mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierResult+Helpers.mm index f5d6aa1d3..62e0d8cb1 100644 --- a/mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierResult+Helpers.mm +++ b/mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierResult+Helpers.mm @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "mediapipe/tasks/ios/components/containers/utils/sources/MPPClassificationResult+Helpers.h" #import "mediapipe/tasks/ios/text/text_classifier/utils/sources/MPPTextClassifierResult+Helpers.h" +#import "mediapipe/tasks/ios/components/containers/utils/sources/MPPClassificationResult+Helpers.h" + #include "mediapipe/tasks/cc/components/containers/proto/classifications.pb.h" static const int kMicroSecondsPerMilliSecond = 1000;