format code style and setup restyled.io (#1840)

Author: nihui

.astylerc

@@ -0,0 +1,35 @@
+# astyle -n -r "benchmark/*.h,*.cpp" "src/*.h,*.cpp" "tests/*.h,*.cpp" "tools/*.h,*.cpp" "examples/*.h,*.cpp"
+
+# brace style
+--style=allman
+
+# tab
+--attach-namespaces
+--attach-extern-c
+--attach-closing-while
+
+# indentation
+--indent-preproc-define
+--indent-col1-comments
+--min-conditional-indent=0
+--max-continuation-indent=120
+
+# padding
+--pad-oper
+--pad-comma
+--pad-header
+--align-pointer=type
+--align-reference=type
+
+# formatting
+--break-closing-braces
+--attach-return-type
+--attach-return-type-decl
+--keep-one-line-blocks
+--keep-one-line-statements
+--convert-tabs
+--max-code-length=200
+--mode=c
+
+# other
+--lineend=linux

.clang-format

@@ -0,0 +1,132 @@
+# find src/ tools/ tests/ examples/ benchmark/ -type f -name '*.c' -o -name '*.cpp' -o -name '*.h' | xargs -i clang-format -i {}
+
+# need clang-format >= 10.0
+
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+# AlignConsecutiveBitFields: true
+AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: true
+AlignEscapedNewlines: Left
+# AlignOperands: AlignAfterOperator
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: true
+# AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: false
+  BeforeCatch: true
+  BeforeElse: true
+#  BeforeLambdaBody: false
+#  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: false
+BreakAfterJavaFieldAnnotations: true
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: false
+ColumnLimit: 0
+# CommentPragmas:
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: false
+DerivePointerAlignment: false
+# DisableFormat:
+# ExperimentalAutoDetectBinPacking:
+FixNamespaceComments: true
+# ForEachMacros:
+IncludeBlocks: Regroup
+# IncludeCategories:
+# IncludeIsMainRegex:
+# IncludeIsMainSourceRegex:
+# IndentCaseBlocks: false
+IndentCaseLabels: false
+# IndentExternBlock: NoIndent
+IndentGotoLabels: false
+IndentPPDirectives: None
+IndentWidth: 4
+# IndentWrappedFunctionNames: 4
+# InsertTrailingCommas: None
+# JavaImportGroups:
+# JavaScriptQuotes
+# JavaScriptWrapImports:
+KeepEmptyLinesAtTheStartOfBlocks: false
+Language: Cpp
+# MacroBlockBegin:
+# MacroBlockEnd:
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+# NamespaceMacros:
+# ObjCBinPackProtocolList:
+# ObjCBlockIndentWidth:
+# ObjCBreakBeforeNestedBlockParam:
+# ObjCSpaceAfterProperty:
+# ObjCSpaceBeforeProtocolList:
+# PenaltyBreakAssignment:
+# PenaltyBreakBeforeFirstCallParameter:
+# PenaltyBreakComment:
+# PenaltyBreakFirstLessLess:
+# PenaltyBreakString:
+# PenaltyBreakTemplateDeclaration:
+# PenaltyExcessCharacter:
+# PenaltyReturnTypeOnItsOwnLine:
+PointerAlignment: Left
+# RawStringFormats:
+ReflowComments: false
+SortIncludes: false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: c++03
+#StatementMacros:
+TabWidth: 4
+# TypenameMacros:
+UseCRLF: false
+UseTab: Never

.restyled.yaml

@@ -0,0 +1,16 @@
+# See https://github.com/restyled-io/restyled.io/wiki/Configuring-Restyled
+
+enabled: false
+
+pull_requests: true
+
+statuses:
+  differences: true
+  no_differences: true
+  error: true
+
+restylers:
+  - clang-format
+  - astyle
+  - clang-format
+  - astyle

benchmark/benchncnn.cpp

@@ -34,8 +34,14 @@
 class GlobalGpuInstance
 {
 public:
-    GlobalGpuInstance() { ncnn::create_gpu_instance(); }
-    ~GlobalGpuInstance() { ncnn::destroy_gpu_instance(); }
+    GlobalGpuInstance()
+    {
+        ncnn::create_gpu_instance();
+    }
+    ~GlobalGpuInstance()
+    {
+        ncnn::destroy_gpu_instance();
+    }
 };
 // initialize vulkan runtime before main()
 GlobalGpuInstance g_global_gpu_instance;
@@ -44,8 +50,15 @@ GlobalGpuInstance g_global_gpu_instance;
 class DataReaderFromEmpty : public ncnn::DataReader
 {
 public:
-    virtual int scan(const char* format, void* p) const { return 0; }
-    virtual size_t read(void* buf, size_t size) const { memset(buf, 0, size); return size; }
+    virtual int scan(const char* format, void* p) const
+    {
+        return 0;
+    }
+    virtual size_t read(void* buf, size_t size) const
+    {
+        memset(buf, 0, size);
+        return size;
+    }
 };
 
 static int g_warmup_loop_count = 8;
@@ -108,7 +121,7 @@ void benchmark(const char* comment, const ncnn::Mat& _in, const ncnn::Option& op
     ncnn::Mat out;
 
     // warm up
-    for (int i=0; i<g_warmup_loop_count; i++)
+    for (int i = 0; i < g_warmup_loop_count; i++)
     {
         ncnn::Extractor ex = net.create_extractor();
         ex.input("data", in);
@@ -119,7 +132,7 @@ void benchmark(const char* comment, const ncnn::Mat& _in, const ncnn::Option& op
     double time_max = -DBL_MAX;
     double time_avg = 0;
 
-    for (int i=0; i<g_loop_count; i++)
+    for (int i = 0; i < g_loop_count; i++)
     {
         double start = ncnn::get_current_time();
 
@@ -235,7 +248,7 @@ int main(int argc, char** argv)
     if (!use_vulkan_compute)
 #endif // NCNN_VULKAN
     {
-    benchmark("squeezenet_int8", ncnn::Mat(227, 227, 3), opt);
+        benchmark("squeezenet_int8", ncnn::Mat(227, 227, 3), opt);
     }
 
     benchmark("mobilenet", ncnn::Mat(224, 224, 3), opt);
@@ -244,15 +257,15 @@ int main(int argc, char** argv)
     if (!use_vulkan_compute)
 #endif // NCNN_VULKAN
     {
-    benchmark("mobilenet_int8", ncnn::Mat(224, 224, 3), opt);
+        benchmark("mobilenet_int8", ncnn::Mat(224, 224, 3), opt);
     }
 
     benchmark("mobilenet_v2", ncnn::Mat(224, 224, 3), opt);
 
-// #if NCNN_VULKAN
-//     if (!use_vulkan_compute)
-// #endif // NCNN_VULKAN
-//     benchmark("mobilenet_v2_int8", ncnn::Mat(224, 224, 3), opt);
+    // #if NCNN_VULKAN
+    //     if (!use_vulkan_compute)
+    // #endif // NCNN_VULKAN
+    //     benchmark("mobilenet_v2_int8", ncnn::Mat(224, 224, 3), opt);
 
     benchmark("mobilenet_v3", ncnn::Mat(224, 224, 3), opt);
 
@@ -276,7 +289,7 @@ int main(int argc, char** argv)
     if (!use_vulkan_compute)
 #endif // NCNN_VULKAN
     {
-    benchmark("googlenet_int8", ncnn::Mat(224, 224, 3), opt);
+        benchmark("googlenet_int8", ncnn::Mat(224, 224, 3), opt);
     }
 
     benchmark("resnet18", ncnn::Mat(224, 224, 3), opt);
@@ -285,7 +298,7 @@ int main(int argc, char** argv)
     if (!use_vulkan_compute)
 #endif // NCNN_VULKAN
     {
-    benchmark("resnet18_int8", ncnn::Mat(224, 224, 3), opt);
+        benchmark("resnet18_int8", ncnn::Mat(224, 224, 3), opt);
     }
 
     benchmark("alexnet", ncnn::Mat(227, 227, 3), opt);
@@ -296,7 +309,7 @@ int main(int argc, char** argv)
     if (!use_vulkan_compute)
 #endif // NCNN_VULKAN
     {
-    benchmark("vgg16_int8", ncnn::Mat(224, 224, 3), opt);
+        benchmark("vgg16_int8", ncnn::Mat(224, 224, 3), opt);
     }
 
     benchmark("resnet50", ncnn::Mat(224, 224, 3), opt);
@@ -305,7 +318,7 @@ int main(int argc, char** argv)
     if (!use_vulkan_compute)
 #endif // NCNN_VULKAN
     {
-    benchmark("resnet50_int8", ncnn::Mat(224, 224, 3), opt);
+        benchmark("resnet50_int8", ncnn::Mat(224, 224, 3), opt);
     }
 
     benchmark("squeezenet_ssd", ncnn::Mat(300, 300, 3), opt);
@@ -314,17 +327,16 @@ int main(int argc, char** argv)
     if (!use_vulkan_compute)
 #endif // NCNN_VULKAN
     {
-    benchmark("squeezenet_ssd_int8", ncnn::Mat(300, 300, 3), opt);
+        benchmark("squeezenet_ssd_int8", ncnn::Mat(300, 300, 3), opt);
     }
 
     benchmark("mobilenet_ssd", ncnn::Mat(300, 300, 3), opt);
 
-
 #if NCNN_VULKAN
     if (!use_vulkan_compute)
 #endif // NCNN_VULKAN
     {
-    benchmark("mobilenet_ssd_int8", ncnn::Mat(300, 300, 3), opt);
+        benchmark("mobilenet_ssd_int8", ncnn::Mat(300, 300, 3), opt);
     }
 
     benchmark("mobilenet_yolo", ncnn::Mat(416, 416, 3), opt);

codeformat.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# we run clang-format and astyle twice to get stable format output
+
+find src/ tools/ tests/ examples/ benchmark/ -type f -name '*.c' -o -name '*.cpp' -o -name '*.h' | xargs -i clang-format -i {}
+astyle -n -r "benchmark/*.h,*.cpp" "src/*.h,*.cpp" "tests/*.h,*.cpp" "tools/*.h,*.cpp" "examples/*.h,*.cpp"
+
+find src/ tools/ tests/ examples/ benchmark/ -type f -name '*.c' -o -name '*.cpp' -o -name '*.h' | xargs -i clang-format -i {}
+astyle -n -r "benchmark/*.h,*.cpp" "src/*.h,*.cpp" "tests/*.h,*.cpp" "tools/*.h,*.cpp" "examples/*.h,*.cpp"