From 7c8115558ab85186f4b4517d4172315975d80ab4 Mon Sep 17 00:00:00 2001 From: Mergen Nachin Date: Mon, 15 Apr 2024 10:07:44 -0700 Subject: [PATCH] Fix lint in clang-format (#3041) Summary: Pull Request resolved: https://github.com/pytorch/executorch/pull/3041 We are updating to clang-formatter 18. The current clang-format in coreml code has duplicate key. Deleting one of them. See context D56139356 bypass-github-export-checks bypass-github-pytorch-ci-checks bypass-github-executorch-ci-checks Reviewed By: cccclai Differential Revision: D56139927 fbshipit-source-id: 937f58092abd6f695304ee2a5dd38bc4b8412ec0 --- backends/apple/coreml/.clang-format | 1 - .../coreml/runtime/delegate/ETCoreMLDefaultModelExecutor.h | 3 ++- backends/apple/coreml/runtime/delegate/ETCoreMLModelCompiler.h | 3 ++- backends/apple/coreml/runtime/delegate/ETCoreMLModelLoader.h | 3 ++- backends/apple/coreml/runtime/delegate/ETCoreMLModelManager.h | 3 ++- backends/apple/coreml/runtime/kvstore/key_value_store.cpp | 3 +-- backends/apple/coreml/runtime/sdk/ETCoreMLModelDebugger.h | 3 ++- backends/apple/coreml/runtime/sdk/ETCoreMLModelProfiler.h | 3 ++- backends/apple/coreml/runtime/sdk/ETCoreMLModelStructurePath.h | 3 ++- .../apple/coreml/runtime/sdk/ETCoreMLOperationProfilingInfo.h | 3 ++- backends/apple/coreml/runtime/sdk/ETCoreMLPair.h | 3 ++- 11 files changed, 19 insertions(+), 12 deletions(-) diff --git a/backends/apple/coreml/.clang-format b/backends/apple/coreml/.clang-format index 0c8764539c..0b04022b0f 100644 --- a/backends/apple/coreml/.clang-format +++ b/backends/apple/coreml/.clang-format @@ -1,5 +1,4 @@ BasedOnStyle: WebKit -BreakBeforeBraces: Attach AllowShortIfStatementsOnASingleLine: false BreakBeforeBinaryOperators: None BreakConstructorInitializers: BeforeColon diff --git a/backends/apple/coreml/runtime/delegate/ETCoreMLDefaultModelExecutor.h b/backends/apple/coreml/runtime/delegate/ETCoreMLDefaultModelExecutor.h index eab239b496..c532f19907 100644 --- a/backends/apple/coreml/runtime/delegate/ETCoreMLDefaultModelExecutor.h +++ b/backends/apple/coreml/runtime/delegate/ETCoreMLDefaultModelExecutor.h @@ -13,7 +13,8 @@ NS_ASSUME_NONNULL_BEGIN /// The default model executor, the executor ignores logging options. -__attribute__((objc_subclassing_restricted)) @interface ETCoreMLDefaultModelExecutor : NSObject +__attribute__((objc_subclassing_restricted)) +@interface ETCoreMLDefaultModelExecutor : NSObject + (instancetype)new NS_UNAVAILABLE; diff --git a/backends/apple/coreml/runtime/delegate/ETCoreMLModelCompiler.h b/backends/apple/coreml/runtime/delegate/ETCoreMLModelCompiler.h index 3a3578e06a..f846ebbb96 100644 --- a/backends/apple/coreml/runtime/delegate/ETCoreMLModelCompiler.h +++ b/backends/apple/coreml/runtime/delegate/ETCoreMLModelCompiler.h @@ -9,7 +9,8 @@ NS_ASSUME_NONNULL_BEGIN /// A class responsible for compiling a CoreML model. -__attribute__((objc_subclassing_restricted)) @interface ETCoreMLModelCompiler : NSObject +__attribute__((objc_subclassing_restricted)) +@interface ETCoreMLModelCompiler : NSObject + (instancetype)new NS_UNAVAILABLE; diff --git a/backends/apple/coreml/runtime/delegate/ETCoreMLModelLoader.h b/backends/apple/coreml/runtime/delegate/ETCoreMLModelLoader.h index 3d2e100632..05e96ad59f 100644 --- a/backends/apple/coreml/runtime/delegate/ETCoreMLModelLoader.h +++ b/backends/apple/coreml/runtime/delegate/ETCoreMLModelLoader.h @@ -16,7 +16,8 @@ struct ModelMetadata; NS_ASSUME_NONNULL_BEGIN /// A class responsible for loading a CoreML model. -__attribute__((objc_subclassing_restricted)) @interface ETCoreMLModelLoader : NSObject +__attribute__((objc_subclassing_restricted)) +@interface ETCoreMLModelLoader : NSObject + (instancetype)new NS_UNAVAILABLE; diff --git a/backends/apple/coreml/runtime/delegate/ETCoreMLModelManager.h b/backends/apple/coreml/runtime/delegate/ETCoreMLModelManager.h index fb616c7152..278b317b4e 100644 --- a/backends/apple/coreml/runtime/delegate/ETCoreMLModelManager.h +++ b/backends/apple/coreml/runtime/delegate/ETCoreMLModelManager.h @@ -20,7 +20,8 @@ class ModelEventLogger; typedef void ModelHandle; /// A class responsible for managing the models loaded by the delegate. -__attribute__((objc_subclassing_restricted)) @interface ETCoreMLModelManager : NSObject +__attribute__((objc_subclassing_restricted)) +@interface ETCoreMLModelManager : NSObject + (instancetype)new NS_UNAVAILABLE; diff --git a/backends/apple/coreml/runtime/kvstore/key_value_store.cpp b/backends/apple/coreml/runtime/kvstore/key_value_store.cpp index 70be312b96..4a7a491236 100644 --- a/backends/apple/coreml/runtime/kvstore/key_value_store.cpp +++ b/backends/apple/coreml/runtime/kvstore/key_value_store.cpp @@ -53,8 +53,7 @@ get_create_store_statement(std::string_view store_name, StorageType key_storage_ std::string get_create_index_statement(std::string_view store_name, std::string_view column_name) { std::stringstream ss; - ss << "CREATE INDEX IF NOT EXISTS " << column_name << "_INDEX" - << " ON " << store_name << "(" << column_name << ")"; + ss << "CREATE INDEX IF NOT EXISTS " << column_name << "_INDEX" << " ON " << store_name << "(" << column_name << ")"; return ss.str(); } diff --git a/backends/apple/coreml/runtime/sdk/ETCoreMLModelDebugger.h b/backends/apple/coreml/runtime/sdk/ETCoreMLModelDebugger.h index 5ab90c0ea1..7221086318 100644 --- a/backends/apple/coreml/runtime/sdk/ETCoreMLModelDebugger.h +++ b/backends/apple/coreml/runtime/sdk/ETCoreMLModelDebugger.h @@ -15,7 +15,8 @@ typedef NSDictionary ETCoreMLModelOu NS_ASSUME_NONNULL_BEGIN /// A class responsible for debugging a model. -__attribute__((objc_subclassing_restricted)) @interface ETCoreMLModelDebugger : NSObject +__attribute__((objc_subclassing_restricted)) +@interface ETCoreMLModelDebugger : NSObject - (instancetype)init NS_UNAVAILABLE; diff --git a/backends/apple/coreml/runtime/sdk/ETCoreMLModelProfiler.h b/backends/apple/coreml/runtime/sdk/ETCoreMLModelProfiler.h index 0db5f24f2c..a2fbb98582 100644 --- a/backends/apple/coreml/runtime/sdk/ETCoreMLModelProfiler.h +++ b/backends/apple/coreml/runtime/sdk/ETCoreMLModelProfiler.h @@ -21,7 +21,8 @@ typedef NSDictionary +__attribute__((objc_subclassing_restricted)) +@interface ETCoreMLModelStructurePath : NSObject - (instancetype)init NS_UNAVAILABLE; diff --git a/backends/apple/coreml/runtime/sdk/ETCoreMLOperationProfilingInfo.h b/backends/apple/coreml/runtime/sdk/ETCoreMLOperationProfilingInfo.h index 3b2211d816..80c49f8965 100644 --- a/backends/apple/coreml/runtime/sdk/ETCoreMLOperationProfilingInfo.h +++ b/backends/apple/coreml/runtime/sdk/ETCoreMLOperationProfilingInfo.h @@ -12,7 +12,8 @@ NS_ASSUME_NONNULL_BEGIN /// A class representing the profiling info of an operation. -__attribute__((objc_subclassing_restricted)) @interface ETCoreMLOperationProfilingInfo : NSObject +__attribute__((objc_subclassing_restricted)) +@interface ETCoreMLOperationProfilingInfo : NSObject - (instancetype)init NS_UNAVAILABLE; diff --git a/backends/apple/coreml/runtime/sdk/ETCoreMLPair.h b/backends/apple/coreml/runtime/sdk/ETCoreMLPair.h index be4c832da8..8ddd4191cd 100644 --- a/backends/apple/coreml/runtime/sdk/ETCoreMLPair.h +++ b/backends/apple/coreml/runtime/sdk/ETCoreMLPair.h @@ -9,7 +9,8 @@ NS_ASSUME_NONNULL_BEGIN /// A class representing a pair with first and second objects. -__attribute__((objc_subclassing_restricted)) @interface ETCoreMLPair : NSObject +__attribute__((objc_subclassing_restricted)) +@interface ETCoreMLPair : NSObject - (instancetype)init NS_UNAVAILABLE;