From c5aa96c020d4b2821375b11a9cb52ae5eef94470 Mon Sep 17 00:00:00 2001 From: zhuwen <1224717847@qq.com> Date: Fri, 8 Sep 2023 15:36:36 +0800 Subject: [PATCH] fix setting BaseOptions delegate type error fix setting BaseOptions delegate type error --- .../tasks/ios/core/sources/MPPBaseOptions.h | 3 +-- .../tasks/ios/core/sources/MPPBaseOptions.m | 1 + .../utils/sources/MPPBaseOptions+Helpers.mm | 21 +++++++++---------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/mediapipe/tasks/ios/core/sources/MPPBaseOptions.h b/mediapipe/tasks/ios/core/sources/MPPBaseOptions.h index 1ccc7515c..aa739275f 100644 --- a/mediapipe/tasks/ios/core/sources/MPPBaseOptions.h +++ b/mediapipe/tasks/ios/core/sources/MPPBaseOptions.h @@ -17,8 +17,7 @@ typedef enum : NSUInteger { MPPBaseOptionsDelegateType_Unknown, MPPBaseOptionsDelegateType_Cpu, - MPPBaseOptionsDelegateType_Gpu, - MPPBaseOptionsDelegateType_Tpu + MPPBaseOptionsDelegateType_Gpu } MPPBaseOptionsDelegateType; NS_ASSUME_NONNULL_BEGIN diff --git a/mediapipe/tasks/ios/core/sources/MPPBaseOptions.m b/mediapipe/tasks/ios/core/sources/MPPBaseOptions.m index a43119ad8..1844de3db 100644 --- a/mediapipe/tasks/ios/core/sources/MPPBaseOptions.m +++ b/mediapipe/tasks/ios/core/sources/MPPBaseOptions.m @@ -28,6 +28,7 @@ MPPBaseOptions *baseOptions = [[MPPBaseOptions alloc] init]; baseOptions.modelAssetPath = self.modelAssetPath; + baseOptions.delegateType = self.delegateType; 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 c0b8bccee..5cf5902b5 100644 --- a/mediapipe/tasks/ios/core/utils/sources/MPPBaseOptions+Helpers.mm +++ b/mediapipe/tasks/ios/core/utils/sources/MPPBaseOptions+Helpers.mm @@ -35,17 +35,16 @@ using BaseOptionsProto = ::mediapipe::tasks::core::proto::BaseOptions; } if (self.delegateType != MPPBaseOptionsDelegateType_Unknown) { switch (self.delegateType) { - case MPPBaseOptionsDelegateType_Cpu: - baseOptionsProto->mutable_acceleration()->mutable_tflite(); - break; - case MPPBaseOptionsDelegateType_Gpu: - baseOptionsProto->mutable_acceleration()->mutable_gpu()->set_use_advanced_gpu_api(true); - break; - case MPPBaseOptionsDelegateType_Tpu: - baseOptionsProto->mutable_acceleration()->mutable_nnapi()->set_accelerator_name("google-edgetpu"); - break; - default: - break; + case MPPBaseOptionsDelegateType_Cpu: { + baseOptionsProto->mutable_acceleration()->mutable_tflite(); + } + break; + case MPPBaseOptionsDelegateType_Gpu: { + baseOptionsProto->mutable_acceleration()->mutable_gpu()->set_use_advanced_gpu_api(true); + } + break; + default: + break; } } }