Removed MPPClassifierOptions and helpers
This commit is contained in:
		
							parent
							
								
									89aad67a87
								
							
						
					
					
						commit
						8f74a175d8
					
				| 
						 | 
				
			
			@ -1,23 +0,0 @@
 | 
			
		|||
# Copyright 2022 The MediaPipe Authors. All Rights Reserved.
 | 
			
		||||
#
 | 
			
		||||
# Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
# you may not use this file except in compliance with the License.
 | 
			
		||||
# You may obtain a copy of the License at
 | 
			
		||||
#
 | 
			
		||||
#      http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
#
 | 
			
		||||
# Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
# distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
# See the License for the specific language governing permissions and
 | 
			
		||||
# limitations under the License.
 | 
			
		||||
 | 
			
		||||
package(default_visibility = ["//mediapipe/tasks:internal"])
 | 
			
		||||
 | 
			
		||||
licenses(["notice"])
 | 
			
		||||
 | 
			
		||||
objc_library(
 | 
			
		||||
    name = "MPPClassifierOptions",
 | 
			
		||||
    srcs = ["sources/MPPClassifierOptions.m"],
 | 
			
		||||
    hdrs = ["sources/MPPClassifierOptions.h"],
 | 
			
		||||
)
 | 
			
		||||
| 
						 | 
				
			
			@ -1,60 +0,0 @@
 | 
			
		|||
// Copyright 2022 The MediaPipe Authors.
 | 
			
		||||
//
 | 
			
		||||
// Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
// you may not use this file except in compliance with the License.
 | 
			
		||||
// You may obtain a copy of the License at
 | 
			
		||||
//
 | 
			
		||||
//      http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
//
 | 
			
		||||
// Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
// distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
// See the License for the specific language governing permissions and
 | 
			
		||||
// limitations under the License.
 | 
			
		||||
 | 
			
		||||
#import <Foundation/Foundation.h>
 | 
			
		||||
 | 
			
		||||
NS_ASSUME_NONNULL_BEGIN
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Holds settings for any single iOS MediaPipe classification task.
 | 
			
		||||
 */
 | 
			
		||||
NS_SWIFT_NAME(ClassifierOptions)
 | 
			
		||||
@interface MPPClassifierOptions : NSObject <NSCopying>
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * The locale to use for display names specified through the TFLite Model
 | 
			
		||||
 * Metadata, if any. Defaults to English.
 | 
			
		||||
 */
 | 
			
		||||
@property(nonatomic, copy) NSString *displayNamesLocale;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * The maximum number of top-scored classification results to return. If < 0,
 | 
			
		||||
 * all available results will be returned. If 0, an invalid argument error is
 | 
			
		||||
 * returned.
 | 
			
		||||
 */
 | 
			
		||||
@property(nonatomic) NSInteger maxResults;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Score threshold to override the one provided in the model metadata (if any).
 | 
			
		||||
 * Results below this value are rejected.
 | 
			
		||||
 */
 | 
			
		||||
@property(nonatomic) float scoreThreshold;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * The allowlist of category names. If non-empty, detection results whose
 | 
			
		||||
 * category name is not in this set will be filtered out. Duplicate or unknown
 | 
			
		||||
 * category names are ignored. Mutually exclusive with categoryDenylist.
 | 
			
		||||
 */
 | 
			
		||||
@property(nonatomic, copy) NSArray<NSString *> *categoryAllowlist;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * The denylist of category names. If non-empty, detection results whose
 | 
			
		||||
 * category name is in this set will be filtered out. Duplicate or unknown
 | 
			
		||||
 * category names are ignored. Mutually exclusive with categoryAllowlist.
 | 
			
		||||
 */
 | 
			
		||||
@property(nonatomic, copy) NSArray<NSString *> *categoryDenylist;
 | 
			
		||||
 | 
			
		||||
@end
 | 
			
		||||
 | 
			
		||||
NS_ASSUME_NONNULL_END
 | 
			
		||||
| 
						 | 
				
			
			@ -1,40 +0,0 @@
 | 
			
		|||
// Copyright 2022 The MediaPipe Authors.
 | 
			
		||||
//
 | 
			
		||||
// Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
// you may not use this file except in compliance with the License.
 | 
			
		||||
// You may obtain a copy of the License at
 | 
			
		||||
//
 | 
			
		||||
//      http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
//
 | 
			
		||||
// Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
// distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
// See the License for the specific language governing permissions and
 | 
			
		||||
// limitations under the License.
 | 
			
		||||
 | 
			
		||||
#import "mediapipe/tasks/ios/components/processors/sources/MPPClassifierOptions.h"
 | 
			
		||||
 | 
			
		||||
@implementation MPPClassifierOptions
 | 
			
		||||
 | 
			
		||||
