diff --git a/lite/backends/x86/CMakeLists.txt b/lite/backends/x86/CMakeLists.txt index 38b47ae3120608c7950a1f081e9ec2b133fb955e..1014e3f87f5190700746467f09f7bf294070a09b 100644 --- a/lite/backends/x86/CMakeLists.txt +++ b/lite/backends/x86/CMakeLists.txt @@ -8,7 +8,7 @@ lite_cc_library(target_wrapper_x86 SRCS target_wrapper.cc) if (LITE_ON_MODEL_OPTIMIZE_TOOL) return() endif(LITE_ON_MODEL_OPTIMIZE_TOOL) -lite_cc_library(dynamic_loader SRCS dynamic_loader.cc DEPS glog gflags) +lite_cc_library(dynamic_loader SRCS dynamic_loader.cc) lite_cc_library(dynload_mklml SRCS mklml.cc DEPS dynamic_loader mklml) lite_cc_library(x86_cpu_info SRCS cpu_info.cc) diff --git a/lite/backends/x86/cpu_info.cc b/lite/backends/x86/cpu_info.cc index aa097f947a0289b4a44417160fbe5d6e6db48020..276b62654f3c8b25d23e629c706e4877dabc3889 100644 --- a/lite/backends/x86/cpu_info.cc +++ b/lite/backends/x86/cpu_info.cc @@ -29,8 +29,8 @@ #include #endif // _WIN32 -#include #include +#include "lite/utils/cp_logging.h" #include "lite/utils/env.h" diff --git a/lite/backends/x86/dynamic_loader.cc b/lite/backends/x86/dynamic_loader.cc index 2aaa798fa94b7dd47e4dc15d50e663b8fd3c083a..4978dfb84a4ee5770df011c54dccde59a62135b7 100644 --- a/lite/backends/x86/dynamic_loader.cc +++ b/lite/backends/x86/dynamic_loader.cc @@ -17,8 +17,6 @@ limitations under the License. */ #include // NOLINT #include -#include "gflags/gflags.h" -#include "glog/logging.h" #include "lite/backends/x86/cupti_lib_path.h" #include "lite/backends/x86/port.h" #include "lite/backends/x86/warpctc_lib_path.h" diff --git a/lite/backends/x86/jit/gen/act.h b/lite/backends/x86/jit/gen/act.h index 6366cff3c85d674c8f7730dae24732bdf3571672..dd545b9fc95f9a260300bf11afb8f98e7d2ad922 100644 --- a/lite/backends/x86/jit/gen/act.h +++ b/lite/backends/x86/jit/gen/act.h @@ -14,9 +14,9 @@ #pragma once -#include #include #include "lite/backends/x86/jit/gen/jitcode.h" +#include "lite/utils/cp_logging.h" namespace paddle { namespace lite { diff --git a/lite/backends/x86/jit/gen/blas.h b/lite/backends/x86/jit/gen/blas.h index 4317d558c6252e9163bc545cba4859fbcb89f804..8545ea96f8dd1a4d2eeaa1748d34a859f46799c1 100644 --- a/lite/backends/x86/jit/gen/blas.h +++ b/lite/backends/x86/jit/gen/blas.h @@ -15,8 +15,8 @@ #pragma once #include -#include "glog/logging.h" #include "lite/backends/x86/jit/gen/jitcode.h" +#include "lite/utils/cp_logging.h" #include "lite/utils/string.h" namespace paddle { diff --git a/lite/backends/x86/jit/gen/embseqpool.h b/lite/backends/x86/jit/gen/embseqpool.h index 999960ece4170d561419ad24bd94c512ce167eb0..7bb248dd1d384af949fd3cd190df3d90d21921ef 100644 --- a/lite/backends/x86/jit/gen/embseqpool.h +++ b/lite/backends/x86/jit/gen/embseqpool.h @@ -14,9 +14,9 @@ #pragma once -#include #include #include "lite/backends/x86/jit/gen/jitcode.h" +#include "lite/utils/cp_logging.h" #include "lite/utils/paddle_enforce.h" namespace paddle { diff --git a/lite/backends/x86/jit/gen/gru.h b/lite/backends/x86/jit/gen/gru.h index 408f25746d85d4c56bdbd3c0728687f817c1f80f..6a468fd9ac19acbc68f2e2569e77892189f37e62 100644 --- a/lite/backends/x86/jit/gen/gru.h +++ b/lite/backends/x86/jit/gen/gru.h @@ -15,9 +15,9 @@ #pragma once #include -#include "glog/logging.h" #include "lite/backends/x86/jit/gen/act.h" #include "lite/backends/x86/jit/gen/jitcode.h" +#include "lite/utils/cp_logging.h" namespace paddle { namespace lite { diff --git a/lite/backends/x86/jit/gen/hopv.h b/lite/backends/x86/jit/gen/hopv.h index 801131d6307e6ff10efaa2770fce6ac0a0f3b9d3..6fa0c041b9f45000ef12251974579020de31784a 100644 --- a/lite/backends/x86/jit/gen/hopv.h +++ b/lite/backends/x86/jit/gen/hopv.h @@ -15,8 +15,8 @@ #pragma once #include -#include "glog/logging.h" #include "lite/backends/x86/jit/gen/jitcode.h" +#include "lite/utils/cp_logging.h" namespace paddle { namespace lite { diff --git a/lite/backends/x86/jit/gen/lstm.h b/lite/backends/x86/jit/gen/lstm.h index 141419505c7ce3b8e515dbd728987640afda7fc5..22611978e081edad369612e29bdd1e8fd1634b1f 100644 --- a/lite/backends/x86/jit/gen/lstm.h +++ b/lite/backends/x86/jit/gen/lstm.h @@ -15,9 +15,9 @@ #pragma once #include -#include "glog/logging.h" #include "lite/backends/x86/jit/gen/act.h" #include "lite/backends/x86/jit/gen/jitcode.h" +#include "lite/utils/cp_logging.h" namespace paddle { namespace lite { diff --git a/lite/backends/x86/jit/gen/matmul.h b/lite/backends/x86/jit/gen/matmul.h index e7be6750cf0d232b41d3be61001eb0af4c52a129..95edc14201ac94d302ff806d0a4b8f5f50b2835c 100644 --- a/lite/backends/x86/jit/gen/matmul.h +++ b/lite/backends/x86/jit/gen/matmul.h @@ -17,8 +17,8 @@ #include // for malloc and free #include #include -#include "glog/logging.h" #include "lite/backends/x86/jit/gen/jitcode.h" +#include "lite/utils/cp_logging.h" #include "lite/utils/paddle_enforce.h" namespace paddle { diff --git a/lite/backends/x86/jit/gen/seqpool.h b/lite/backends/x86/jit/gen/seqpool.h index 60e27993057b58eb8a4a07fcd0a368fc0a9441fc..a00428f3e0982889665cd23b21a5978c7c239399 100644 --- a/lite/backends/x86/jit/gen/seqpool.h +++ b/lite/backends/x86/jit/gen/seqpool.h @@ -14,9 +14,9 @@ #pragma once -#include #include #include "lite/backends/x86/jit/gen/jitcode.h" +#include "lite/utils/cp_logging.h" #include "lite/utils/paddle_enforce.h" namespace paddle { diff --git a/lite/backends/x86/jit/gen/sgd.h b/lite/backends/x86/jit/gen/sgd.h index 303d94f2ab6bf823ea71b8c52b2a755558f50fbd..9c9c2cff01ab051dcd526b7f633fcd66c1af702e 100644 --- a/lite/backends/x86/jit/gen/sgd.h +++ b/lite/backends/x86/jit/gen/sgd.h @@ -15,8 +15,8 @@ #pragma once #include -#include "glog/logging.h" #include "lite/backends/x86/jit/gen/jitcode.h" +#include "lite/utils/cp_logging.h" namespace paddle { namespace lite { diff --git a/lite/backends/x86/jit/gen/vbroadcast.h b/lite/backends/x86/jit/gen/vbroadcast.h index 39bcd4965f3a24f18de7fa5a13d469b3019920f9..8b58bd4c04922319f0b18b709df4a2a6fc0c1313 100644 --- a/lite/backends/x86/jit/gen/vbroadcast.h +++ b/lite/backends/x86/jit/gen/vbroadcast.h @@ -15,8 +15,8 @@ #pragma once #include -#include "glog/logging.h" #include "lite/backends/x86/jit/gen/jitcode.h" +#include "lite/utils/cp_logging.h" namespace paddle { namespace lite { diff --git a/lite/backends/x86/jit/refer/refer.h b/lite/backends/x86/jit/refer/refer.h index 119ec7469ed21f5e74c973e3de88ed6b93b1e06a..d8c8d86911ab9a7794192aa68fb0c0571b1e4d26 100644 --- a/lite/backends/x86/jit/refer/refer.h +++ b/lite/backends/x86/jit/refer/refer.h @@ -14,7 +14,6 @@ #pragma once -#include #include #include #include @@ -22,6 +21,7 @@ #include "lite/backends/x86/jit/helper.h" #include "lite/backends/x86/jit/kernel_base.h" #include "lite/backends/x86/jit/macro.h" +#include "lite/utils/cp_logging.h" #include "lite/utils/paddle_enforce.h" namespace paddle { diff --git a/lite/backends/x86/port.h b/lite/backends/x86/port.h index 0e1e2b77b796eae201c55edcd3caecc263e4271e..42680bfc89f16bf7da11cebe19e3d3555de066bc 100644 --- a/lite/backends/x86/port.h +++ b/lite/backends/x86/port.h @@ -22,7 +22,7 @@ #include #define GLOG_NO_ABBREVIATED_SEVERITIES // msvc conflict logging with windows.h -#include "glog/logging.h" +#include "lite/utils/cp_logging.h" #if !defined(_WIN32) #include // dladdr diff --git a/lite/kernels/x86/elementwise_op_function.h b/lite/kernels/x86/elementwise_op_function.h index a94944a7f2873a3e4651f21d7db797231f229aaa..f736248ed3632af92dea2823439e6e7d28ff3e1b 100644 --- a/lite/kernels/x86/elementwise_op_function.h +++ b/lite/kernels/x86/elementwise_op_function.h @@ -14,16 +14,15 @@ limitations under the License. */ #pragma once -#include #include #include #include +#include "lite/backends/x86/math/math_function.h" #include "lite/fluid/eigen.h" +#include "lite/fluid/for_range.h" #include "lite/fluid/transform.h" +#include "lite/utils/cp_logging.h" #include "lite/utils/paddle_enforce.h" - -#include "lite/backends/x86/math/math_function.h" -#include "lite/fluid/for_range.h" #include "lite/utils/variant.h" namespace paddle {