From 1aa44abcaba07ab2e5ba768d6f3e9882a3e694f9 Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Wed, 24 May 2023 20:25:45 +0530 Subject: [PATCH] Revert "Added support to set delegates in MPPBaseOptions" This reverts commit 1e1693d9aaf348fdf1d2fa9d2836bd76056b1c54. --- .../tasks/ios/core/sources/MPPBaseOptions.h | 21 +------------------ .../tasks/ios/core/sources/MPPBaseOptions.m | 1 - .../utils/sources/MPPBaseOptions+Helpers.mm | 13 ------------ 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/mediapipe/tasks/ios/core/sources/MPPBaseOptions.h b/mediapipe/tasks/ios/core/sources/MPPBaseOptions.h index 9f61d872a..bef6bb9ee 100644 --- a/mediapipe/tasks/ios/core/sources/MPPBaseOptions.h +++ b/mediapipe/tasks/ios/core/sources/MPPBaseOptions.h @@ -16,17 +16,6 @@ NS_ASSUME_NONNULL_BEGIN -/** - * MediaPipe Tasks delegate. - */ - typedef NS_ENUM(NSUInteger, MPPDelegate) { - /** CPU. */ - MPPDelegateCPU, - - /** GPU. */ - MPPDelegateGPU - } NS_SWIFT_NAME(Delegate); - /** * Holds the base options that is used for creation of any type of task. It has fields with * important information acceleration configuration, TFLite model source etc. @@ -34,17 +23,9 @@ NS_ASSUME_NONNULL_BEGIN NS_SWIFT_NAME(BaseOptions) @interface MPPBaseOptions : NSObject -/** - * The absolute path to a model asset file (a tflite model or a model asset bundle file) stored in the app bundle. - */ +/** The path to the model asset to open and mmap in memory. */ @property(nonatomic, copy) NSString *modelAssetPath; -/** - * Device delegate to run the MediaPipe pipeline. If the delegate is not set, the default - * delegate CPU is used. - */ -@property(nonatomic) MPPDelegate delegate; - @end NS_ASSUME_NONNULL_END diff --git a/mediapipe/tasks/ios/core/sources/MPPBaseOptions.m b/mediapipe/tasks/ios/core/sources/MPPBaseOptions.m index c3571c4b4..a43119ad8 100644 --- a/mediapipe/tasks/ios/core/sources/MPPBaseOptions.m +++ b/mediapipe/tasks/ios/core/sources/MPPBaseOptions.m @@ -28,7 +28,6 @@ MPPBaseOptions *baseOptions = [[MPPBaseOptions alloc] init]; baseOptions.modelAssetPath = self.modelAssetPath; - baseOptions.delegate = self.delegate; return baseOptions; } diff --git a/mediapipe/tasks/ios/core/utils/sources/MPPBaseOptions+Helpers.mm b/mediapipe/tasks/ios/core/utils/sources/MPPBaseOptions+Helpers.mm index a97487cd9..73bcac49d 100644 --- a/mediapipe/tasks/ios/core/utils/sources/MPPBaseOptions+Helpers.mm +++ b/mediapipe/tasks/ios/core/utils/sources/MPPBaseOptions+Helpers.mm @@ -33,19 +33,6 @@ using BaseOptionsProto = ::mediapipe::tasks::core::proto::BaseOptions; if (self.modelAssetPath) { baseOptionsProto->mutable_model_asset()->set_file_name(self.modelAssetPath.UTF8String); } - - switch (self.delegate) { - case MPPDelegateCPU: { - baseOptionsProto->mutable_acceleration()->mutable_tflite(); - break; - } - case MPPDelegateGPU: { - baseOptionsProto->mutable_acceleration()->mutable_gpu(); - break; - } - default: - break; - } } @end