Skip to content

Commit ddf6b72

Browse files
allonliallonli
committed
modify to 2 spaces indent & format code & rm build folder
1 parent e35ef6f commit ddf6b72

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+13543
-14086
lines changed

‎.clang-format

-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
Language: Cpp
33
BasedOnStyle: LLVM
44
Standard: Cpp11
5-
IndentWidth: 4
65
...

‎cmake-build-release/compile_commands.json

-312
This file was deleted.

‎src/common/log.h

+86-88
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ SOFTWARE.
2828
namespace paddle_mobile {
2929

3030
enum LogLevel {
31-
kNO_LOG,
32-
kLOG_ERROR,
33-
kLOG_WARNING,
34-
kLOG_INFO,
35-
kLOG_DEBUG,
36-
kLOG_DEBUG1,
37-
kLOG_DEBUG2,
38-
kLOG_DEBUG3,
39-
kLOG_DEBUG4
31+
kNO_LOG,
32+
kLOG_ERROR,
33+
kLOG_WARNING,
34+
kLOG_INFO,
35+
kLOG_DEBUG,
36+
kLOG_DEBUG1,
37+
kLOG_DEBUG2,
38+
kLOG_DEBUG3,
39+
kLOG_DEBUG4
4040
};
4141

4242
// log level
@@ -49,119 +49,117 @@ struct ToLog;
4949
struct Print;
5050

5151
struct Print {
52-
friend struct ToLog;
53-
54-
template <typename T> Print &operator<<(T const &value) {
55-
buffer_ << value;
56-
return *this;
57-
}
58-
59-
private:
60-
void print(LogLevel level) {
61-
buffer_ << std::endl;
62-
if (level == kLOG_ERROR) {
63-
std::cerr << buffer_.str();
64-
} else {
65-
std::cout << buffer_.str();
66-
}
52+
friend struct ToLog;
53+
54+
template <typename T> Print &operator<<(T const &value) {
55+
buffer_ << value;
56+
return *this;
57+
}
58+
59+
private:
60+
void print(LogLevel level) {
61+
buffer_ << std::endl;
62+
if (level == kLOG_ERROR) {
63+
std::cerr << buffer_.str();
64+
} else {
65+
std::cout << buffer_.str();
6766
}
68-
std::ostringstream buffer_;
67+
}
68+
std::ostringstream buffer_;
6969
};
7070

7171
struct ToLog {
72-
ToLog(LogLevel level = kLOG_DEBUG, const std::string &info = "")
73-
: level_(level) {
74-
unsigned blanks =
75-
(unsigned)(level > kLOG_DEBUG ? (level - kLOG_DEBUG) * 4 : 1);
76-
printer_ << logs[level] << " " << info << ":"
77-
<< std::string(blanks, ' ');
78-
}
79-
80-
template <typename T> ToLog &operator<<(T const &value) {
81-
printer_ << value;
82-
return *this;
83-
}
84-
85-
~ToLog() { printer_.print(level_); }
86-
87-
private:
88-
LogLevel level_;
89-
Print printer_;
72+
ToLog(LogLevel level = kLOG_DEBUG, const std::string &info = "")
73+
: level_(level) {
74+
unsigned blanks =
75+
(unsigned)(level > kLOG_DEBUG ? (level - kLOG_DEBUG) * 4 : 1);
76+
printer_ << logs[level] << " " << info << ":" << std::string(blanks, ' ');
77+
}
78+
79+
template <typename T> ToLog &operator<<(T const &value) {
80+
printer_ << value;
81+
return *this;
82+
}
83+
84+
~ToLog() { printer_.print(level_); }
85+
86+
private:
87+
LogLevel level_;
88+
Print printer_;
9089
};
9190

9291
#define LOG(level) \
93-
if (level > paddle_mobile::log_level) { \
94-
} else \
95-
paddle_mobile::ToLog( \
96-
level, (std::stringstream() \
97-
<< "[file: " \
98-
<< (strrchr(__FILE__, '/') ? (strrchr(__FILE__, '/') + 1) \
99-
: __FILE__) \
100-
<< "] [line: " << __LINE__ << "] ") \
101-
.str())
92+
if (level > paddle_mobile::log_level) { \
93+
} else \
94+
paddle_mobile::ToLog( \
95+
level, \
96+
(std::stringstream() \
97+
<< "[file: " \
98+
<< (strrchr(__FILE__, '/') ? (strrchr(__FILE__, '/') + 1) : __FILE__) \
99+
<< "] [line: " << __LINE__ << "] ") \
100+
.str())
102101

103102
#define DLOG \
104-
if (paddle_mobile::kLOG_DEBUG > paddle_mobile::log_level) { \
105-
} else \
106-
paddle_mobile::ToLog( \
107-
paddle_mobile::kLOG_DEBUG, \
108-
(std::stringstream() \
109-
<< "[file: " \
110-
<< (strrchr(__FILE__, '/') ? (strrchr(__FILE__, '/') + 1) \
111-
: __FILE__) \
112-
<< "] [line: " << __LINE__ << "] ") \
113-
.str())
103+
if (paddle_mobile::kLOG_DEBUG > paddle_mobile::log_level) { \
104+
} else \
105+
paddle_mobile::ToLog( \
106+
paddle_mobile::kLOG_DEBUG, \
107+
(std::stringstream() \
108+
<< "[file: " \
109+
<< (strrchr(__FILE__, '/') ? (strrchr(__FILE__, '/') + 1) : __FILE__) \
110+
<< "] [line: " << __LINE__ << "] ") \
111+
.str())
114112
} // namespace paddle_mobile
115113

116114
#define LOGF(level, format, ...) \
117-
if (level > paddle_mobile::log_level) { \
118-
} else \
119-
printf(format, ##__VA_ARGS__)
115+
if (level > paddle_mobile::log_level) { \
116+
} else \
117+
printf(format, ##__VA_ARGS__)
120118

121119
#define DLOGF(format, ...) \
122-
if (paddle_mobile::kLOG_DEBUG > paddle_mobile::log_level) { \
123-
} else \
124-
printf(format, ##__VA_ARGS__)
120+
if (paddle_mobile::kLOG_DEBUG > paddle_mobile::log_level) { \
121+
} else \
122+
printf(format, ##__VA_ARGS__)
125123

126124
#else
127125

128126
namespace paddle_mobile {
129127

130128
enum LogLevel {
131-
kNO_LOG,
132-
kLOG_ERROR,
133-
kLOG_WARNING,
134-
kLOG_INFO,
135-
kLOG_DEBUG,
136-
kLOG_DEBUG1,
137-
kLOG_DEBUG2,
138-
kLOG_DEBUG3,
139-
kLOG_DEBUG4
129+
kNO_LOG,
130+
kLOG_ERROR,
131+
kLOG_WARNING,
132+
kLOG_INFO,
133+
kLOG_DEBUG,
134+
kLOG_DEBUG1,
135+
kLOG_DEBUG2,
136+
kLOG_DEBUG3,
137+
kLOG_DEBUG4
140138
};
141139

142140
struct ToLog;
143141
struct Print {
144-
friend struct ToLog;
145-
template <typename T> Print &operator<<(T const &value) {}
142+
friend struct ToLog;
143+
template <typename T> Print &operator<<(T const &value) {}
146144

147-
private:
145+
private:
148146
};
149147

150148
struct ToLog {
151-
ToLog(LogLevel level) {}
149+
ToLog(LogLevel level) {}
152150

153-
template <typename T> ToLog &operator<<(T const &value) { return *this; }
151+
template <typename T> ToLog &operator<<(T const &value) { return *this; }
154152
};
155153

156154
#define LOG(level) \
157-
if (true) { \
158-
} else \
159-
paddle_mobile::ToLog(level)
155+
if (true) { \
156+
} else \
157+
paddle_mobile::ToLog(level)
160158

161159
#define DLOG \
162-
if (true) { \
163-
} else \
164-
paddle_mobile::ToLog(paddle_mobile::kLOG_DEBUG)
160+
if (true) { \
161+
} else \
162+
paddle_mobile::ToLog(paddle_mobile::kLOG_DEBUG)
165163

166164
#define LOGF(level, format, ...)
167165

‎src/common/types.h

+24-24
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,32 @@ typedef DeviceType<kGPU_MALI> GPU_MALI;
3232

3333
//! data type
3434
enum DataType {
35-
PM_INVALID = -1,
36-
PM_HALF = 0,
37-
PM_FLOAT = 1,
38-
PM_DOUBLE = 2,
39-
PM_INT8 = 3,
40-
PM_INT16 = 4,
41-
PM_INT32 = 5,
42-
PM_INT64 = 6,
43-
PM_UINT8 = 7,
44-
PM_UINT16 = 8,
45-
PM_UINT32 = 9,
46-
PM_STRING = 10,
47-
PM_BOOL = 11,
48-
PM_SHAPE = 12,
49-
PM_TENSOR = 13
35+
PM_INVALID = -1,
36+
PM_HALF = 0,
37+
PM_FLOAT = 1,
38+
PM_DOUBLE = 2,
39+
PM_INT8 = 3,
40+
PM_INT16 = 4,
41+
PM_INT32 = 5,
42+
PM_INT64 = 6,
43+
PM_UINT8 = 7,
44+
PM_UINT16 = 8,
45+
PM_UINT32 = 9,
46+
PM_STRING = 10,
47+
PM_BOOL = 11,
48+
PM_SHAPE = 12,
49+
PM_TENSOR = 13
5050
};
5151
//!
5252
enum PMStatus {
53-
PMSuccess = 0xFF, /*!< No errors */
54-
PMNotInitialized = 0x01, /*!< Data not initialized. */
55-
PMInvalidValue = 0x02, /*!< Incorrect variable value. */
56-
PMMemAllocFailed = 0x03, /*!< Memory allocation error. */
57-
PMUnKownError = 0x04, /*!< Unknown error. */
58-
PMOutOfAuthority = 0x05, /*!< Try to modified data not your own*/
59-
PMOutOfMem = 0x06, /*!< OOM error*/
60-
PMUnImplError = 0x07, /*!< Unimplement error. */
61-
PMWrongDevice = 0x08 /*!< un-correct device. */
53+
PMSuccess = 0xFF, /*!< No errors */
54+
PMNotInitialized = 0x01, /*!< Data not initialized. */
55+
PMInvalidValue = 0x02, /*!< Incorrect variable value. */
56+
PMMemAllocFailed = 0x03, /*!< Memory allocation error. */
57+
PMUnKownError = 0x04, /*!< Unknown error. */
58+
PMOutOfAuthority = 0x05, /*!< Try to modified data not your own*/
59+
PMOutOfMem = 0x06, /*!< OOM error*/
60+
PMUnImplError = 0x07, /*!< Unimplement error. */
61+
PMWrongDevice = 0x08 /*!< un-correct device. */
6262
};
6363
} // namespace paddle_mobile

0 commit comments

Comments
 (0)