[enforce.h Decouple logging.h] Delete glog/logging.h from enforce.h (#…

…52651) * [enforce.h Decouple logging.h] Delete glog/logging.h from enforce.h * Add logging.h for profiler.cc * Add logging.h for gloo_utils.h * Add logging.h for addmm_kernel_impl.h * Add logging.h for addmm_grad_kernel_impl.h * Add logging.h for p_send_kernel.cu * Add logging.h for determinant_grad_kernel_impl.h * Add logging.h for p_recv_kernel.cu * Add logging.h for elementwise_grad_base.h * Add logging.h for transfer_layout_kernel.cc * Add logging.h for eigvals_kernel.cc and index_select_impl.h * Add logging.h for all files in kernel directory * Add logging.h for xpu_info.cc * Add logging.h for xpu
PaddlePaddle · Apr 13, 2023 · 5664ea2 · 5664ea2
1 parent 0695fb8
commit 5664ea2
Show file tree

Hide file tree

Showing 136 changed files with 278 additions and 5 deletions.
diff --git a/paddle/fluid/framework/ir/delete_cast_op_pass.cc b/paddle/fluid/framework/ir/delete_cast_op_pass.cc
@@ -14,6 +14,8 @@
 
 #include "paddle/fluid/framework/ir/delete_cast_op_pass.h"
 
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/op_version_registry.h"
 #include "paddle/fluid/platform/enforce.h"

diff --git a/paddle/fluid/framework/ir/xpu/conv2d_xpu_fuse_pass.cc b/paddle/fluid/framework/ir/xpu/conv2d_xpu_fuse_pass.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include <string>
+
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/ir/fuse_pass_base.h"
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/ir/pass.h"

diff --git a/paddle/fluid/framework/ir/xpu/delete_isolated_node_pass.cc b/paddle/fluid/framework/ir/xpu/delete_isolated_node_pass.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include <string>
+
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/ir/pass.h"
 #include "paddle/fluid/framework/ir/xpu/pass_utils.h"

diff --git a/paddle/fluid/framework/ir/xpu/fc_xpu_fuse_pass.cc b/paddle/fluid/framework/ir/xpu/fc_xpu_fuse_pass.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include <string>
+
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/ir/fuse_pass_base.h"
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/ir/pass.h"

diff --git a/paddle/fluid/framework/ir/xpu/fused_multi_transformer_xpu_quant_pass.cc b/paddle/fluid/framework/ir/xpu/fused_multi_transformer_xpu_quant_pass.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include <string>
+
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/ir/fuse_pass_base.h"
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/ir/pass.h"

diff --git a/paddle/fluid/framework/ir/xpu/fused_multi_transformer_xpu_quant_pass_tester.cc b/paddle/fluid/framework/ir/xpu/fused_multi_transformer_xpu_quant_pass_tester.cc
@@ -11,6 +11,8 @@ limitations under the License. */
 
 #include <gtest/gtest.h>
 
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/ir/pass.h"
 #include "paddle/fluid/framework/ir/pass_tester_helper.h"
 

diff --git a/paddle/fluid/framework/ir/xpu/generate_sequence_xpu_fuse_pass.cc b/paddle/fluid/framework/ir/xpu/generate_sequence_xpu_fuse_pass.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include <string>
+
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/convert_utils.h"
 #include "paddle/fluid/framework/ir/fuse_pass_base.h"
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"

diff --git a/paddle/fluid/framework/ir/xpu/link_xpu_op_max_pass.cc b/paddle/fluid/framework/ir/xpu/link_xpu_op_max_pass.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include <string>
+
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/ir/fuse_pass_base.h"
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/ir/pass.h"

diff --git a/paddle/fluid/framework/ir/xpu/multi_encoder_xpu_slice_fuse_pass.cc b/paddle/fluid/framework/ir/xpu/multi_encoder_xpu_slice_fuse_pass.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include <string>
+
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/ir/fuse_pass_base.h"
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/ir/pass.h"

diff --git a/paddle/fluid/framework/ir/xpu/one_beam_size_fuse_pass.cc b/paddle/fluid/framework/ir/xpu/one_beam_size_fuse_pass.cc
@@ -14,6 +14,9 @@
 
 #include "paddle/fluid/framework/ir/xpu/one_beam_size_fuse_pass.h"
 #include <string>
+
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/ir/xpu/pass_utils.h"
 #include "paddle/fluid/framework/op_version_registry.h"

