From 11413f0acd286ec65a4a7f3aed241356aec70f7e Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Thu, 6 Apr 2023 20:01:15 +0530 Subject: [PATCH] Added Basic ObjC Object Detector --- .../ios/test/vision/object_detector/BUILD | 55 +++++ .../object_detector/MPPObjectDetectorTests.m | 197 ++++++++++++++++++ .../tasks/ios/vision/object_detector/BUILD | 2 +- 3 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 mediapipe/tasks/ios/test/vision/object_detector/BUILD create mode 100644 mediapipe/tasks/ios/test/vision/object_detector/MPPObjectDetectorTests.m diff --git a/mediapipe/tasks/ios/test/vision/object_detector/BUILD b/mediapipe/tasks/ios/test/vision/object_detector/BUILD new file mode 100644 index 000000000..36e1afb2f --- /dev/null +++ b/mediapipe/tasks/ios/test/vision/object_detector/BUILD @@ -0,0 +1,55 @@ +load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test") +load( + "//mediapipe/tasks:ios/ios.bzl", + "MPP_TASK_MINIMUM_OS_VERSION", +) +load( + "@org_tensorflow//tensorflow/lite:special_rules.bzl", + "tflite_ios_lab_runner", +) + +package(default_visibility = ["//mediapipe/tasks:internal"]) + +licenses(["notice"]) + +# Default tags for filtering iOS targets. Targets are restricted to Apple platforms. +TFL_DEFAULT_TAGS = [ + "apple", +] + +# Following sanitizer tests are not supported by iOS test targets. +TFL_DISABLED_SANITIZER_TAGS = [ + "noasan", + "nomsan", + "notsan", +] + +objc_library( + name = "MPPObjectDetectorObjcTestLibrary", + testonly = 1, + srcs = ["MPPObjectDetectorTests.m"], + copts = [ + "-ObjC++", + "-std=c++17", + "-x objective-c++", + ], + data = [ + "//mediapipe/tasks/testdata/vision:test_images", + "//mediapipe/tasks/testdata/vision:test_models", + ], + deps = [ + "//mediapipe/tasks/ios/common:MPPCommon", + "//mediapipe/tasks/ios/test/vision/utils:MPPImageTestUtils", + "//mediapipe/tasks/ios/vision/object_detector:MPPObjectDetector", + ], +) + +ios_unit_test( + name = "MPPObjectDetectorObjcTest", + minimum_os_version = MPP_TASK_MINIMUM_OS_VERSION, + runner = tflite_ios_lab_runner("IOS_LATEST"), + tags = TFL_DEFAULT_TAGS + TFL_DISABLED_SANITIZER_TAGS, + deps = [ + ":MPPObjectDetectorObjcTestLibrary", + ], +) diff --git a/mediapipe/tasks/ios/test/vision/object_detector/MPPObjectDetectorTests.m b/mediapipe/tasks/ios/test/vision/object_detector/MPPObjectDetectorTests.m new file mode 100644 index 000000000..783006cae --- /dev/null +++ b/mediapipe/tasks/ios/test/vision/object_detector/MPPObjectDetectorTests.m @@ -0,0 +1,197 @@ +// Copyright 2023 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 + +#import "mediapipe/tasks/ios/common/sources/MPPCommon.h" +#import "mediapipe/tasks/ios/test/vision/utils/sources/MPPImage+TestUtils.h" +#import "mediapipe/tasks/ios/vision/object_detector/sources/MPPObjectDetector.h" + +static NSString *const kModelName = @"coco_ssd_mobilenet_v1_1.0_quant_2018_06_29"; +static NSDictionary *const kCatsAndDogsImage = @{@"name" : @"cats_and_dogs", @"type" : @"jpg"}; +static NSDictionary *const kCatsAndDogsRotatedImage = @{@"name" : @"cats_and_dogs_rotated", @"type" : @"jpg"}; +static NSString *const kExpectedErrorDomain = @"com.google.mediapipe.tasks"; + +#define PixelDifferenceTolerance 5.0f + +#define AssertEqualErrors(error, expectedError) \ + XCTAssertNotNil(error); \ + XCTAssertEqualObjects(error.domain, expectedError.domain); \ + XCTAssertEqual(error.code, expectedError.code); \ + XCTAssertNotEqual( \ + [error.localizedDescription rangeOfString:expectedError.localizedDescription].location, \ + NSNotFound) + +#define AssertEqualCategoryArrays(categories, expectedCategories) \ + XCTAssertEqual(categories.count, expectedCategories.count); \ + for (int i = 0; i < categories.count; i++) { \ + XCTAssertEqual(categories[i].index, expectedCategories[i].index, @"categories index i = %d", i); \ + XCTAssertEqualWithAccuracy(categories[i].score, expectedCategories[i].score, 1e-3, \ + @"categories index i = %d", i); \ + XCTAssertEqualObjects(categories[i].categoryName, expectedCategories[i].categoryName, \ + @"categories index i = %d", i); \ + XCTAssertEqualObjects(categories[i].displayName, expectedCategories[i].displayName, \ + @"categories index i = %d", i); \ + } + +#define AssertApproximatelyEqualBoundingBoxes(boundingBox, expectedBoundingBox, idx) \ + XCTAssertEqualWithAccuracy(boundingBox.origin.x, expectedBoundingBox.origin.x, PixelDifferenceTolerance, @"index i = %d", idx); \ + XCTAssertEqualWithAccuracy(boundingBox.origin.y, expectedBoundingBox.origin.y, PixelDifferenceTolerance, @"index i = %d", idx); \ + XCTAssertEqualWithAccuracy(boundingBox.size.width, expectedBoundingBox.size.width, PixelDifferenceTolerance, @"index i = %d", idx); \ + XCTAssertEqualWithAccuracy(boundingBox.size.height, expectedBoundingBox.size.height, PixelDifferenceTolerance, @"index i = %d", idx); + +#define AssertEqualDetections(detection, expectedDetection, idx) \ + XCTAssertNotNil(detection); \ + XCTAssertNil(detection.keypoints, @"index i = %d", idx) \ + AssertEqualCategoryArrays(detection.categories, expectedDetection.categories) \ + AssertApproximatelyEqualBoundingBoxes(detection.boundingBox, expectedDetection.boundingBox, idx); + +#define AssertEqualDetectionArrays(detections, expectedDetections) \ + XCTAssertEqual(detections.count, expectedDetections.count); \ + for (int i = 0; i < detections.count; i++) { \ + AssertEqualDetections(detections[i], expectedDetections[i], i) \ + } + +#define AssertEqualObjectDetectionResults(objectDetectionResult, expectedObjectDetectionResult) \ + XCTAssertNotNil(objectDetectionResult); + // AssertEqualDetectionArrays(objectDetectionResult.detections, expectedObjectDetectionResult.detections) \ + // XCTAssertEqual(objectDetectionResult.timestampMs, expectedObjectDetectionResult.timestampMs) + +@interface MPPObjectDetectorTests : XCTestCase +@end + +@implementation MPPObjectDetectorTests + +#pragma mark Results + ++ (MPPObjectDetectionResult*)expectedDetectionResultForCatsAndDogsImageWithTimestampMs:(NSInteger)timestampMs { + + NSArray * detections = @[ + [[MPPDetection alloc] initWithCategories:@[ + [[MPPCategory alloc] initWithIndex:-1 + score:0.69921875f + categoryName:@"cat" + displayName:nil], + ] boundingBox:CGRectMake(608, 161, 381, 439) keypoints:nil], + [[MPPDetection alloc] initWithCategories:@[ + [[MPPCategory alloc] initWithIndex:-1 + score:0.64453125f + categoryName:@"cat" + displayName:nil], + ] boundingBox:CGRectMake(60, 398, 386, 196) keypoints:nil], + [[MPPDetection alloc] initWithCategories:@[ + [[MPPCategory alloc] initWithIndex:-1 + score:0.51171875f + categoryName:@"cat" + displayName:nil], + ] boundingBox:CGRectMake(256, 395, 173, 202) keypoints:nil], + [[MPPDetection alloc] initWithCategories:@[ + [[MPPCategory alloc] initWithIndex:-1 + score:0.48828125f + categoryName:@"cat" + displayName:nil], + ] boundingBox:CGRectMake(362, 191, 325, 419) keypoints:nil], + ]; + + MPPObjectDetectionResult *objectDetectionResult = [[MPPObjectDetectionResult alloc] initWithDetections:detections timestampMs:timestampMs]; + +} + +#pragma mark File + +- (NSString *)filePathWithName:(NSString *)fileName extension:(NSString *)extension { + NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:fileName + ofType:extension]; + return filePath; +} + +#pragma mark Object Detector Initializers + +- (MPPObjectDetectorOptions *)objectDetectorOptionsWithModelName:(NSString *)modelName { + NSString *modelPath = [self filePathWithName:modelName extension:@"tflite"]; + MPPObjectDetectorOptions *objectDetectorOptions = [[MPPObjectDetectorOptions alloc] init]; + objectDetectorOptions.baseOptions.modelAssetPath = modelPath; + + return objectDetectorOptions; +} + +- (MPPObjectDetector *)objectDetectorWithOptionsSucceeds: + (MPPObjectDetectorOptions *)objectDetectorOptions { + MPPObjectDetector *objectDetector = + [[MPPObjectDetector alloc] initWithOptions:objectDetectorOptions error:nil]; + XCTAssertNotNil(objectDetector); + + return objectDetector; +} + +#pragma mark Assert Detection Results + +- (MPPImage *)imageWithFileInfo:(NSDictionary *)fileInfo { + MPPImage *image = [MPPImage imageFromBundleWithClass:[MPPObjectDetectorTests class] + fileName:fileInfo[@"name"] + ofType:fileInfo[@"type"]]; + XCTAssertNotNil(image); + + return image; +} + +- (MPPImage *)imageWithFileInfo:(NSDictionary *)fileInfo + orientation:(UIImageOrientation)orientation { + MPPImage *image = [MPPImage imageFromBundleWithClass:[MPPObjectDetectorTests class] + fileName:fileInfo[@"name"] + ofType:fileInfo[@"type"] + orientation:orientation]; + XCTAssertNotNil(image); + + return image; +} + +- (void)assertResultsOfDetectInImage:(MPPImage *)mppImage + usingObjectDetector:(MPPObjectDetector *)objectDetector + equalsObjectDetectionResult:(MPPObjectDetectionResult *)expectedObjectDetectionResult { + MPPObjectDetectionResult *objectDetectionResult = [objectDetector detectInImage:mppImage + error:nil]; + + AssertEqualObjectDetectionResults(objectDetectionResult, [MPPObjectDetectorTests expectedDetectionResultForCatsAndDogsImageWithTimestampMs:0]); +} + +- (void)assertResultsOfDetectInImageWithFileInfo:(NSDictionary *)fileInfo + usingObjectDetector:(MPPObjectDetector *)objectDetector + equalsObjectDetectionResult:(MPPObjectDetectionResult *)expectedObjectDetectionResult { + MPPImage *mppImage = [self imageWithFileInfo:fileInfo]; + + [self assertResultsOfDetectInImage:mppImage + usingObjectDetector:objectDetector + equalsObjectDetectionResult:expectedObjectDetectionResult]; +} + +#pragma mark General Tests + +- (void)testDetectWithOptionsSucceeds { + MPPObjectDetectorOptions *options = [self objectDetectorOptionsWithModelName:kModelName]; + + const NSInteger maxResults = 4; + options.maxResults = maxResults; + + MPPObjectDetector *objectDetector = [self objectDetectorWithOptionsSucceeds:options]; + + [self + assertResultsOfDetectInImageWithFileInfo:kCatsAndDogsImage + usingObjectDetector:objectDetector + equalsObjectDetectionResult: + [MPPObjectDetectorTests + expectedDetectionResultForCatsAndDogsImageWithTimestampMs:0]]; +} + +@end diff --git a/mediapipe/tasks/ios/vision/object_detector/BUILD b/mediapipe/tasks/ios/vision/object_detector/BUILD index a22a22e2e..aa4cf8aeb 100644 --- a/mediapipe/tasks/ios/vision/object_detector/BUILD +++ b/mediapipe/tasks/ios/vision/object_detector/BUILD @@ -39,7 +39,7 @@ objc_library( objc_library( name = "MPPObjectDetector", - srcs = ["sources/MPPObjectDetector.m"], + srcs = ["sources/MPPObjectDetector.mm"], hdrs = ["sources/MPPObjectDetector.h"], copts = [ "-ObjC++",