Address comments

Author: cymbalrush

backends/apple/coreml/runtime/delegate/ETCoreMLAsset.mm

@@ -5,16 +5,15 @@
 //
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
-#import "ETCoreMLLogging.h"
 #import "ETCoreMLAsset.h"
 
+#import "ETCoreMLLogging.h"
+#import "objc_safe_cast.h"
+
 #import <fcntl.h>
 #import <os/lock.h>
 #import <stdio.h>
 #import <system_error>
-
-#import "objc_safe_cast.h"
-
 namespace  {
 using namespace executorchcoreml;
 

backends/apple/coreml/runtime/delegate/ETCoreMLAssetManager.mm

@@ -6,12 +6,14 @@
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 #import "ETCoreMLAssetManager.h"
+
 #import "ETCoreMLAsset.h"
 #import "ETCoreMLLogging.h"
 #import "database.hpp"
-#import <iostream>
 #import "json_key_value_store.hpp"
 #import "serde_json.h"
+
+#import <iostream>
 #import <sstream>
 
 namespace  {

backends/apple/coreml/runtime/delegate/ETCoreMLDefaultModelExecutor.h

@@ -1,9 +1,9 @@
 //
-//  ETCoreMLDefaultModelExecutor.h
-//  executorchcoreml_tests
+// ETCoreMLDefaultModelExecutor.h
 //
-//  Created by Gyan Sinha on 2/25/24.
+// Copyright © 2024 Apple Inc. All rights reserved.
 //
+// Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 #import <CoreML/CoreML.h>
 

backends/apple/coreml/runtime/delegate/ETCoreMLDefaultModelExecutor.mm

@@ -1,9 +1,9 @@
 //
-//  ETCoreMLDefaultModelExecutor.m
-//  executorchcoreml_tests
+//  ETCoreMLDefaultModelExecutor.mm
 //
-//  Created by Gyan Sinha on 2/25/24.
+// Copyright © 2024 Apple Inc. All rights reserved.
 //
+// Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 #import "ETCoreMLAsset.h"
 #import "ETCoreMLDefaultModelExecutor.h"

backends/apple/coreml/runtime/delegate/ETCoreMLLogging.h

@@ -6,9 +6,9 @@
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 #import <Foundation/Foundation.h>
+#import <os/log.h>
 
 #import <executorch/runtime/platform/log.h>
-#import <os/log.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -51,9 +51,9 @@ typedef NS_ERROR_ENUM(ETCoreMLErrorDomain, ETCoreMLError) {
 #define ETCoreMLLogError(error, formatString, ...)                                                                  \
     do {                                                                                                            \
         NSString *message =  error.localizedDescription;                                                            \
-        message = [NSString stringWithFormat:@"[Core ML] " formatString " %@", ##__VA_ARGS__, message];             \   
+        message = [NSString stringWithFormat:@"[Core ML] " formatString " %@", ##__VA_ARGS__, message];             \
         ET_LOG(Error, "%s", message.UTF8String);                                                                    \ 
-    } while(0)                                                                                                      \
+    } while(0)
 #else
 #define ETCoreMLLogError(error, formatString, ...)                                                                  \
     os_log_error(ETCoreMLErrorUtils.loggingChannel, formatString " %@", ##__VA_ARGS__, error.localizedDescription);
@@ -77,7 +77,7 @@ typedef NS_ERROR_ENUM(ETCoreMLErrorDomain, ETCoreMLError) {
         if (errorOut) {                                                                                       \
             *errorOut = localError;                                                                           \
         }                                                                                                     \
-    } while (0)
+    } while(0)
 
 /// Record the error and its underlying error with `os_log_error` and fills `*errorOut` with `NSError`.
 #define ETCoreMLLogUnderlyingErrorAndSetNSError(errorOut, errorCode, underlyingNSError, formatString, ...) \
@@ -88,7 +88,7 @@ typedef NS_ERROR_ENUM(ETCoreMLErrorDomain, ETCoreMLError) {
                                         underlyingError:underlyingNSError                                  \
                                                 format:@formatString, ##__VA_ARGS__];                      \
         }                                                                                                  \
-    } while(0)                                                                                             \ 
+    } while(0)
 
 
 #pragma clang diagnostic pop

backends/apple/coreml/runtime/delegate/ETCoreMLLogging.mm

@@ -6,6 +6,7 @@
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 #import "ETCoreMLLogging.h"
+
 #import "ETCoreMLStrings.h"
 
 const NSErrorDomain ETCoreMLErrorDomain = @"com.apple.executorchcoreml";

backends/apple/coreml/runtime/delegate/ETCoreMLModelCompiler.mm

@@ -5,8 +5,10 @@
 //
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
-#import <ETCoreMLModelCompiler.h>
-#import <ETCoreMLLogging.h>
+#import "ETCoreMLModelCompiler.h"
+
+#import "ETCoreMLLogging.h"
+
 #import <TargetConditionals.h>
 
 @implementation ETCoreMLModelCompiler

backends/apple/coreml/runtime/delegate/ETCoreMLModelLoader.mm

@@ -5,13 +5,14 @@
 //
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
+#import "ETCoreMLModelLoader.h"
+
+#import "asset.h"
 #import "ETCoreMLAsset.h"
 #import "ETCoreMLAssetManager.h"
 #import "ETCoreMLDefaultModelExecutor.h"
 #import "ETCoreMLLogging.h"
 #import "ETCoreMLModel.h"
-#import "ETCoreMLModelLoader.h"
-#import "asset.h"
 #import "model_metadata.h"
 
 using namespace executorchcoreml;

backends/apple/coreml/runtime/delegate/ETCoreMLModelManager.mm

@@ -5,29 +5,30 @@
 //
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
+#import "ETCoreMLModelManager.h"
+
 #import "ETCoreMLAsset.h"
-#include <Foundation/Foundation.h>
 #import "ETCoreMLAssetManager.h"
 #import "ETCoreMLDefaultModelExecutor.h"
 #import "ETCoreMLLogging.h"
 #import "ETCoreMLModel.h"
 #import "ETCoreMLModelCompiler.h"
 #import "ETCoreMLModelExecutor.h"
 #import "ETCoreMLModelLoader.h"
-#import "ETCoreMLModelManager.h"
 #import "ETCoreMLStrings.h"
 #import "MLModel_Prewarm.h"
 #import "MLMultiArray_Copy.h"
-#import <filesystem>
 #import "inmemory_filesystem_utils.hpp"
-#import <iostream>
-#import <memory>
 #import "model_metadata.h"
 #import "multiarray.h"
 #import "objc_array_util.h"
+#import "serde_json.h"
+
+#import <filesystem>
+#import <iostream>
+#import <memory>
 #import <optional>
 #import <os/lock.h>
-#import "serde_json.h"
 #import <string>
 #import <system_error>
 #import <vector>

backends/apple/coreml/runtime/delegate/MLModel_Prewarm.mm

@@ -6,6 +6,7 @@
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 #import "MLModel_Prewarm.h"
+
 #import <algorithm>
 
 @interface MLMultiArray (Prewarm)

backends/apple/coreml/runtime/delegate/MLMultiArray_Copy.mm

@@ -6,6 +6,7 @@
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 #import "MLMultiArray_Copy.h"
+
 #import "objc_array_util.h"
 #import "multiarray.h"
 

backends/apple/coreml/runtime/delegate/asset.mm

@@ -1,16 +1,16 @@
 //
-// ModelAsset.cpp
+// asset.cpp
 //
 // Copyright © 2024 Apple Inc. All rights reserved.
 //
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 
-#import <asset.h>
+#import "asset.h"
 
 #import <optional>
 
-#import <objc_safe_cast.h>
+#import "objc_safe_cast.h"
 
 namespace  {
 

backends/apple/coreml/runtime/delegate/backend_delegate.h

@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include <model_logging_options.h>
+#include "model_logging_options.h"
+
 #include <system_error>
 #include <unordered_map>
 #include <vector>

backends/apple/coreml/runtime/delegate/backend_delegate.mm

@@ -6,12 +6,13 @@
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 
-#import "ETCoreMLLogging.h"
+#import "backend_delegate.h"
+
 #import "ETCoreMLAssetManager.h"
+#import "ETCoreMLLogging.h"
 #import "ETCoreMLModel.h"
 #import "ETCoreMLModelManager.h"
 #import "ETCoreMLStrings.h"
-#import "backend_delegate.h"
 #import "model_event_logger.h"
 #import "multiarray.h"
 

backends/apple/coreml/runtime/delegate/coreml_backend_delegate.mm

@@ -5,22 +5,25 @@
 //
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
-#import <ETCoreMLLogging.h>
-#import <ETCoreMLModel.h>
-#import <ETCoreMLStrings.h>
-#import <backend_delegate.h>
-#import <coreml_backend/delegate.h>
+#import "coreml_backend/delegate.h"
+
+#import "backend_delegate.h"
+#import "ETCoreMLLogging.h"
+#import "ETCoreMLModel.h"
+#import "ETCoreMLStrings.h"
+#import "model_event_logger.h"
+#import "model_logging_options.h"
+#import "multiarray.h"
+#import "objc_safe_cast.h"
+
 #import <executorch/runtime/core/evalue.h>
 #import <executorch/runtime/platform/log.h>
 #import <executorch/runtime/kernel/kernel_includes.h>
+
+#include <array>
 #import <memory>
-#import <model_event_logger.h>
-#import <model_logging_options.h>
-#import <multiarray.h>
-#import <objc_safe_cast.h>
 #import <unordered_map>
 #import <vector>
-#include <array>
 
 #ifdef ET_EVENT_TRACER_ENABLED
 #import <model_event_logger_impl.h>

backends/apple/coreml/runtime/delegate/multiarray.mm

@@ -7,11 +7,13 @@
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 #import "multiarray.h"
+
+#import "objc_array_util.h"
+
 #import <Accelerate/Accelerate.h>
 #import <CoreML/CoreML.h>
 #import <functional>
 #import <numeric>
-#import "objc_array_util.h"
 #import <optional>
 #import <vector>
 

backends/apple/coreml/runtime/delegate/serde_json.mm

@@ -6,6 +6,7 @@
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 #import "serde_json.h"
+
 #import "asset.h"
 #import "objc_json_serde.h"
 #import "model_metadata.h"

backends/apple/coreml/runtime/sdk/ETCoreMLModelDebugger.mm

@@ -7,7 +7,6 @@
 
 #import "ETCoreMLModelDebugger.h"
 
-#import <CoreML/CoreML.h>
 #import "ETCoreMLAsset.h"
 #import "ETCoreMLAssetManager.h"
 #import "ETCoreMLLogging.h"
@@ -16,12 +15,14 @@
 #import "ETCoreMLModelStructurePath.h"
 #import "ETCoreMLPair.h"
 #import "ETCoreMLStrings.h"
-#import <format/MIL.pb.h>
-#import <format/Model.pb.h>
-#import <fstream>
-#import <iostream>
+#import "format/MIL.pb.h"
+#import "format/Model.pb.h"
 #import "model_package_info.h"
 #import "objc_json_serde.h"
+
+#import <CoreML/CoreML.h>
+#import <fstream>
+#import <iostream>
 #import <string>
 #import <unordered_map>
 

backends/apple/coreml/runtime/sdk/ETCoreMLModelProfiler.h

@@ -6,6 +6,7 @@
 // Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
 #import "ETCoreMLPair.h"
+
 #import <CoreML/CoreML.h>
 #import <TargetConditionals.h>
 

backends/apple/coreml/runtime/sdk/ETCoreMLModelProfiler.mm

@@ -14,9 +14,10 @@
 #import "ETCoreMLOperationProfilingInfo.h"
 #import "ETCoreMLPair.h"
 #import "ETCoreMLStrings.h"
+#import "program_path.h"
+
 #import <mach/mach_time.h>
 #import <math.h>
-#import "program_path.h"
 
 namespace  {
 using namespace executorchcoreml::modelstructure;

backends/apple/coreml/runtime/sdk/ETCoreMLOperationProfilingInfo.h

@@ -7,7 +7,7 @@
 
 #import <CoreML/CoreML.h>
 
-#import <ETCoreMLComputeUnits.h>
+#import "ETCoreMLComputeUnits.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

backends/apple/coreml/runtime/sdk/model_event_logger_impl.mm

@@ -9,11 +9,13 @@
 
 #import "ETCoreMLModelStructurePath.h"
 #import "ETCoreMLOperationProfilingInfo.h"
-#import <executorch/runtime/core/event_tracer.h>
 #import "objc_array_util.h"
+#import "MLMultiArray_Copy.h"
+
+#import <executorch/runtime/core/event_tracer.h>
+
 #import <mach/mach_time.h>
 #import <numeric>
-#import "MLMultiArray_Copy.h"
 
 namespace {