Skip to content

Commit ac8cce2

Browse files
authored
Fix wrong eigen header include (#46082) (#46202)
* fix wrong eigen header include * fix complie bug * fix nan_inf_utils_detail * fix resource_manager * fix conv_miopen_helper
1 parent 4bced24 commit ac8cce2

File tree

11 files changed

+10
-1
lines changed

11 files changed

+10
-1
lines changed

paddle/fluid/framework/details/nan_inf_utils_detail.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "paddle/fluid/platform/device/npu/npu_op_runner.h"
2323
#endif
2424
#include "paddle/fluid/framework/convert_utils.h"
25+
#include "paddle/phi/kernels/funcs/eigen/extensions.h"
2526

2627
namespace paddle {
2728
namespace framework {

paddle/fluid/framework/ir/conv_bn_fuse_pass.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <string>
1818

1919
#include "paddle/fluid/framework/convert_utils.h"
20+
#include "paddle/fluid/framework/eigen.h"
2021
#include "paddle/fluid/framework/lod_tensor.h"
2122
#include "paddle/fluid/framework/op_version_registry.h"
2223
#include "paddle/fluid/framework/tensor.h"

paddle/fluid/framework/tensor_util.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ limitations under the License. */
2222

2323
#include "paddle/fluid/framework/data_type.h"
2424
#include "paddle/fluid/framework/dlpack_tensor.h"
25-
#include "paddle/fluid/framework/eigen.h"
2625
#include "paddle/fluid/framework/string_array.h"
2726
#include "paddle/fluid/framework/tensor.h"
2827
#include "paddle/fluid/memory/allocation/allocator_facade.h"

paddle/fluid/inference/api/resource_manager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "paddle/phi/api/include/tensor.h"
2424
#include "paddle/phi/backends/cpu/forwards.h"
2525
#include "paddle/phi/common/place.h"
26+
#include "unsupported/Eigen/CXX11/Tensor"
2627

2728
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
2829
#include "paddle/fluid/platform/device/gpu/gpu_types.h"

paddle/fluid/operators/conv_cudnn_helper.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ limitations under the License. */
1414

1515
#pragma once
1616

17+
#include "paddle/fluid/framework/eigen.h"
1718
#include "paddle/fluid/operators/conv_base_helper.h"
1819
#include "paddle/fluid/platform/cuda_graph_with_memory_pool.h"
1920
#include "paddle/fluid/platform/device/gpu/gpu_info.h"

paddle/fluid/operators/conv_miopen_helper.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ limitations under the License. */
1414

1515
#pragma once
1616

17+
#include "paddle/fluid/framework/eigen.h"
1718
#include "paddle/fluid/operators/conv_base_helper.h"
1819

1920
namespace paddle {

paddle/fluid/operators/mean_iou_op.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ limitations under the License. */
1515
#pragma once
1616
#include <algorithm>
1717

18+
#include "paddle/fluid/framework/eigen.h"
1819
#include "paddle/fluid/framework/op_registry.h"
1920

2021
namespace paddle {

paddle/fluid/operators/partial_concat_op.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ limitations under the License. */
1515
#include <utility>
1616
#include <vector>
1717

18+
#include "paddle/fluid/framework/eigen.h"
1819
#include "paddle/fluid/framework/op_registry.h"
1920
#include "paddle/fluid/operators/math/concat_and_split.h"
2021
#include "paddle/fluid/operators/strided_memcpy.h"

paddle/fluid/operators/partial_sum_op.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ limitations under the License. */
1515
#include <utility>
1616
#include <vector>
1717

18+
#include "paddle/fluid/framework/eigen.h"
1819
#include "paddle/fluid/framework/op_registry.h"
1920

2021
namespace paddle {

paddle/fluid/pybind/tensor_py.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ limitations under the License. */
3535
#include "paddle/fluid/platform/cuda_device_guard.h"
3636
#endif
3737
#include "paddle/fluid/framework/convert_utils.h"
38+
#include "paddle/fluid/framework/eigen.h"
3839
#include "paddle/fluid/platform/device_context.h"
3940
#include "paddle/fluid/platform/float16.h"
4041
#include "paddle/fluid/platform/profiler/event_tracing.h"

0 commit comments

Comments
 (0)