diff --git a/src/common/log.h b/src/common/log.h index 4257147635717d0795dcc84641e1a224f399b506..a3cefe2541e310897ce753b8eb69711242762122 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -16,9 +16,9 @@ limitations under the License. */ #include #ifdef PADDLE_MOBILE_DEBUG +#include #include #include -#include #include #endif #ifdef ANDROID @@ -116,26 +116,29 @@ struct ToLog { Print printer_; }; -#define LOG(level) \ - if (level > paddle_mobile::log_level) { \ - } else \ - paddle_mobile::ToLog( \ - level, \ - static_cast(std::stringstream() \ - << "[file: " \ - << (strrchr(__FILE__, '/') ? (strrchr(__FILE__, '/') + 1) : __FILE__) \ - << "] [line: " << __LINE__ << "] ") \ - .str()) - -#define DLOG \ - if (paddle_mobile::kLOG_DEBUG > paddle_mobile::log_level) { \ - } else \ - paddle_mobile::ToLog( \ - paddle_mobile::kLOG_DEBUG, \ - static_cast(std::stringstream() \ - << "[file: " \ - << (strrchr(__FILE__, '/') ? (strrchr(__FILE__, '/') + 1) : __FILE__) \ - << "] [line: " << __LINE__ << "] ") \ +#define LOG(level) \ + if (level > paddle_mobile::log_level) { \ + } else \ + paddle_mobile::ToLog( \ + level, static_cast( \ + std::stringstream() \ + << "[file: " \ + << (strrchr(__FILE__, '/') ? (strrchr(__FILE__, '/') + 1) \ + : __FILE__) \ + << "] [line: " << __LINE__ << "] ") \ + .str()) + +#define DLOG \ + if (paddle_mobile::kLOG_DEBUG > paddle_mobile::log_level) { \ + } else \ + paddle_mobile::ToLog( \ + paddle_mobile::kLOG_DEBUG, \ + static_cast( \ + std::stringstream() \ + << "[file: " \ + << (strrchr(__FILE__, '/') ? (strrchr(__FILE__, '/') + 1) \ + : __FILE__) \ + << "] [line: " << __LINE__ << "] ") \ .str()) #define LOGF(level, format, ...) \ diff --git a/src/common/type_define.h b/src/common/type_define.h index 269c58d769477d54e724bf5baf786c59b1219bcf..389f9a715f8cec3f0b494ae3b43b3952e49677f8 100644 --- a/src/common/type_define.h +++ b/src/common/type_define.h @@ -14,10 +14,10 @@ limitations under the License. */ #pragma once +#include #include #include #include -#include #include "framework/attribute.h" #include "framework/scope.h" diff --git a/src/framework/attribute.h b/src/framework/attribute.h index 30cf6a1d0cafc52cbd945b6b633fc4970f2a420b..478fc1b3f5ae95d9720b057d3ab0d2e8912e7093 100644 --- a/src/framework/attribute.h +++ b/src/framework/attribute.h @@ -15,9 +15,9 @@ limitations under the License. */ #pragma once #include +#include #include #include -#include #include "common/enforce.h" #include "common/log.h" diff --git a/src/framework/ddim.h b/src/framework/ddim.h index dea6c9d45be7b235f44ba957a4206518dd53aa0e..ff94c24adac5bea1fd4c7a80857b212056c06d36 100644 --- a/src/framework/ddim.h +++ b/src/framework/ddim.h @@ -15,8 +15,8 @@ limitations under the License. */ #pragma once #include -#include #include +#include #include "common/enforce.h" #include "common/variant.h" #include "dim.h" diff --git a/src/framework/program/program-optimize/node.cpp b/src/framework/program/program-optimize/node.cpp index d84033b936a713ffba86d81a467925fddb2e6b4a..89385e12d9c5f20a21f6ee6f3987c088c4b15563 100644 --- a/src/framework/program/program-optimize/node.cpp +++ b/src/framework/program/program-optimize/node.cpp @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. */ #include "framework/program/program-optimize/node.h" -#include "framework/operator.h" #include +#include "framework/operator.h" namespace paddle_mobile { diff --git a/src/framework/program/program-optimize/program_optimize.cpp b/src/framework/program/program-optimize/program_optimize.cpp index 223421c23cc6feb0707d5bd8cfe1414ea9e9b6bc..3619bc79f576651245aa322992df9d318c810cd4 100644 --- a/src/framework/program/program-optimize/program_optimize.cpp +++ b/src/framework/program/program-optimize/program_optimize.cpp @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. */ #include "framework/program/program-optimize/program_optimize.h" -#include "framework/program/program-optimize/fusion_op_register.h" #include +#include "framework/program/program-optimize/fusion_op_register.h" namespace paddle_mobile { diff --git a/src/framework/scope.cpp b/src/framework/scope.cpp index 7324cf9a2eb69829d069381971c7a1a6439113be..a1f5789aa52d2a70f54cef5c622c3a15907a4683 100644 --- a/src/framework/scope.cpp +++ b/src/framework/scope.cpp @@ -14,10 +14,10 @@ limitations under the License. */ #include "framework/scope.h" +#include #include #include #include -#include namespace paddle_mobile { namespace framework { diff --git a/src/io/io.cpp b/src/io/io.cpp index 1d7a582be424a2a28171ef6f5b42be4f37074c01..8b1577b0ee16b5a4e54fa2bcfc14abaa6497b699 100644 --- a/src/io/io.cpp +++ b/src/io/io.cpp @@ -13,6 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ #include "io/io.h" +#include #include #include "common/enforce.h" #include "common/log.h" @@ -24,7 +25,6 @@ limitations under the License. */ #include "framework/program/var_desc.h" #include "framework/scope.h" #include "framework/tensor.h" -#include #ifdef PADDLE_EXECUTOR_MULTITHREAD #include #include diff --git a/src/operators/kernel/arm/batchnorm_kernel.cpp b/src/operators/kernel/arm/batchnorm_kernel.cpp index 0f0ee95670f1911a83d39db7a0e784c50dc6c405..02a7973ef7282f65d92fc364a5c27f7d30bad145 100644 --- a/src/operators/kernel/arm/batchnorm_kernel.cpp +++ b/src/operators/kernel/arm/batchnorm_kernel.cpp @@ -14,7 +14,6 @@ limitations under the License. */ #ifdef BATCHNORM_OP - #include "operators/kernel/batchnorm_kernel.h" #include diff --git a/src/operators/kernel/mali/batchnorm_kernel.cpp b/src/operators/kernel/mali/batchnorm_kernel.cpp index c816855f0293bc22321aaef885ae82610dce4d86..35c54807a9041df4ee6829210f2cd94450f6642f 100644 --- a/src/operators/kernel/mali/batchnorm_kernel.cpp +++ b/src/operators/kernel/mali/batchnorm_kernel.cpp @@ -14,7 +14,6 @@ limitations under the License. */ #ifdef BATCHNORM_OP - #include "operators/kernel/batchnorm_kernel.h" namespace paddle_mobile { diff --git a/src/operators/kernel/prior_box_kernel.h b/src/operators/kernel/prior_box_kernel.h index fec6c92c5c44c02818874f02731bf6c7964cd096..79fc630b8efb50dec1ff336d2b66d5094eaeb5a5 100644 --- a/src/operators/kernel/prior_box_kernel.h +++ b/src/operators/kernel/prior_box_kernel.h @@ -16,9 +16,9 @@ limitations under the License. */ #pragma once -#include -#include #include +#include +#include #include "framework/operator.h" #include "operators/math/transform.h" #include "operators/op_param.h"