Move LLaMA tests to a subdir.

Summary: .

Reviewed By: kirklandsign

Differential Revision: D63914432

fbshipit-source-id: 41a28e6c4fcfb20919193098a11a9585dd73e68a

Author: shoumikhin

extension/apple/Benchmark/Frameworks/download_frameworks.sh

@@ -16,9 +16,11 @@ frameworks=(
   "kernels_quantized"
 )
 
+cd "$(dirname "$0")" || exit
+
 for framework in "${frameworks[@]}"; do
-  rm -f "${f}-latest.zip"
-  rm -rf "${f}.xcframework"
+  rm -f "${framework}-latest.zip"
+  rm -rf "${framework}.xcframework"
   curl -sSLO "https://ossci-ios.s3.amazonaws.com/executorch/${framework}-latest.zip" && \
   unzip -q "${framework}-latest.zip" && \
   rm "${framework}-latest.zip"

extension/apple/Benchmark/Tests/GenericTests.mm

@@ -35,62 +35,62 @@ @implementation GenericTests
 }
 
 + (NSDictionary<NSString *, BOOL (^)(NSString *)> *)predicates {
-  return @{@"model" : ^BOOL(NSString *filename){
+  return @{
+    @"model" : ^BOOL(NSString *filename){
       return [filename hasSuffix:@".pte"];
-}
-}
-;
+    },
+  };
 }
 
 + (NSDictionary<NSString *, void (^)(XCTestCase *)> *)dynamicTestsForResources:
     (NSDictionary<NSString *, NSString *> *)resources {
   NSString *modelPath = resources[@"model"];
-  return @{@"load" : ^(XCTestCase *testCase){
+  return @{
+    @"load" : ^(XCTestCase *testCase){
       [testCase
           measureWithMetrics:@[ [XCTClockMetric new], [XCTMemoryMetric new] ]
                        block:^{
                          XCTAssertEqual(
                              Module(modelPath.UTF8String).load_forward(),
                              Error::Ok);
                        }];
-}
-, @"forward" : ^(XCTestCase *testCase) {
-  auto __block module = std::make_unique<Module>(modelPath.UTF8String);
-
-  const auto method_meta = module->method_meta("forward");
-  ASSERT_OK_OR_RETURN(method_meta);
-
-  const auto num_inputs = method_meta->num_inputs();
-  XCTAssertGreaterThan(num_inputs, 0);
-
-  std::vector<TensorPtr> tensors;
-  tensors.reserve(num_inputs);
-
-  for (auto index = 0; index < num_inputs; ++index) {
-    const auto input_tag = method_meta->input_tag(index);
-    ASSERT_OK_OR_RETURN(input_tag);
-
-    switch (*input_tag) {
-    case Tag::Tensor: {
-      const auto tensor_meta = method_meta->input_tensor_meta(index);
-      ASSERT_OK_OR_RETURN(tensor_meta);
-
-      const auto sizes = tensor_meta->sizes();
-      tensors.emplace_back(
-          ones({sizes.begin(), sizes.end()}, tensor_meta->scalar_type()));
-      XCTAssertEqual(module->set_input(tensors.back(), index), Error::Ok);
-    } break;
-    default:
-      XCTFail("Unsupported tag %i at input %d", *input_tag, index);
-    }
-  }
-  [testCase measureWithMetrics:@[ [XCTClockMetric new], [XCTMemoryMetric new] ]
-                         block:^{
-                           XCTAssertEqual(module->forward().error(), Error::Ok);
-                         }];
-}
-}
-;
+    },
+    @"forward" : ^(XCTestCase *testCase) {
+      auto __block module = std::make_unique<Module>(modelPath.UTF8String);
+
+      const auto method_meta = module->method_meta("forward");
+      ASSERT_OK_OR_RETURN(method_meta);
+
+      const auto num_inputs = method_meta->num_inputs();
+      XCTAssertGreaterThan(num_inputs, 0);
+
+      std::vector<TensorPtr> tensors;
+      tensors.reserve(num_inputs);
+
+      for (auto index = 0; index < num_inputs; ++index) {
+        const auto input_tag = method_meta->input_tag(index);
+        ASSERT_OK_OR_RETURN(input_tag);
+
+        switch (*input_tag) {
+        case Tag::Tensor: {
+          const auto tensor_meta = method_meta->input_tensor_meta(index);
+          ASSERT_OK_OR_RETURN(tensor_meta);
+
+          const auto sizes = tensor_meta->sizes();
+          tensors.emplace_back(
+              ones({sizes.begin(), sizes.end()}, tensor_meta->scalar_type()));
+          XCTAssertEqual(module->set_input(tensors.back(), index), Error::Ok);
+        } break;
+        default:
+          XCTFail("Unsupported tag %i at input %d", *input_tag, index);
+        }
+      }
+      [testCase measureWithMetrics:@[ [XCTClockMetric new], [XCTMemoryMetric new] ]
+                            block:^{
+                              XCTAssertEqual(module->forward().error(), Error::Ok);
+                            }];
+    },
+  };
 }
 
 @end