diff --git a/paddle/fluid/framework/ir/xpu/stack_fuse_pass.cc b/paddle/fluid/framework/ir/xpu/stack_fuse_pass.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include <string>
+
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/ir/fuse_pass_base.h"
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/ir/pass.h"

diff --git a/paddle/fluid/memory/allocation/cuda_device_context_allocator.h b/paddle/fluid/memory/allocation/cuda_device_context_allocator.h
@@ -19,6 +19,8 @@
 #include <utility>
 #include <vector>
 
+#include "glog/logging.h"
+
 #include "paddle/fluid/memory/allocation/allocator.h"
 #include "paddle/fluid/platform/cuda_device_guard.h"
 #include "paddle/fluid/platform/device_context.h"

diff --git a/paddle/fluid/platform/device/xpu/bkcl_helper.h b/paddle/fluid/platform/device/xpu/bkcl_helper.h
@@ -25,6 +25,8 @@
 #include <unordered_map>
 #include <vector>
 
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/data_type.h"
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/platform/collective_helper.h"

diff --git a/paddle/fluid/platform/device/xpu/xpu_op_list.cc b/paddle/fluid/platform/device/xpu/xpu_op_list.cc
@@ -15,6 +15,8 @@ limitations under the License. */
 #include <string>
 #include <unordered_set>
 
+#include "glog/logging.h"
+
 #include "paddle/fluid/framework/convert_utils.h"
 #include "paddle/fluid/platform/device/xpu/xpu_info.h"
 #include "paddle/phi/backends/xpu/xpu_op_kpfirst_list.h"

diff --git a/paddle/phi/api/lib/data_transform.cc b/paddle/phi/api/lib/data_transform.cc
@@ -14,6 +14,8 @@ limitations under the License. */
 
 #include "paddle/phi/api/lib/data_transform.h"
 
+#include "glog/logging.h"
+
 #include "paddle/phi/api/lib/kernel_dispatch.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
 #include "paddle/phi/backends/context_pool.h"

diff --git a/paddle/phi/api/lib/tensor_copy.cc b/paddle/phi/api/lib/tensor_copy.cc
@@ -14,6 +14,8 @@ limitations under the License. */
 
 #include "paddle/phi/api/lib/tensor_copy.h"
 
+#include "glog/logging.h"
+
 #include "paddle/phi/api/include/context_pool.h"
 #include "paddle/phi/api/lib/api_gen_utils.h"
 #include "paddle/phi/api/lib/kernel_dispatch.h"

diff --git a/paddle/phi/api/lib/tensor_method.cc b/paddle/phi/api/lib/tensor_method.cc
@@ -14,6 +14,8 @@ limitations under the License. */
 
 #include "paddle/phi/api/include/tensor.h"
 
+#include "glog/logging.h"
+
 #include "paddle/phi/common/int_array.h"
 #include "paddle/phi/core/compat/convert_utils.h"
 #include "paddle/phi/core/tensor_base.h"

diff --git a/paddle/phi/api/profiler/profiler.cc b/paddle/phi/api/profiler/profiler.cc
@@ -20,6 +20,8 @@ limitations under the License. */
 #include <string>
 #include <type_traits>
 
+#include "glog/logging.h"
+
 #include "paddle/phi/api/profiler/common_event.h"
 #include "paddle/phi/api/profiler/device_tracer.h"
 #include "paddle/phi/api/profiler/host_event_recorder.h"

diff --git a/paddle/phi/api/yaml/generator/strings_api_gen.py b/paddle/phi/api/yaml/generator/strings_api_gen.py
@@ -330,6 +330,8 @@ def source_include(header_file_path):
 #include "{header_file_path}"
 
 #include "gflags/gflags.h"
+#include "glog/logging.h"
+
 #include "paddle/phi/api/lib/api_gen_utils.h"
 #include "paddle/phi/core/kernel_context.h"
 #include "paddle/phi/core/string_tensor.h"

diff --git a/paddle/phi/backends/context_pool.cc b/paddle/phi/backends/context_pool.cc
@@ -13,6 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/phi/backends/context_pool.h"
+
+#include "glog/logging.h"
+
 #include "paddle/phi/common/memory_utils.h"
 #include "paddle/phi/core/enforce.h"
 

diff --git a/paddle/phi/backends/custom/custom_device.cc b/paddle/phi/backends/custom/custom_device.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "glog/logging.h"
+
 #include "paddle/phi/api/profiler/trace_event_collector.h"
 #include "paddle/phi/backends/callback_manager.h"
 #include "paddle/phi/backends/context_pool.h"

