Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
fce6112
move extension into pten [no-verify]
chenwhql Nov 5, 2021
47968f6
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
chenwhql Nov 5, 2021
eab3bd3
append tensor methods by ext_tensor [no-verify]
chenwhql Nov 8, 2021
639e18a
append other tensor methods [no-verify]
chenwhql Nov 8, 2021
1d655fc
ext related files tidy [no-verify]
chenwhql Nov 8, 2021
48bf466
include relation tidy [no-verify]
chenwhql Nov 8, 2021
936ac06
add pten tensor test [no-verify]
chenwhql Nov 9, 2021
1cf6219
replace tensor in custom op & compile success
chenwhql Nov 10, 2021
e59fdca
refine tensor constructor for unittest
chenwhql Nov 10, 2021
125a5f5
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
chenwhql Nov 10, 2021
4b460c7
custom relu jit run success
chenwhql Nov 11, 2021
db13794
fix all custom op unittests
chenwhql Nov 11, 2021
86fa3a0
add inference cmake adapt [no-verify]
chenwhql Nov 11, 2021
f58bbf4
fix failed unittests
chenwhql Nov 11, 2021
6e24b90
fix windows failed unittests
chenwhql Nov 11, 2021
c403f03
try to fix kunlun and inference failed
chenwhql Nov 12, 2021
98a3eff
Merge branch 'develop' into pten/refactor_custom_op
chenwhql Nov 12, 2021
e0d872e
fix test_elementwise_api error
chenwhql Nov 12, 2021
850bfa3
try to fix win compile failed
chenwhql Nov 12, 2021
3a253b7
fix kunlun fp16 type error
chenwhql Nov 12, 2021
ef8c987
remove useless haddle error macro
chenwhql Nov 12, 2021
54cc78b
add custom linear op test
chenwhql Nov 12, 2021
ff5bddb
fix compile failed & add win symbols
chenwhql Nov 13, 2021
e46af0a
Merge branch 'develop' into pten/refactor_custom_op
chenwhql Nov 13, 2021
a31387a
fix non pten kernel cast failed
chenwhql Nov 13, 2021
1e934a7
add dll decl for api
chenwhql Nov 13, 2021
e1b1819
polish several deetails
chenwhql Nov 13, 2021
f98d8be
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
chenwhql Nov 15, 2021
5d10182
polish details by review comment
chenwhql Nov 15, 2021
6fd4dbb
add dll_decl for register
chenwhql Nov 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions cmake/inference_lib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -216,18 +216,36 @@ copy(inference_lib_dist
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/crypto/)
include_directories(${CMAKE_BINARY_DIR}/../paddle/fluid/framework/io)

# TODO(chenweihang, before 11.27) Here, the header file of pten is copied to
# the experimental directory, the include path needs to be changed, so the
# header file path needs to be processed here
# copy api headers for custom op
copy(inference_lib_dist
SRCS ${PADDLE_SOURCE_DIR}/paddle/fluid/extension/include/*
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/)
SRCS ${PADDLE_SOURCE_DIR}/paddle/pten/api/ext/*
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/pten/api/ext/)
copy(inference_lib_dist
SRCS ${PADDLE_SOURCE_DIR}/paddle/pten/api/include/*
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/pten/api/include/)
copy(inference_lib_dist
SRCS ${PADDLE_SOURCE_DIR}/paddle/pten/api/all.h
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/pten/api/)
copy(inference_lib_dist
SRCS ${PADDLE_SOURCE_DIR}/paddle/pten/common/*
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/pten/common/)
copy(inference_lib_dist
SRCS ${PADDLE_SOURCE_DIR}/paddle/fluid/platform/complex.h
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/)
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/pten/common/)
copy(inference_lib_dist
SRCS ${PADDLE_SOURCE_DIR}/paddle/fluid/platform/float16.h
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/)
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/pten/common/)
copy(inference_lib_dist
SRCS ${PADDLE_SOURCE_DIR}/paddle/utils/any.h
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/)
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/utils/)
# In order to be compatible with the original behavior, the header file name needs to be changed
copy(inference_lib_dist
SRCS ${PADDLE_SOURCE_DIR}/paddle/extension.h
DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/include/experimental/ext_all.h)


# CAPI inference library for only inference
set(PADDLE_INFERENCE_C_INSTALL_DIR "${CMAKE_BINARY_DIR}/paddle_inference_c_install_dir" CACHE STRING
Expand Down
2 changes: 1 addition & 1 deletion paddle/extension.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ limitations under the License. */
#pragma once

// All paddle apis in C++ frontend
#include "paddle/extension/include/ext_all.h"
#include "paddle/pten/api/all.h"
5 changes: 5 additions & 0 deletions paddle/fluid/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Adapt to custom op mechanism: Include the header files related to the data type
# to avoid exposing the path of the underlying file, remove it after moving
# float16.h/complex.h/bfloat16.h into pten
include_directories(${PADDLE_SOURCE_DIR}/paddle/fluid/platform)

add_subdirectory(memory)
add_subdirectory(platform)
add_subdirectory(distributed)
Expand Down
99 changes: 0 additions & 99 deletions paddle/fluid/extension/include/ext_dtype.h

This file was deleted.

148 changes: 0 additions & 148 deletions paddle/fluid/extension/include/ext_tensor.h

This file was deleted.

Loading