Merge branch 'coding-style-core' into 'master'

Fix coding style for mace/core

See merge request !299

mace/core/operator.h

@@ -2,8 +2,8 @@
 // Copyright (c) 2017 XiaoMi All rights reserved.
 //
 
-#ifndef MACE_CORE_OPERATOR_H
-#define MACE_CORE_OPERATOR_H
+#ifndef MACE_CORE_OPERATOR_H_
+#define MACE_CORE_OPERATOR_H_
 
 #include <memory>
 #include <string>
@@ -176,4 +176,4 @@ MACE_DECLARE_REGISTRY(OpRegistry,
 
 }  // namespace mace
 
-#endif  // MACE_CORE_OPERATOR_H
+#endif  // MACE_CORE_OPERATOR_H_

mace/core/runtime/cpu/cpu_runtime.cc

@@ -29,6 +29,7 @@ int GetCPUMaxFreq(int cpu_id) {
 }
 
 void SortCPUIdsByMaxFreqAsc(std::vector<int> *cpu_ids) {
+  MACE_CHECK_NOTNULL(cpu_ids);
   int cpu_count = cpu_ids->size();
   std::vector<int> cpu_max_freq;
   cpu_max_freq.resize(cpu_count);

mace/core/runtime/hexagon/hexagon_control_wrapper.h

@@ -2,8 +2,8 @@
 // Copyright (c) 2017 XiaoMi All rights reserved.
 //
 
-#ifndef MACE_DSP_HEXAGON_CONTROL_WRAPPER_H_
-#define MACE_DSP_HEXAGON_CONTROL_WRAPPER_H_
+#ifndef MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROL_WRAPPER_H_
+#define MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROL_WRAPPER_H_
 
 #include <vector>
 
@@ -55,4 +55,4 @@ class HexagonControlWrapper {
 };
 }  // namespace mace
 
-#endif  // MACE_DSP_HEXAGON_CONTROL_WRAPPER_H_
+#endif  // MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROL_WRAPPER_H_

mace/core/runtime/hexagon/hexagon_controller.h

@@ -2,8 +2,8 @@
 // Copyright (c) 2017 XiaoMi All rights reserved.
 //
 
-#ifndef MACE_CORE_RUNTIME_HEXAGON_CONTROLLER_H_
-#define MACE_CORE_RUNTIME_HEXAGON_CONTROLLER_H_
+#ifndef MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROLLER_H_
+#define MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROLLER_H_
 
 #include "mace/core/runtime/hexagon/hexagon_nn.h"
 
@@ -22,5 +22,5 @@ int hexagon_controller_DeInitHexagon();
 }
 #endif  // __cplusplus
 
-#endif  // MACE_CORE_RUNTIME_HEXAGON_CONTROLLER_H_
+#endif  // MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROLLER_H_
 

mace/core/runtime/hexagon/hexagon_nn.h

@@ -33,8 +33,8 @@
  *
  */
 
-#ifndef MACE_CORE_RUNTIME_HEXAGON_NN_H_
-#define MACE_CORE_RUNTIME_HEXAGON_NN_H_
+#ifndef MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_H_
+#define MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_H_
 #ifndef __QAIC_HEADER
 #define __QAIC_HEADER(ff) ff
 #endif  // __QAIC_HEADER
@@ -221,4 +221,4 @@ __QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_execute_new)(
 #ifdef __cplusplus
 }
 #endif
-#endif  // MACE_CORE_RUNTIME_HEXAGON_NN_H_
+#endif  // MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_H_

mace/core/runtime/hexagon/hexagon_nn_ops.h

@@ -2,8 +2,8 @@
 // Copyright (c) 2018 XiaoMi All rights reserved.
 //
 
-#ifndef MACE_CORE_RUNTIME_HEXAGON_NN_OPS_H_
-#define MACE_CORE_RUNTIME_HEXAGON_NN_OPS_H_
+#ifndef MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_OPS_H_
+#define MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_OPS_H_
 
 #include <string>
 #include <unordered_map>
@@ -47,4 +47,4 @@ class OpMap {
 };
 }  // namespace mace
 
-#endif  // MACE_CORE_RUNTIME_HEXAGON_NN_OPS_H_
+#endif  // MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_OPS_H_