diff --git a/paddle/phi/backends/event.cc b/paddle/phi/backends/event.cc
@@ -14,6 +14,8 @@
 
 #include "paddle/phi/backends/event.h"
 
+#include "glog/logging.h"
+
 #include "paddle/phi/backends/device_guard.h"
 #include "paddle/phi/backends/stream.h"
 

diff --git a/paddle/phi/backends/gpu/cuda/cuda_graph.h b/paddle/phi/backends/gpu/cuda/cuda_graph.h
@@ -26,6 +26,8 @@
 #include "cuda.h"          // NOLINT
 #include "cuda_runtime.h"  // NOLINT
 
+#include "glog/logging.h"
+
 #include "paddle/phi/backends/context_pool.h"
 #include "paddle/phi/backends/gpu/gpu_context.h"
 #include "paddle/phi/common/memory_utils.h"

diff --git a/paddle/phi/backends/gpu/cuda/cuda_info.cc b/paddle/phi/backends/gpu/cuda/cuda_info.cc
@@ -14,6 +14,8 @@
 
 #include "paddle/phi/backends/gpu/gpu_info.h"
 
+#include "glog/logging.h"
+
 #include "paddle/phi/core/enforce.h"
 
 static std::once_flag g_device_props_size_init_flag;

diff --git a/paddle/phi/backends/gpu/gpu_resources.cc b/paddle/phi/backends/gpu/gpu_resources.cc
@@ -33,6 +33,7 @@
 #endif  // !defined(__APPLE__) && defined(PADDLE_WITH_NCCL)
 #endif  // PADDLE_WITH_CUDA
 
+#include "glog/logging.h"
 #include "unsupported/Eigen/CXX11/Tensor"
 
 #include "paddle/phi/core/enforce.h"

diff --git a/paddle/phi/backends/onednn/onednn_context.cc b/paddle/phi/backends/onednn/onednn_context.cc
@@ -21,6 +21,8 @@
 #include "paddle/phi/backends/context_pool.h"
 #include "paddle/phi/core/expect.h"
 
