Skip to content

Commit 3121f88

Browse files
chenwhqlchenwhql
authored
change api->include and hapi->api (#36938)
1 parent 10b039b commit 3121f88

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+343
-342
lines changed

‎paddle/fluid/framework/operator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ limitations under the License. */
4040
#include "paddle/fluid/platform/variant.h"
4141
#include "paddle/utils/flat_hash_map.h"
4242

43-
#include "paddle/pten/api/include/core.h"
43+
#include "paddle/pten/include/core.h"
4444

4545
namespace paddle {
4646
namespace framework {

‎paddle/fluid/framework/pten_utils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ limitations under the License. */
2525
#include "paddle/fluid/imperative/type_defs.h"
2626
#include "paddle/fluid/platform/macros.h"
2727
#include "paddle/fluid/platform/place.h"
28-
#include "paddle/pten/api/include/core.h"
29-
#include "paddle/pten/hapi/lib/utils/tensor_utils.h"
28+
#include "paddle/pten/api/lib/utils/tensor_utils.h"
29+
#include "paddle/pten/include/core.h"
3030
#include "paddle/utils/flat_hash_map.h"
3131
#include "paddle/utils/small_vector.h"
3232

‎paddle/fluid/imperative/prepared_operator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "paddle/fluid/imperative/layer.h"
2828
#include "paddle/fluid/imperative/type_defs.h"
2929

30-
#include "paddle/pten/api/include/core.h"
30+
#include "paddle/pten/include/core.h"
3131

3232
DECLARE_bool(use_mkldnn);
3333

‎paddle/fluid/operators/dot_op.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include "paddle/fluid/platform/for_range.h"
2121

2222
// only can include the headers in paddle/pten/api dirs
23-
#include "paddle/pten/api/include/core.h"
24-
#include "paddle/pten/api/include/linalg.h"
25-
#include "paddle/pten/hapi/lib/utils/tensor_utils.h"
23+
#include "paddle/pten/api/lib/utils/tensor_utils.h"
24+
#include "paddle/pten/include/core.h"
25+
#include "paddle/pten/include/linalg.h"
2626

2727
namespace paddle {
2828
namespace operators {

‎paddle/fluid/operators/fill_any_like_op.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ limitations under the License. */
1919
#include "paddle/fluid/framework/op_registry.h"
2020
#include "paddle/fluid/framework/pten_utils.h"
2121

22-
#include "paddle/pten/api/include/core.h"
23-
#include "paddle/pten/api/include/creation.h"
22+
#include "paddle/pten/include/core.h"
23+
#include "paddle/pten/include/creation.h"
2424

2525
namespace paddle {
2626
namespace operators {

‎paddle/fluid/operators/matmul_v2_op.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ limitations under the License. */
2626
#include "paddle/fluid/operators/reduce_ops/reduce_sum_op.h"
2727

2828
// only can include the headers in paddle/pten/api dirs
29-
#include "paddle/pten/api/include/core.h"
30-
#include "paddle/pten/api/include/linalg.h"
31-
#include "paddle/pten/hapi/lib/utils/tensor_utils.h"
29+
#include "paddle/pten/api/lib/utils/tensor_utils.h"
30+
#include "paddle/pten/include/core.h"
31+
#include "paddle/pten/include/linalg.h"
3232

3333
#if defined(__NVCC__) || defined(__HIPCC__)
3434
#include "paddle/fluid/operators/reduce_ops/cub_reduce.h"

‎paddle/fluid/operators/mean_op.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ limitations under the License. */
1818
#include "paddle/fluid/framework/pten_utils.h"
1919

2020
// only can include the headers in paddle/top/api dirs
21-
#include "paddle/pten/api/include/core.h"
22-
#include "paddle/pten/api/include/math.h"
23-
#include "paddle/pten/hapi/lib/utils/tensor_utils.h"
21+
#include "paddle/pten/api/lib/utils/tensor_utils.h"
22+
#include "paddle/pten/include/core.h"
23+
#include "paddle/pten/include/math.h"
2424

2525
namespace paddle {
2626
namespace operators {

‎paddle/fluid/operators/scale_op.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ limitations under the License. */
1818
#include "paddle/fluid/framework/pten_utils.h"
1919

2020
// only can include the headers in paddle/top/api dirs
21-
#include "paddle/pten/api/include/core.h"
22-
#include "paddle/pten/api/include/math.h"
23-
#include "paddle/pten/hapi/lib/utils/tensor_utils.h"
21+
#include "paddle/pten/api/lib/utils/tensor_utils.h"
22+
#include "paddle/pten/include/core.h"
23+
#include "paddle/pten/include/math.h"
2424

2525
namespace paddle {
2626
namespace operators {

‎paddle/fluid/operators/sign_op.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ limitations under the License. */
2020
#include "paddle/fluid/operators/eigen/eigen_function.h"
2121

2222
// only can include the headers in paddle/pten/api dirs
23-
#include "paddle/pten/api/include/core.h"
24-
#include "paddle/pten/api/include/math.h"
23+
#include "paddle/pten/include/core.h"
24+
#include "paddle/pten/include/math.h"
2525

2626
namespace paddle {
2727
namespace operators {

‎paddle/pten/CMakeLists.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# pten api
1+
# pten (low level) api headers: include
2+
# pten (high level) api
23
add_subdirectory(api)
3-
# pten high level api
4-
add_subdirectory(hapi)
54
# pten core components
65
add_subdirectory(core)
76
# pten kernels for diff device
@@ -10,3 +9,13 @@ add_subdirectory(kernels)
109
add_subdirectory(infershape)
1110
# pten tests
1211
add_subdirectory(tests)
12+
13+
# make an unity target for compile deps
14+
set(PTEN_DEPS convert_utils dense_tensor kernel_factory kernel_context)
15+
set(PTEN_DEPS ${PTEN_DEPS} math_cpu linalg_cpu creation_cpu manipulation_cpu)
16+
set(PTEN_DEPS ${PTEN_DEPS} unary binary)
17+
if(WITH_GPU OR WITH_ROCM)
18+
set(PTEN_DEPS ${PTEN_DEPS} math_cuda linalg_cuda creation_cuda manipulation_cuda)
19+
endif()
20+
21+
cc_library(pten SRCS all.cc DEPS ${PTEN_DEPS})

0 commit comments

Comments
 (0)