Skip to content

Let the app check "aatp/data" subdir for AWS. #5208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Let the app check "aatp/data" subdir for AWS. #5208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions extension/apple/Benchmark/Benchmark.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
03B2D3682C8A515A0046936E /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B2D3672C8A515A0046936E /* App.swift */; };
03B2D37A2C8A515C0046936E /* Tests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 03B2D3792C8A515C0046936E /* Tests.mm */; };
03C7FA382C8AA3EC00E6E9AE /* Models in Resources */ = {isa = PBXBuildFile; fileRef = 03C7FA322C8AA24200E6E9AE /* Models */; };
03ED6CFF2C8AAFB300F2D6EE /* backend_coreml.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6CFE2C8AAFB300F2D6EE /* backend_coreml.xcframework */; };
03ED6D012C8AAFB300F2D6EE /* backend_mps.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D002C8AAFB300F2D6EE /* backend_mps.xcframework */; };
03ED6D032C8AAFB300F2D6EE /* backend_xnnpack.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D022C8AAFB300F2D6EE /* backend_xnnpack.xcframework */; };
03ED6D052C8AAFB300F2D6EE /* executorch.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D042C8AAFB300F2D6EE /* executorch.xcframework */; };
03ED6D072C8AAFB300F2D6EE /* kernels_custom.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D062C8AAFB300F2D6EE /* kernels_custom.xcframework */; };
03ED6D092C8AAFB300F2D6EE /* kernels_optimized.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D082C8AAFB300F2D6EE /* kernels_optimized.xcframework */; };
03ED6D0B2C8AAFB300F2D6EE /* kernels_portable.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D0A2C8AAFB300F2D6EE /* kernels_portable.xcframework */; };
03ED6D0D2C8AAFB300F2D6EE /* kernels_quantized.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D0C2C8AAFB300F2D6EE /* kernels_quantized.xcframework */; };
03DD00A92C8FE44600FE4619 /* backend_coreml.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DD00992C8FE44600FE4619 /* backend_coreml.xcframework */; };
03DD00AA2C8FE44600FE4619 /* kernels_custom.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DD009A2C8FE44600FE4619 /* kernels_custom.xcframework */; };
03DD00AF2C8FE44600FE4619 /* kernels_portable.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DD009F2C8FE44600FE4619 /* kernels_portable.xcframework */; };
03DD00B02C8FE44600FE4619 /* kernels_optimized.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DD00A02C8FE44600FE4619 /* kernels_optimized.xcframework */; };
03DD00B12C8FE44600FE4619 /* backend_xnnpack.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DD00A12C8FE44600FE4619 /* backend_xnnpack.xcframework */; };
03DD00B22C8FE44600FE4619 /* backend_mps.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DD00A22C8FE44600FE4619 /* backend_mps.xcframework */; };
03DD00B32C8FE44600FE4619 /* executorch.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DD00A32C8FE44600FE4619 /* executorch.xcframework */; settings = {ATTRIBUTES = (Required, ); }; };
03DD00B52C8FE44600FE4619 /* kernels_quantized.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DD00A52C8FE44600FE4619 /* kernels_quantized.xcframework */; };
03ED6D0F2C8AAFE900F2D6EE /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D0E2C8AAFE900F2D6EE /* libsqlite3.0.tbd */; };
03ED6D112C8AAFF200F2D6EE /* MetalPerformanceShadersGraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D102C8AAFF200F2D6EE /* MetalPerformanceShadersGraph.framework */; };
03ED6D132C8AAFF700F2D6EE /* MetalPerformanceShaders.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03ED6D122C8AAFF700F2D6EE /* MetalPerformanceShaders.framework */; };
Expand Down Expand Up @@ -45,14 +45,14 @@
03B2D3752C8A515C0046936E /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
03B2D3792C8A515C0046936E /* Tests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Tests.mm; sourceTree = "<group>"; };
03C7FA322C8AA24200E6E9AE /* Models */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Models; sourceTree = SOURCE_ROOT; };
03ED6CFE2C8AAFB300F2D6EE /* backend_coreml.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = backend_coreml.xcframework; path = Frameworks/backend_coreml.xcframework; sourceTree = "<group>"; };
03ED6D002C8AAFB300F2D6EE /* backend_mps.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = backend_mps.xcframework; path = Frameworks/backend_mps.xcframework; sourceTree = "<group>"; };
03ED6D022C8AAFB300F2D6EE /* backend_xnnpack.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = backend_xnnpack.xcframework; path = Frameworks/backend_xnnpack.xcframework; sourceTree = "<group>"; };
03ED6D042C8AAFB300F2D6EE /* executorch.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = executorch.xcframework; path = Frameworks/executorch.xcframework; sourceTree = "<group>"; };
03ED6D062C8AAFB300F2D6EE /* kernels_custom.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = kernels_custom.xcframework; path = Frameworks/kernels_custom.xcframework; sourceTree = "<group>"; };
03ED6D082C8AAFB300F2D6EE /* kernels_optimized.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = kernels_optimized.xcframework; path = Frameworks/kernels_optimized.xcframework; sourceTree = "<group>"; };
03ED6D0A2C8AAFB300F2D6EE /* kernels_portable.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = kernels_portable.xcframework; path = Frameworks/kernels_portable.xcframework; sourceTree = "<group>"; };
03ED6D0C2C8AAFB300F2D6EE /* kernels_quantized.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = kernels_quantized.xcframework; path = Frameworks/kernels_quantized.xcframework; sourceTree = "<group>"; };
03DD00992C8FE44600FE4619 /* backend_coreml.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = backend_coreml.xcframework; path = Frameworks/backend_coreml.xcframework; sourceTree = "<group>"; };
03DD009A2C8FE44600FE4619 /* kernels_custom.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = kernels_custom.xcframework; path = Frameworks/kernels_custom.xcframework; sourceTree = "<group>"; };
03DD009F2C8FE44600FE4619 /* kernels_portable.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = kernels_portable.xcframework; path = Frameworks/kernels_portable.xcframework; sourceTree = "<group>"; };
03DD00A02C8FE44600FE4619 /* kernels_optimized.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = kernels_optimized.xcframework; path = Frameworks/kernels_optimized.xcframework; sourceTree = "<group>"; };
03DD00A12C8FE44600FE4619 /* backend_xnnpack.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = backend_xnnpack.xcframework; path = Frameworks/backend_xnnpack.xcframework; sourceTree = "<group>"; };
03DD00A22C8FE44600FE4619 /* backend_mps.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = backend_mps.xcframework; path = Frameworks/backend_mps.xcframework; sourceTree = "<group>"; };
03DD00A32C8FE44600FE4619 /* executorch.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = executorch.xcframework; path = Frameworks/executorch.xcframework; sourceTree = "<group>"; };
03DD00A52C8FE44600FE4619 /* kernels_quantized.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = kernels_quantized.xcframework; path = Frameworks/kernels_quantized.xcframework; sourceTree = "<group>"; };
03ED6D0E2C8AAFE900F2D6EE /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS17.5.sdk/usr/lib/libsqlite3.0.tbd; sourceTree = DEVELOPER_DIR; };
03ED6D102C8AAFF200F2D6EE /* MetalPerformanceShadersGraph.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalPerformanceShadersGraph.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS17.5.sdk/System/Library/Frameworks/MetalPerformanceShadersGraph.framework; sourceTree = DEVELOPER_DIR; };
03ED6D122C8AAFF700F2D6EE /* MetalPerformanceShaders.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalPerformanceShaders.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS17.5.sdk/System/Library/Frameworks/MetalPerformanceShaders.framework; sourceTree = DEVELOPER_DIR; };
Expand All @@ -79,14 +79,14 @@
03ED6D132C8AAFF700F2D6EE /* MetalPerformanceShaders.framework in Frameworks */,
03ED6D112C8AAFF200F2D6EE /* MetalPerformanceShadersGraph.framework in Frameworks */,
03ED6D0F2C8AAFE900F2D6EE /* libsqlite3.0.tbd in Frameworks */,
03ED6CFF2C8AAFB300F2D6EE /* backend_coreml.xcframework in Frameworks */,
03ED6D032C8AAFB300F2D6EE /* backend_xnnpack.xcframework in Frameworks */,
03ED6D092C8AAFB300F2D6EE /* kernels_optimized.xcframework in Frameworks */,
03ED6D012C8AAFB300F2D6EE /* backend_mps.xcframework in Frameworks */,
03ED6D0D2C8AAFB300F2D6EE /* kernels_quantized.xcframework in Frameworks */,
03ED6D0B2C8AAFB300F2D6EE /* kernels_portable.xcframework in Frameworks */,
03ED6D052C8AAFB300F2D6EE /* executorch.xcframework in Frameworks */,
03ED6D072C8AAFB300F2D6EE /* kernels_custom.xcframework in Frameworks */,
03DD00A92C8FE44600FE4619 /* backend_coreml.xcframework in Frameworks */,
03DD00B22C8FE44600FE4619 /* backend_mps.xcframework in Frameworks */,
03DD00B12C8FE44600FE4619 /* backend_xnnpack.xcframework in Frameworks */,
03DD00B32C8FE44600FE4619 /* executorch.xcframework in Frameworks */,
03DD00AA2C8FE44600FE4619 /* kernels_custom.xcframework in Frameworks */,
03DD00B02C8FE44600FE4619 /* kernels_optimized.xcframework in Frameworks */,
03DD00AF2C8FE44600FE4619 /* kernels_portable.xcframework in Frameworks */,
03DD00B52C8FE44600FE4619 /* kernels_quantized.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -141,14 +141,14 @@
03ED6D122C8AAFF700F2D6EE /* MetalPerformanceShaders.framework */,
03ED6D102C8AAFF200F2D6EE /* MetalPerformanceShadersGraph.framework */,
03ED6D0E2C8AAFE900F2D6EE /* libsqlite3.0.tbd */,
03ED6CFE2C8AAFB300F2D6EE /* backend_coreml.xcframework */,
03ED6D002C8AAFB300F2D6EE /* backend_mps.xcframework */,
03ED6D022C8AAFB300F2D6EE /* backend_xnnpack.xcframework */,
03ED6D042C8AAFB300F2D6EE /* executorch.xcframework */,
03ED6D062C8AAFB300F2D6EE /* kernels_custom.xcframework */,
03ED6D082C8AAFB300F2D6EE /* kernels_optimized.xcframework */,
03ED6D0A2C8AAFB300F2D6EE /* kernels_portable.xcframework */,
03ED6D0C2C8AAFB300F2D6EE /* kernels_quantized.xcframework */,
03DD00992C8FE44600FE4619 /* backend_coreml.xcframework */,
03DD00A22C8FE44600FE4619 /* backend_mps.xcframework */,
03DD00A12C8FE44600FE4619 /* backend_xnnpack.xcframework */,
03DD00A32C8FE44600FE4619 /* executorch.xcframework */,
03DD009A2C8FE44600FE4619 /* kernels_custom.xcframework */,
03DD00A02C8FE44600FE4619 /* kernels_optimized.xcframework */,
03DD009F2C8FE44600FE4619 /* kernels_portable.xcframework */,
03DD00A52C8FE44600FE4619 /* kernels_quantized.xcframework */,
);
name = Frameworks;
sourceTree = SOURCE_ROOT;
Expand Down
173 changes: 98 additions & 75 deletions extension/apple/Benchmark/Tests/Tests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,82 +22,105 @@ @interface Tests : XCTestCase
@implementation Tests