+#include "glog/logging.h"
+
 namespace phi {
 
 OneDNNContextThreadLocals::Body::Body()

diff --git a/paddle/phi/backends/stream.cc b/paddle/phi/backends/stream.cc
@@ -14,6 +14,8 @@
 
 #include "paddle/phi/backends/stream.h"
 
+#include "glog/logging.h"
+
 #include "paddle/phi/backends/device_guard.h"
 #include "paddle/phi/backends/event.h"
 

diff --git a/paddle/phi/backends/xpu/xpu_context.cc b/paddle/phi/backends/xpu/xpu_context.cc
@@ -16,6 +16,8 @@
 
 #include <memory>
 
+#include "glog/logging.h"
+
 #include "paddle/phi/api/ext/exception.h"
 #include "paddle/phi/backends/xpu/enforce_xpu.h"
 #include "paddle/phi/common/place.h"

diff --git a/paddle/phi/backends/xpu/xpu_info.cc b/paddle/phi/backends/xpu/xpu_info.cc
@@ -14,6 +14,8 @@ limitations under the License. */
 #include <cstdlib>
 #include <string>
 
+#include "glog/logging.h"
+
 #include "paddle/phi/backends/xpu/enforce_xpu.h"
 #include "paddle/phi/backends/xpu/xpu_context.h"
 #include "paddle/phi/backends/xpu/xpu_header.h"

diff --git a/paddle/phi/core/cuda_stream.h b/paddle/phi/core/cuda_stream.h
@@ -28,6 +28,8 @@ using gpuStream_t = cudaStream_t;
 using gpuStream_t = hipStream_t;
 #endif
 
+#include "glog/logging.h"
+
 #include "paddle/phi/core/enforce.h"
 
 namespace phi {

diff --git a/paddle/phi/core/dense_tensor.cc b/paddle/phi/core/dense_tensor.cc
@@ -14,6 +14,8 @@ limitations under the License. */
 
 #include "paddle/phi/core/dense_tensor.h"
 
+#include "glog/logging.h"
+
 #include "paddle/phi/common/bfloat16.h"
 #include "paddle/phi/common/complex.h"
 #include "paddle/phi/common/float16.h"

diff --git a/paddle/phi/core/distributed/check/nccl_dynamic_check.cc b/paddle/phi/core/distributed/check/nccl_dynamic_check.cc
@@ -14,6 +14,8 @@
 
 #include "paddle/phi/core/distributed/check/nccl_dynamic_check.h"
 
+#include "glog/logging.h"
+
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/enforce.h"
 #include "paddle/phi/core/errors.h"

diff --git a/paddle/phi/core/distributed/gloo_utils.h b/paddle/phi/core/distributed/gloo_utils.h
@@ -22,6 +22,8 @@
 #include <memory>
 #include <string>
 
+#include "glog/logging.h"
+
 #include "paddle/phi/common/data_type.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/distributed/reduce_helper.h"

diff --git a/paddle/phi/core/distributed/nccl_comm_context.cc b/paddle/phi/core/distributed/nccl_comm_context.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include "paddle/phi/core/distributed/nccl_comm_context.h"
+
+#include "glog/logging.h"
+
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/distributed/check/nccl_dynamic_check.h"
 #include "paddle/phi/core/distributed/check/static_check.h"

diff --git a/paddle/phi/core/distributed/store/tcp_store.cc b/paddle/phi/core/distributed/store/tcp_store.cc
@@ -18,6 +18,8 @@
 #include <iostream>
 #include <thread>
 
+#include "glog/logging.h"
+
 #include "paddle/phi/core/distributed/store/tcp_utils.h"
 #include "paddle/phi/core/flags.h"
 

diff --git a/paddle/phi/core/distributed/store/tcp_utils.cc b/paddle/phi/core/distributed/store/tcp_utils.cc
@@ -18,6 +18,8 @@
 #include <cstring>
 #include <thread>
 
+#include "glog/logging.h"
+
 namespace phi {
 namespace distributed {
 namespace tcputils {

diff --git a/paddle/phi/core/enforce.h b/paddle/phi/core/enforce.h
@@ -59,7 +59,6 @@ limitations under the License. */
 #endif
 
 #define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
-#include "glog/logging.h"
 #include "paddle/phi/core/errors.h"
 
 #include "paddle/phi/backends/dynload/port.h"

diff --git a/paddle/phi/core/selected_rows_impl.cc b/paddle/phi/core/selected_rows_impl.cc
@@ -13,6 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/phi/core/selected_rows_impl.h"
+
+#include "glog/logging.h"
+
 #include "paddle/phi/common/memory_utils.h"
 #include "paddle/phi/core/utils/data_type.h"
 

diff --git a/paddle/phi/core/string_tensor.cc b/paddle/phi/core/string_tensor.cc
@@ -14,6 +14,8 @@ limitations under the License. */
 
 #include "paddle/phi/core/string_tensor.h"
 
+#include "glog/logging.h"
+
 #include "paddle/phi/common/memory_utils.h"
 #include "paddle/phi/common/pstring.h"
 

diff --git a/paddle/phi/core/tensor_utils.cc b/paddle/phi/core/tensor_utils.cc
@@ -14,6 +14,8 @@ limitations under the License. */
 
 #include "paddle/phi/core/tensor_utils.h"
 
+#include "glog/logging.h"
+
 #include "paddle/phi/backends/context_pool.h"
 #include "paddle/phi/backends/gpu/gpu_context.h"
 #include "paddle/phi/common/data_type.h"

diff --git a/paddle/phi/infermeta/multiary.cc b/paddle/phi/infermeta/multiary.cc
@@ -16,6 +16,8 @@ limitations under the License. */
 
 #include <vector>
 
+#include "glog/logging.h"
+
 #include "paddle/phi/backends/device_memory_aligment.h"
 #include "paddle/phi/common/layout.h"
 #include "paddle/phi/common/scalar.h"

diff --git a/paddle/phi/kernels/coalesce_tensor_kernel.cc b/paddle/phi/kernels/coalesce_tensor_kernel.cc
@@ -17,6 +17,8 @@
 #include <sstream>
 #include <vector>
 
+#include "glog/logging.h"
+
 #include "paddle/phi/backends/cpu/cpu_context.h"
 #include "paddle/phi/backends/device_memory_aligment.h"
 #include "paddle/phi/backends/gpu/gpu_context.h"

diff --git a/paddle/phi/kernels/cpu/adam_kernel.cc b/paddle/phi/kernels/cpu/adam_kernel.cc
@@ -16,6 +16,8 @@
 
 #include <vector>
 
+#include "glog/logging.h"
+
 #include "paddle/phi/backends/cpu/cpu_context.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/tensor_utils.h"