From ee9ea48d7032965f8f1fdfa31de754b9a8211c5c Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Mon, 8 Aug 2022 11:02:46 +0800 Subject: [PATCH] clean includes of tensor.h (#44928) * clean tensor.h * fix gather_nd --- paddle/fluid/eager/nan_inf_utils.cc | 2 + paddle/fluid/framework/CMakeLists.txt | 18 +++---- .../framework/details/nan_inf_utils_detail.h | 5 +- paddle/fluid/framework/dlpack_tensor_test.cc | 2 + paddle/fluid/framework/tensor.cc | 29 ----------- paddle/fluid/framework/tensor.h | 50 +------------------ paddle/fluid/framework/tensor_impl.h | 45 ----------------- paddle/fluid/framework/tensor_test.cc | 1 + paddle/fluid/framework/tensor_util.h | 21 ++++++++ .../tensorrt/plugin/gather_nd_op_plugin.cu | 1 + .../fluid/operators/gather_scatter_kernel.h | 2 + paddle/fluid/operators/math/cross_entropy.h | 1 + paddle/fluid/operators/math/sample_prob.h | 1 + paddle/fluid/operators/math/softmax_impl.h | 4 ++ paddle/fluid/operators/math/unpooling.h | 1 + paddle/phi/core/dense_tensor.h | 32 +++++++++++- 16 files changed, 77 insertions(+), 138 deletions(-) delete mode 100644 paddle/fluid/framework/tensor.cc delete mode 100644 paddle/fluid/framework/tensor_impl.h diff --git a/paddle/fluid/eager/nan_inf_utils.cc b/paddle/fluid/eager/nan_inf_utils.cc index f8c06a5afff..e15b91e480a 100644 --- a/paddle/fluid/eager/nan_inf_utils.cc +++ b/paddle/fluid/eager/nan_inf_utils.cc @@ -15,6 +15,8 @@ #include "paddle/fluid/eager/nan_inf_utils.h" #include "paddle/fluid/framework/details/nan_inf_utils_detail.h" +#include "paddle/phi/backends/cpu/cpu_context.h" +#include "paddle/phi/backends/gpu/gpu_context.h" #include "paddle/phi/core/dense_tensor.h" #include "paddle/phi/core/selected_rows.h" diff --git a/paddle/fluid/framework/CMakeLists.txt b/paddle/fluid/framework/CMakeLists.txt index 8af48ef51db..2e189e4865f 100755 --- a/paddle/fluid/framework/CMakeLists.txt +++ b/paddle/fluid/framework/CMakeLists.txt @@ -83,26 +83,27 @@ if(WITH_GPU) windows_symbolic(tensor_util SRCS tensor_util.cu) nv_library( tensor - SRCS tensor.cc .tensor_util.cu + SRCS .tensor_util.cu DEPS place memory data_type device_context dense_tensor) add_dependencies(tensor tensor_util) else() nv_library( tensor - SRCS tensor.cc tensor_util.cu - DEPS place memory data_type device_context profiler dense_tensor) + SRCS tensor_util.cu + DEPS place memory data_type device_context dense_tensor) endif() elseif(WITH_ROCM) hip_library( tensor - SRCS tensor.cc tensor_util.cu - DEPS place memory data_type device_context profiler dense_tensor) + SRCS tensor_util.cu + DEPS place memory data_type device_context dense_tensor) else() cc_library( tensor - SRCS tensor.cc tensor_util.cc - DEPS place memory data_type device_context profiler dense_tensor) + SRCS tensor_util.cc + DEPS place memory data_type device_context dense_tensor) endif() +# target_link(tensor profiler) cc_test( tensor_test @@ -1167,9 +1168,6 @@ cc_library( op_meta_info phi_api) -#cc_binary(test_executor SRCS test_executor.cc DEPS executor op_registry ${GLOB_OP_LIB} ${GLOB_OPERATOR_DEPS} ) -#cc_binary(new_executor SRCS new_exec_test.cc DEPS operator op_registry executor ${GLOB_OP_LIB} ${GLOB_OPERATOR_DEPS} profiler) - set(FLUID_FRAMEWORK_MODULES proto_desc memory diff --git a/paddle/fluid/framework/details/nan_inf_utils_detail.h b/paddle/fluid/framework/details/nan_inf_utils_detail.h index 226a1db1d3b..99186c43e12 100644 --- a/paddle/fluid/framework/details/nan_inf_utils_detail.h +++ b/paddle/fluid/framework/details/nan_inf_utils_detail.h @@ -17,12 +17,9 @@ #include #include "paddle/fluid/framework/tensor.h" +#include "paddle/fluid/platform/complex.h" #include "paddle/fluid/platform/place.h" -namespace phi { -class DenseTensor; -} // namespace phi - namespace paddle { namespace framework { namespace details { diff --git a/paddle/fluid/framework/dlpack_tensor_test.cc b/paddle/fluid/framework/dlpack_tensor_test.cc index 6c19cf3450d..9e3604e71a2 100644 --- a/paddle/fluid/framework/dlpack_tensor_test.cc +++ b/paddle/fluid/framework/dlpack_tensor_test.cc @@ -17,6 +17,8 @@ #include #include +#include "paddle/fluid/platform/device/gpu/gpu_info.h" + namespace paddle { namespace framework { diff --git a/paddle/fluid/framework/tensor.cc b/paddle/fluid/framework/tensor.cc deleted file mode 100644 index 2f0c7c5b2c8..00000000000 --- a/paddle/fluid/framework/tensor.cc +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. */ - -#include "paddle/fluid/framework/tensor.h" - -DECLARE_bool(use_stream_safe_cuda_allocator); - -namespace paddle { -namespace memory { -namespace allocation { -class Allocation; -} // namespace allocation -} // namespace memory -} // namespace paddle - -namespace paddle { -namespace framework {} // namespace framework -} // namespace paddle diff --git a/paddle/fluid/framework/tensor.h b/paddle/fluid/framework/tensor.h index 8b79d407911..fcb061aa932 100644 --- a/paddle/fluid/framework/tensor.h +++ b/paddle/fluid/framework/tensor.h @@ -14,63 +14,15 @@ limitations under the License. */ #pragma once -#include -#include -#include -#include -#include -#include - -#include "paddle/fluid/framework/data_layout.h" -#include "paddle/fluid/framework/framework.pb.h" +#include "paddle/fluid/framework/data_type.h" #include "paddle/fluid/framework/mixed_vector.h" -#include "paddle/fluid/memory/memory.h" -#include "paddle/fluid/platform/device_context.h" -#include "paddle/fluid/platform/enforce.h" -#include "paddle/fluid/platform/place.h" -#include "paddle/phi/core/ddim.h" #include "paddle/phi/core/dense_tensor.h" namespace paddle { - namespace framework { using LoD = std::vector>; - -/* - NOTE(liym27): [ What is TensorInplaceVersion used for? ] - - TensorInplaceVersion is a version counter and every Tensor has a version - counter. It's used to check whether an inplace operation will result in an - incorrect gradient calculation. Version is incremented when the data of the - Variable is modified in place. - - - Question: In what scenarios will version counters be shared? - - Answer: When two Variables/VarBases share the same C++ Tensor(its Allocation - may change), both of them share the same version counter. For examples: - 1. `z = paddle.assign(input=x, output=y)`, `z` shares the same version counter - of `y` because z and y is the same VarBase; - 2. `y = x.detach()`, `y` shares the same version counter of `x`. - - - Question: In what scenarios will version counters NOT be shared? - - Answer: Replacing a `Variable`'s data by calling `Tensor::ShareDataWith(...)` - or `Tensor::ShareBufferWith(...)`. Because they share the same Allocation but - not framework::Tensor. - - - Question: Why put the inplace_version_counter_ in framework::Tensor instead - of Allocation or Variable? - - Answer: - 1. Tensor can call ResetHolder() to reset the corresponding Allocation so that - the inplace_version_counter_ changes if it's in Allocation, which will lead to - confusing information about inplace version. - 2. If inplace_version_counter_ is in Variable, different VariableWrappers - should be able to share the same Variable. However, a VariableWrapper hold a - Variable object but not a pointer. -*/ - using Tensor = phi::DenseTensor; } // namespace framework } // namespace paddle - -#include "paddle/fluid/framework/tensor_impl.h" diff --git a/paddle/fluid/framework/tensor_impl.h b/paddle/fluid/framework/tensor_impl.h deleted file mode 100644 index b314fb15195..00000000000 --- a/paddle/fluid/framework/tensor_impl.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. */ - -#pragma once -#include "paddle/fluid/framework/data_type.h" -#include "paddle/fluid/memory/memcpy.h" -#include "paddle/fluid/platform/enforce.h" -#include "paddle/fluid/platform/float16.h" - -namespace paddle { -namespace framework { - -inline Tensor ReshapeToMatrix(const Tensor& src, int num_col_dims) { - int rank = src.dims().size(); - PADDLE_ENFORCE_GE( - rank, - 2, - platform::errors::InvalidArgument( - "'ReshapeToMatrix()' is only used for flatten high rank " - "tensors to matrixs. The dimensions of Tensor must be " - "greater or equal than 2. " - "But received dimensions of Tensor is %d", - rank)); - if (rank == 2) { - return src; - } - Tensor res; - res.ShareDataWith(src); - res.Resize(phi::flatten_to_2d(src.dims(), num_col_dims)); - return res; -} - -} // namespace framework -} // namespace paddle diff --git a/paddle/fluid/framework/tensor_test.cc b/paddle/fluid/framework/tensor_test.cc index 05dd41eb6ff..fcf255dafc2 100644 --- a/paddle/fluid/framework/tensor_test.cc +++ b/paddle/fluid/framework/tensor_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "paddle/fluid/framework/tensor.h" +#include "paddle/fluid/framework/tensor_util.h" #include diff --git a/paddle/fluid/framework/tensor_util.h b/paddle/fluid/framework/tensor_util.h index b1bba0f7c35..3c9d1284cef 100644 --- a/paddle/fluid/framework/tensor_util.h +++ b/paddle/fluid/framework/tensor_util.h @@ -34,6 +34,7 @@ limitations under the License. */ #include "paddle/fluid/platform/device/mlu/device_context.h" #endif +#include "paddle/fluid/memory/memory.h" #include "paddle/phi/core/dense_tensor.h" namespace paddle { @@ -580,6 +581,26 @@ inline void TensorToVector(const Tensor& src, std::vector* dst) { std::ostream& operator<<(std::ostream& os, const LoD& lod); +inline Tensor ReshapeToMatrix(const Tensor& src, int num_col_dims) { + int rank = src.dims().size(); + PADDLE_ENFORCE_GE( + rank, + 2, + platform::errors::InvalidArgument( + "'ReshapeToMatrix()' is only used for flatten high rank " + "tensors to matrixs. The dimensions of Tensor must be " + "greater or equal than 2. " + "But received dimensions of Tensor is %d", + rank)); + if (rank == 2) { + return src; + } + Tensor res; + res.ShareDataWith(src); + res.Resize(phi::flatten_to_2d(src.dims(), num_col_dims)); + return res; +} + } // namespace framework } // namespace paddle diff --git a/paddle/fluid/inference/tensorrt/plugin/gather_nd_op_plugin.cu b/paddle/fluid/inference/tensorrt/plugin/gather_nd_op_plugin.cu index f47a65d1045..046a725b2bd 100644 --- a/paddle/fluid/inference/tensorrt/plugin/gather_nd_op_plugin.cu +++ b/paddle/fluid/inference/tensorrt/plugin/gather_nd_op_plugin.cu @@ -23,6 +23,7 @@ #include "NvInferRuntimeCommon.h" #include "paddle/fluid/inference/tensorrt/plugin/gather_nd_op_plugin.h" #include "paddle/fluid/platform/place.h" +#include "paddle/phi/backends/gpu/gpu_helper.h" namespace paddle { namespace inference { diff --git a/paddle/fluid/operators/gather_scatter_kernel.h b/paddle/fluid/operators/gather_scatter_kernel.h index c8a63e4c35a..6aa6e4ff7b8 100644 --- a/paddle/fluid/operators/gather_scatter_kernel.h +++ b/paddle/fluid/operators/gather_scatter_kernel.h @@ -13,6 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. */ #include "paddle/fluid/framework/tensor.h" +#include "paddle/fluid/platform/device_context.h" +#include "paddle/fluid/platform/float16.h" #pragma once diff --git a/paddle/fluid/operators/math/cross_entropy.h b/paddle/fluid/operators/math/cross_entropy.h index 8cb7fad48e9..0de10789ba0 100644 --- a/paddle/fluid/operators/math/cross_entropy.h +++ b/paddle/fluid/operators/math/cross_entropy.h @@ -17,6 +17,7 @@ limitations under the License. */ #include "paddle/fluid/framework/eigen.h" #include "paddle/fluid/framework/tensor.h" +#include "paddle/fluid/platform/float16.h" #include "paddle/phi/core/hostdevice.h" namespace paddle { diff --git a/paddle/fluid/operators/math/sample_prob.h b/paddle/fluid/operators/math/sample_prob.h index 1e8fb983a94..ad4d3489c21 100644 --- a/paddle/fluid/operators/math/sample_prob.h +++ b/paddle/fluid/operators/math/sample_prob.h @@ -20,6 +20,7 @@ limitations under the License. */ #include "paddle/fluid/framework/eigen.h" #include "paddle/fluid/framework/tensor.h" #include "paddle/fluid/operators/math/sampler.h" +#include "paddle/phi/backends/gpu/gpu_context.h" #include "paddle/phi/core/ddim.h" namespace paddle { diff --git a/paddle/fluid/operators/math/softmax_impl.h b/paddle/fluid/operators/math/softmax_impl.h index 18cd3e7261d..7cf7b252335 100644 --- a/paddle/fluid/operators/math/softmax_impl.h +++ b/paddle/fluid/operators/math/softmax_impl.h @@ -19,7 +19,11 @@ limitations under the License. */ #include "paddle/fluid/framework/tensor.h" #include "paddle/fluid/operators/jit/kernels.h" #include "paddle/fluid/operators/math/cpu_vec.h" +#include "paddle/fluid/platform/bfloat16.h" #include "paddle/fluid/platform/cpu_info.h" +#include "paddle/fluid/platform/float16.h" +#include "paddle/phi/backends/cpu/cpu_context.h" +#include "paddle/phi/backends/gpu/gpu_context.h" namespace paddle { namespace operators { diff --git a/paddle/fluid/operators/math/unpooling.h b/paddle/fluid/operators/math/unpooling.h index 30b6db78f31..1b0f52dacd9 100644 --- a/paddle/fluid/operators/math/unpooling.h +++ b/paddle/fluid/operators/math/unpooling.h @@ -14,6 +14,7 @@ limitations under the License. */ #pragma once #include "paddle/fluid/framework/tensor.h" +#include "paddle/fluid/platform/device_context.h" namespace paddle { namespace operators { diff --git a/paddle/phi/core/dense_tensor.h b/paddle/phi/core/dense_tensor.h index 09098705b11..d16a019c7ab 100644 --- a/paddle/phi/core/dense_tensor.h +++ b/paddle/phi/core/dense_tensor.h @@ -22,7 +22,7 @@ limitations under the License. */ /* @jim19930609: Move to MKLDNN_Tensor in the future */ #ifdef PADDLE_WITH_MKLDNN -#include "dnnl.hpp" +#include "dnnl.hpp" // NOLINT #endif namespace phi { @@ -174,6 +174,36 @@ class DenseTensor : public TensorBase, /* Temporarily put InplaceVersion inside DenseTensor. Will move to AutogradMeta as soon as we switch to Eager Dygraph. */ + /* + NOTE(liym27): [ What is TensorInplaceVersion used for? ] + + TensorInplaceVersion is a version counter and every Tensor has a version + counter. It's used to check whether an inplace operation will result in an + incorrect gradient calculation. Version is incremented when the data of the + Variable is modified in place. + + - Question: In what scenarios will version counters be shared? + - Answer: When two Variables/VarBases share the same C++ Tensor(its Allocation + may change), both of them share the same version counter. For examples: + 1. `z = paddle.assign(input=x, output=y)`, `z` shares the same version + counter of `y` because z and y is the same VarBase; + 2. `y = x.detach()`, `y` shares the same version counter of `x`. + + - Question: In what scenarios will version counters NOT be shared? + - Answer: Replacing a `Variable`'s data by calling + `Tensor::ShareDataWith(...)` or `Tensor::ShareBufferWith(...)`. Because they + share the same Allocation but not framework::Tensor. + + - Question: Why put the inplace_version_counter_ in framework::Tensor instead + of Allocation or Variable? + - Answer: + 1. Tensor can call ResetHolder() to reset the corresponding Allocation so + that the inplace_version_counter_ changes if it's in Allocation, which will + lead to confusing information about inplace version. + 2. If inplace_version_counter_ is in Variable, different VariableWrappers + should be able to share the same Variable. However, a VariableWrapper hold a + Variable object but not a pointer. + */ class InplaceVersion { public: bool IsUnique() const { return inplace_version_ == 0; } -- GitLab