fix setting BaseOptions delegate type error

fix setting BaseOptions delegate type error
This commit is contained in:
zhuwen 2023-09-08 15:36:36 +08:00
parent cbbbc9e49e
commit c5aa96c020
3 changed files with 12 additions and 13 deletions

View File

@ -17,8 +17,7 @@
typedef enum : NSUInteger { typedef enum : NSUInteger {
MPPBaseOptionsDelegateType_Unknown, MPPBaseOptionsDelegateType_Unknown,
MPPBaseOptionsDelegateType_Cpu, MPPBaseOptionsDelegateType_Cpu,
MPPBaseOptionsDelegateType_Gpu, MPPBaseOptionsDelegateType_Gpu
MPPBaseOptionsDelegateType_Tpu
} MPPBaseOptionsDelegateType; } MPPBaseOptionsDelegateType;
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

View File

@ -28,6 +28,7 @@
MPPBaseOptions *baseOptions = [[MPPBaseOptions alloc] init]; MPPBaseOptions *baseOptions = [[MPPBaseOptions alloc] init];
baseOptions.modelAssetPath = self.modelAssetPath; baseOptions.modelAssetPath = self.modelAssetPath;
baseOptions.delegateType = self.delegateType;
return baseOptions; return baseOptions;
} }

View File

@ -35,14 +35,13 @@ using BaseOptionsProto = ::mediapipe::tasks::core::proto::BaseOptions;
} }
if (self.delegateType != MPPBaseOptionsDelegateType_Unknown) { if (self.delegateType != MPPBaseOptionsDelegateType_Unknown) {
switch (self.delegateType) { switch (self.delegateType) {
case MPPBaseOptionsDelegateType_Cpu: case MPPBaseOptionsDelegateType_Cpu: {
baseOptionsProto->mutable_acceleration()->mutable_tflite(); baseOptionsProto->mutable_acceleration()->mutable_tflite();
}
break; break;
case MPPBaseOptionsDelegateType_Gpu: case MPPBaseOptionsDelegateType_Gpu: {
baseOptionsProto->mutable_acceleration()->mutable_gpu()->set_use_advanced_gpu_api(true); 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; break;
default: default:
break; break;