extension/apple/Benchmark/Tests/LLaMATests.mm renamed to extension/apple/Benchmark/Tests/LLaMA/LLaMATests.mm

@@ -58,45 +58,45 @@ @implementation LLaMATests
 }
 
 + (NSDictionary<NSString *, BOOL (^)(NSString *)> *)predicates {
-  return @{@"model" : ^BOOL(NSString *filename){
+  return @{
+    @"model" : ^BOOL(NSString *filename){
       return [filename hasSuffix:@".pte"] && [filename containsString:@"llama"];
-}
-, @"tokenizer" : ^BOOL(NSString *filename) {
-  return [filename isEqual:@"tokenizer.model"];
-},
-}
-;
+    },
+    @"tokenizer" : ^BOOL(NSString *filename) {
+      return [filename isEqual:@"tokenizer.model"];
+    },
+  };
 }
 
 + (NSDictionary<NSString *, void (^)(XCTestCase *)> *)dynamicTestsForResources:
     (NSDictionary<NSString *, NSString *> *)resources {
   NSString *modelPath = resources[@"model"];
   NSString *tokenizerPath = resources[@"tokenizer"];
-  return @{@"generate" : ^(XCTestCase *testCase){
+  return @{
+    @"generate" : ^(XCTestCase *testCase){
       auto __block runner = std::make_unique<example::Runner>(
           modelPath.UTF8String, tokenizerPath.UTF8String);
-  const auto status = runner->load();
-  if (status != Error::Ok) {
-    XCTFail("Load failed with error %i", status);
-    return;
-  }
-  TokensPerSecondMetric *tokensPerSecondMetric = [TokensPerSecondMetric new];
-  [testCase measureWithMetrics:@[ tokensPerSecondMetric, [XCTMemoryMetric new] ]
-                         block:^{
-                           tokensPerSecondMetric.tokenCount = 0;
-                           const auto status = runner->generate(
-                               "Once upon a time",
-                               128,
-                               [=](const std::string &token) {
-                                 tokensPerSecondMetric.tokenCount++;
-                               },
-                               nullptr,
-                               false);
-                           XCTAssertEqual(status, Error::Ok);
-                         }];
-}
-}
-;
+      const auto status = runner->load();
+      if (status != Error::Ok) {
+        XCTFail("Load failed with error %i", status);
+        return;
+      }
+      TokensPerSecondMetric *tokensPerSecondMetric = [TokensPerSecondMetric new];
+      [testCase measureWithMetrics:@[ tokensPerSecondMetric, [XCTMemoryMetric new] ]
+                            block:^{
+                              tokensPerSecondMetric.tokenCount = 0;
+                              const auto status = runner->generate(
+                                  "Once upon a time",
+                                  128,
+                                  [=](const std::string &token) {
+                                    tokensPerSecondMetric.tokenCount++;
+                                  },
+                                  nullptr,
+                                  false);
+                              XCTAssertEqual(status, Error::Ok);
+                            }];
+    },
+  };
 }
 
 @end