- (instancetype)init {
 | 
			
		||||
  self = [super init];
 | 
			
		||||
  if (self) {
 | 
			
		||||
    _maxResults = -1;
 | 
			
		||||
    _scoreThreshold = 0;
 | 
			
		||||
  }
 | 
			
		||||
  return self;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
- (id)copyWithZone:(NSZone *)zone {
 | 
			
		||||
  MPPClassifierOptions *classifierOptions = [[MPPClassifierOptions alloc] init];
 | 
			
		||||
 | 
			
		||||
  classifierOptions.scoreThreshold = self.scoreThreshold;
 | 
			
		||||
  classifierOptions.maxResults = self.maxResults;
 | 
			
		||||
  classifierOptions.categoryDenylist = self.categoryDenylist;
 | 
			
		||||
  classifierOptions.categoryAllowlist = self.categoryAllowlist;
 | 
			
		||||
  classifierOptions.displayNamesLocale = self.displayNamesLocale;
 | 
			
		||||
 | 
			
		||||
  return classifierOptions;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@end
 | 
			
		||||
| 
						 | 
				
			
			@ -1,28 +0,0 @@
 | 
			
		|||
# Copyright 2022 The MediaPipe Authors. All Rights Reserved.
 | 
			
		||||
#
 | 
			
		||||
# Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
# you may not use this file except in compliance with the License.
 | 
			
		||||
# You may obtain a copy of the License at
 | 
			
		||||
#
 | 
			
		||||
#      http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
#
 | 
			
		||||
# Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
# distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
# See the License for the specific language governing permissions and
 | 
			
		||||
# limitations under the License.
 | 
			
		||||
 | 
			
		||||
package(default_visibility = ["//mediapipe/tasks:internal"])
 | 
			
		||||
 | 
			
		||||
licenses(["notice"])
 | 
			
		||||
 | 
			
		||||
objc_library(
 | 
			
		||||
    name = "MPPClassifierOptionsHelpers",
 | 
			
		||||
    srcs = ["sources/MPPClassifierOptions+Helpers.mm"],
 | 
			
		||||
    hdrs = ["sources/MPPClassifierOptions+Helpers.h"],
 | 
			
		||||
    deps = [
 | 
			
		||||
        "//mediapipe/tasks/cc/components/processors/proto:classifier_options_cc_proto",
 | 
			
		||||
        "//mediapipe/tasks/ios/common/utils:NSStringHelpers",
 | 
			
		||||
        "//mediapipe/tasks/ios/components/processors:MPPClassifierOptions",
 | 
			
		||||
    ],
 | 
			
		||||
)
 | 
			
		||||
| 
						 | 
				
			
			@ -1,26 +0,0 @@
 | 
			
		|||
// Copyright 2022 The MediaPipe Authors.
 | 
			
		||||
//
 | 
			
		||||
// Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
// you may not use this file except in compliance with the License.
 | 
			
		||||
// You may obtain a copy of the License at
 | 
			
		||||
//
 | 
			
		||||
//      http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
//
 | 
			
		||||
// Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
// distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
// See the License for the specific language governing permissions and
 | 
			
		||||
// limitations under the License.
 | 
			
		||||
 | 
			
		||||
#include "mediapipe/tasks/cc/components/processors/proto/classifier_options.pb.h"
 | 
			
		||||
 | 
			
		||||
#import "mediapipe/tasks/ios/components/processors/sources/MPPClassifierOptions.h"
 | 
			
		||||
 | 
			
		||||
NS_ASSUME_NONNULL_BEGIN
 | 
			
		||||
 | 
			
		||||
@interface MPPClassifierOptions (Helpers)
 | 
			
		||||
- (void)copyToProto:
 | 
			
		||||
    (mediapipe::tasks::components::processors::proto::ClassifierOptions *)classifierOptionsProto;
 | 
			
		||||
@end
 | 
			
		||||
 | 
			
		||||
NS_ASSUME_NONNULL_END
 | 
			
		||||
| 
						 | 
				
			
			@ -1,43 +0,0 @@
 | 
			
		|||
// Copyright 2022 The MediaPipe Authors.
 | 
			
		||||
//
 | 
			
		||||
// Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
// you may not use this file except in compliance with the License.
 | 
			
		||||
// You may obtain a copy of the License at
 | 
			
		||||
//
 | 
			
		||||
//      http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
//
 | 
			
		||||
// Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
// distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
// 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"
 | 
			
		||||
 | 
			
		||||
namespace {
 | 
			
		||||
using ClassifierOptionsProto = ::mediapipe::tasks::components::processors::proto::ClassifierOptions;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@implementation MPPClassifierOptions (Helpers)
 | 
			
		||||
 | 
			
		||||
- (void)copyToProto:(ClassifierOptionsProto *)classifierOptionsProto {
 | 
			
		||||
  classifierOptionsProto->Clear();
 | 
			
		||||
 | 
			
		||||
  if (self.displayNamesLocale) {
 | 
			
		||||
    classifierOptionsProto->set_display_names_locale(self.displayNamesLocale.cppString);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  classifierOptionsProto->set_max_results((int)self.maxResults);
 | 
			
		||||
  classifierOptionsProto->set_score_threshold(self.scoreThreshold);
 | 
			
		||||
 | 
			
		||||
  for (NSString *category in self.categoryAllowlist) {
 | 
			
		||||
    classifierOptionsProto->add_category_allowlist(category.cppString);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  for (NSString *category in self.categoryDenylist) {
 | 
			
		||||
    classifierOptionsProto->add_category_denylist(category.cppString);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@end
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user