+ (void)initialize {
if (self == [Tests class]) {
NSString *modelsDir = [[NSBundle bundleForClass:[self class]].resourcePath
stringByAppendingPathComponent:@"Models"];
NSArray *models =
[NSFileManager.defaultManager contentsOfDirectoryAtPath:modelsDir
error:nil];
for (NSString *model in models) {
NSString *modelName = model.stringByDeletingPathExtension;
NSString *modelPath = [modelsDir stringByAppendingPathComponent:model];
XCTAssertGreaterThan(modelPath.length, 0);

SEL testLoadSelector = NSSelectorFromString(
[NSString stringWithFormat:@"test_load_%@", modelName]);
IMP testLoadImplementation = imp_implementationWithBlock(^(id _self) {
auto __block module = std::make_unique<Module>(modelPath.UTF8String);
[_self
measureWithMetrics:@[ [XCTClockMetric new], [XCTMemoryMetric new] ]
options:XCTMeasureOptions.defaultOptions
block:^{
XCTAssertEqual(module->load_method("forward"),
Error::Ok);
}];
});
class_addMethod(
[self class], testLoadSelector, testLoadImplementation, "v@:");

SEL testForwardSelector = NSSelectorFromString(
[NSString stringWithFormat:@"test_forward_%@", modelName]);
IMP testForwardImplementation = imp_implementationWithBlock(^(id _self) {
auto __block module = std::make_unique<Module>(modelPath.UTF8String);
XCTAssertEqual(module->load_method("forward"), Error::Ok);

const auto method_meta = module->method_meta("forward");
XCTAssertEqual(method_meta.error(), Error::Ok);

const auto num_inputs = method_meta->num_inputs();
XCTAssertGreaterThan(num_inputs, 0);

std::vector<std::vector<uint8_t>> buffers;
buffers.reserve(num_inputs);
std::vector<TensorPtr> tensors;
tensors.reserve(num_inputs);
std::vector<EValue> __block inputs;
inputs.reserve(num_inputs);

for (auto index = 0; index < num_inputs; ++index) {
auto input_tag = method_meta->input_tag(index);
XCTAssertEqual(input_tag.error(), Error::Ok);

switch (*input_tag) {
case Tag::Tensor: {
const auto tensor_meta = method_meta->input_tensor_meta(index);
XCTAssertEqual(tensor_meta.error(), Error::Ok);

const auto sizes = tensor_meta->sizes();
buffers.emplace_back(tensor_meta->nbytes(),
0b01010101); // Set all bytes to be non-zero.
tensors.emplace_back(from_blob(buffers.rbegin()->data(),
{sizes.begin(), sizes.end()},
tensor_meta->scalar_type()));
inputs.emplace_back(tensors.back());
} break;
default:
XCTFail("Unsupported tag %i at input %d", *input_tag, index);
}
if (self != [self class]) {
return;
}
for (NSBundle *bundle in @[
[NSBundle mainBundle],
[NSBundle bundleForClass:[self class]],
]) {
for (NSString *directory in @[
@"Models",
@"aatp/data",
]) {
NSString *directoryPath =
[bundle.resourcePath stringByAppendingPathComponent:directory];
NSArray *filePaths =
[NSFileManager.defaultManager contentsOfDirectoryAtPath:directoryPath
error:nil];
for (NSString *filePath in filePaths) {
if (![filePath hasSuffix:@".pte"]) {
continue;
}
[_self
measureWithMetrics:@[ [XCTClockMetric new], [XCTMemoryMetric new] ]
options:XCTMeasureOptions.defaultOptions
block:^{
XCTAssertEqual(module->forward(inputs).error(),
Error::Ok);
}];
});
class_addMethod(
[self class], testForwardSelector, testForwardImplementation, "v@:");
NSString *modelPath =
[directoryPath stringByAppendingPathComponent:filePath];
NSString *directoryName =
[directory stringByReplacingOccurrencesOfString:@"/"
withString:@"_"]
.lowercaseString;
NSString *modelName =
modelPath.lastPathComponent.stringByDeletingPathExtension;

SEL testLoadSelector = NSSelectorFromString([NSString
stringWithFormat:@"test_load_%@_%@", directoryName, modelName]);
IMP testLoadImplementation = imp_implementationWithBlock(^(id _self) {
auto __block module = std::make_unique<Module>(modelPath.UTF8String);
[_self measureWithMetrics:@[
[XCTClockMetric new],
[XCTMemoryMetric new],
]
options:XCTMeasureOptions.defaultOptions
block:^{
XCTAssertEqual(module->load_method("forward"),
Error::Ok);
}];
});
class_addMethod(
[self class], testLoadSelector, testLoadImplementation, "v@:");

SEL testForwardSelector = NSSelectorFromString([NSString
stringWithFormat:@"test_forward_%@_%@", directoryName, modelName]);
IMP testForwardImplementation = imp_implementationWithBlock(^(
id _self) {
auto __block module = std::make_unique<Module>(modelPath.UTF8String);
XCTAssertEqual(module->load_method("forward"), Error::Ok);

const auto method_meta = module->method_meta("forward");
XCTAssertEqual(method_meta.error(), Error::Ok);

const auto num_inputs = method_meta->num_inputs();
XCTAssertGreaterThan(num_inputs, 0);

std::vector<TensorPtr> __block tensors;
tensors.reserve(num_inputs);
std::vector<EValue> __block inputs;
inputs.reserve(num_inputs);

for (auto index = 0; index < num_inputs; ++index) {
const auto input_tag = method_meta->input_tag(index);
XCTAssertEqual(input_tag.error(), Error::Ok);

switch (*input_tag) {
case Tag::Tensor: {
const auto tensor_meta = method_meta->input_tensor_meta(index);
XCTAssertEqual(tensor_meta.error(), Error::Ok);

const auto sizes = tensor_meta->sizes();
tensors.emplace_back(make_tensor_ptr(
tensor_meta->scalar_type(),
{sizes.begin(), sizes.end()},
std::vector<uint8_t>(tensor_meta->nbytes(), 0b01010101)));
inputs.emplace_back(tensors.back());
} break;
default:
XCTFail("Unsupported tag %i at input %d", *input_tag, index);
}
}
[_self measureWithMetrics:@[
[XCTClockMetric new],
[XCTMemoryMetric new],
]
options:XCTMeasureOptions.defaultOptions
block:^{
XCTAssertEqual(module->forward(inputs).error(),
Error::Ok);
}];
});
class_addMethod([self class],
testForwardSelector,
testForwardImplementation,
"v@:");
}
}
}
}
Expand Down
Loading