Style: middle ptr and ref align, omit optional struct keyword

Author: wine99

ggml/include/ggml-openvino.h

@@ -1,17 +1,17 @@
 #pragma once
 
-#include "ggml.h"
 #include "ggml-backend.h"
+#include "ggml.h"
 
-#include <cstring>
 #include <array>
+#include <cstring>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define GGML_OPENVINO_NAME "OPENVINO"
-#define GGML_OPENVINO_MAX_DEVICES       16
+#define GGML_OPENVINO_NAME        "OPENVINO"
+#define GGML_OPENVINO_MAX_DEVICES 16
 
 // backend API
 GGML_BACKEND_API ggml_backend_t ggml_backend_openvino_init(int device);
@@ -28,7 +28,7 @@ GGML_BACKEND_API ggml_backend_buffer_type_t ggml_backend_openvino_split_buffer_t
 // and GPU
 GGML_BACKEND_API ggml_backend_buffer_type_t ggml_backend_openvino_host_buffer_type(void);
 
-GGML_BACKEND_API int  ggml_backend_openvino_get_device_count(void);
+GGML_BACKEND_API int ggml_backend_openvino_get_device_count(void);
 // GGML_BACKEND_API void ggml_backend_openvino_get_device_description(int device, char * description,
 //                                                                    size_t description_size);
 // GGML_BACKEND_API void ggml_backend_openvino_get_device_memory(int device, size_t * free, size_t * total);
@@ -42,13 +42,13 @@ struct ggml_openvino_device_info {
     int device_count;
 
     struct openvino_device_info {
-        int     cc;                 // compute capability
-        int     nsm;                // number of streaming multiprocessors
-        size_t  smpb;               // max. shared memory per block
-        size_t  smpbo;              // max. shared memory per block (with opt-in)
-        bool    vmm;                // virtual memory support
-        size_t  vmm_granularity;    // granularity of virtual memory
-        size_t  total_vram;
+        int    cc;               // compute capability
+        int    nsm;              // number of streaming multiprocessors
+        size_t smpb;             // max. shared memory per block
+        size_t smpbo;            // max. shared memory per block (with opt-in)
+        bool   vmm;              // virtual memory support
+        size_t vmm_granularity;  // granularity of virtual memory
+        size_t total_vram;
     };
 
     openvino_device_info devices[GGML_OPENVINO_MAX_DEVICES] = {};

ggml/src/ggml-openvino/.clang-format

@@ -2,12 +2,10 @@
 # Override root .clang-format
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
-ReferenceAlignment: Left
-PointerAlignment: Left
 Cpp11BracedListStyle: true
-AccessModifierOffset: -4
-BinPackArguments: false
+SpacesInContainerLiterals: false
 BreakBeforeBraces: Attach
+AccessModifierOffset: -4
 IndentCaseBlocks: false
 IndentCaseLabels: false
 
@@ -32,7 +30,15 @@ AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: Inline
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakBeforeMultilineStrings: true
-BinPackParameters: true
+# Treat CUDA keywords/attributes as "attribute macros" and avoid breaking lines inside them
+AttributeMacros:
+  - __host__
+  - __device__
+  - __global__
+  - __forceinline__
+  - __launch_bounds__
+BinPackArguments: true
+BinPackParameters: false # OnePerLine
 BitFieldColonSpacing: Both
 # BreakAdjacentStringLiterals: true
 BreakAfterAttributes: Never
@@ -58,15 +64,18 @@ ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^<.*\.h>'
+  - Regex:           '".*"'
     Priority:        1
     SortPriority:    0
-  - Regex:           '^<.*'
+  - Regex:           '^<.*\.h>'
     Priority:        2
     SortPriority:    0
-  - Regex:           '.*'
+  - Regex:           '^<.*'
     Priority:        3
     SortPriority:    0
+  - Regex:           '.*'
+    Priority:        4
+    SortPriority:    0
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IncludeIsMainSourceRegex: ''
 IndentAccessModifiers: false
@@ -100,6 +109,7 @@ PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Middle
 QualifierAlignment: Left
 #QualifierOrder: ['static', 'inline', 'friend', 'constexpr', 'const', 'volatile', 'type', 'restrict']
 RawStringFormats:
@@ -113,6 +123,7 @@ RawStringFormats:
       - 'c++'
       - 'C++'
     CanonicalDelimiter: ''
+ReferenceAlignment: Middle
 ReflowComments:  false # IndentOnly
 SeparateDefinitionBlocks: Always
 SortIncludes:    CaseInsensitive