From 96bcf2dfaba6145bbe4e7a58ffe7137b9946872f Mon Sep 17 00:00:00 2001 From: Chen Weihang Date: Sat, 29 Jan 2022 15:22:02 +0800 Subject: [PATCH] rename utils to manual (#39320) --- paddle/pten/api/CMakeLists.txt | 2 +- paddle/pten/api/all.h | 2 +- paddle/pten/api/include/{utils.h => manual_api.h} | 5 +++++ paddle/pten/api/lib/CMakeLists.txt | 8 ++++---- paddle/pten/api/lib/{utils.cc => manual_api.cc} | 2 +- paddle/pten/api/lib/tensor.cc | 2 +- paddle/pten/tests/api/CMakeLists.txt | 4 ++-- paddle/pten/tests/api/test_to_api.cc | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) rename paddle/pten/api/include/{utils.h => manual_api.h} (88%) rename paddle/pten/api/lib/{utils.cc => manual_api.cc} (98%) diff --git a/paddle/pten/api/CMakeLists.txt b/paddle/pten/api/CMakeLists.txt index 0491363eda..89f115524f 100644 --- a/paddle/pten/api/CMakeLists.txt +++ b/paddle/pten/api/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory(lib) -cc_library(pten_api SRCS all.cc DEPS pten_function_api pten_bw_function_api utils_api) +cc_library(pten_api SRCS all.cc DEPS pten_function_api pten_bw_function_api manual_api) diff --git a/paddle/pten/api/all.h b/paddle/pten/api/all.h index 5744b18c4d..bf39ee2729 100644 --- a/paddle/pten/api/all.h +++ b/paddle/pten/api/all.h @@ -26,8 +26,8 @@ limitations under the License. */ // new pten apis #include "paddle/pten/api/include/api.h" +#include "paddle/pten/api/include/manual_api.h" #include "paddle/pten/api/include/tensor.h" -#include "paddle/pten/api/include/utils.h" // pten common headers #include "paddle/pten/common/backend.h" diff --git a/paddle/pten/api/include/utils.h b/paddle/pten/api/include/manual_api.h similarity index 88% rename from paddle/pten/api/include/utils.h rename to paddle/pten/api/include/manual_api.h index b8b955090b..3bd7e60154 100644 --- a/paddle/pten/api/include/utils.h +++ b/paddle/pten/api/include/manual_api.h @@ -17,6 +17,11 @@ limitations under the License. */ #include "paddle/pten/api/include/tensor.h" #include "paddle/pten/common/backend.h" +/** + * This file stores some special APIs that are implemented manually + * or difficult to automatically generated. + */ + namespace paddle { namespace experimental { diff --git a/paddle/pten/api/lib/CMakeLists.txt b/paddle/pten/api/lib/CMakeLists.txt index 3fe4baca77..b4a9c65d55 100644 --- a/paddle/pten/api/lib/CMakeLists.txt +++ b/paddle/pten/api/lib/CMakeLists.txt @@ -3,11 +3,11 @@ add_subdirectory(utils) cc_library(ext_compat_utils SRCS ext_compat_utils.cc DEPS place) if (WITH_GPU) - nv_library(pten_tensor SRCS tensor.cc DEPS tensor_base dense_tensor pten_api_utils ext_compat_utils pten_enforce utils_api pten_function_api) + nv_library(pten_tensor SRCS tensor.cc DEPS tensor_base dense_tensor pten_api_utils ext_compat_utils pten_enforce manual_api pten_function_api) elseif (WITH_ROCM) - hip_library(pten_tensor SRCS tensor.cc DEPS tensor_base dense_tensor pten_api_utils ext_compat_utils pten_enforce utils_api pten_function_api) + hip_library(pten_tensor SRCS tensor.cc DEPS tensor_base dense_tensor pten_api_utils ext_compat_utils pten_enforce manual_api pten_function_api) else() - cc_library(pten_tensor SRCS tensor.cc DEPS tensor_base dense_tensor pten_api_utils ext_compat_utils pten_enforce utils_api pten_function_api) + cc_library(pten_tensor SRCS tensor.cc DEPS tensor_base dense_tensor pten_api_utils ext_compat_utils pten_enforce manual_api pten_function_api) endif() cc_library(kernel_dispatch SRCS kernel_dispatch.cc DEPS pten_tensor pten_context kernel_factory) @@ -62,6 +62,6 @@ add_custom_command( DEPENDS ${bw_api_yaml_file} ${bw_api_gen_file} VERBATIM) -cc_library(utils_api SRCS utils.cc DEPS pten_tensor pten kernel_dispatch) +cc_library(manual_api SRCS manual_api.cc DEPS pten_tensor pten kernel_dispatch) cc_library(pten_function_api SRCS ${api_source_file} DEPS pten_tensor pten kernel_dispatch) cc_library(pten_bw_function_api SRCS ${bw_api_source_file} DEPS pten_tensor pten kernel_dispatch backward_infermeta pten_function_api) diff --git a/paddle/pten/api/lib/utils.cc b/paddle/pten/api/lib/manual_api.cc similarity index 98% rename from paddle/pten/api/lib/utils.cc rename to paddle/pten/api/lib/manual_api.cc index aacbfb15ed..c7d05533bb 100644 --- a/paddle/pten/api/lib/utils.cc +++ b/paddle/pten/api/lib/manual_api.cc @@ -12,7 +12,7 @@ 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/pten/api/include/utils.h" +#include "paddle/pten/api/include/manual_api.h" #include diff --git a/paddle/pten/api/lib/tensor.cc b/paddle/pten/api/lib/tensor.cc index 5ab6e5e763..ef84e2a8c8 100644 --- a/paddle/pten/api/lib/tensor.cc +++ b/paddle/pten/api/lib/tensor.cc @@ -19,7 +19,7 @@ limitations under the License. */ #include #include "glog/logging.h" -#include "paddle/pten/api/include/utils.h" +#include "paddle/pten/api/include/manual_api.h" #include "paddle/pten/api/lib/ext_compat_utils.h" #include "paddle/pten/api/lib/utils/allocator.h" #include "paddle/pten/api/lib/utils/storage.h" diff --git a/paddle/pten/tests/api/CMakeLists.txt b/paddle/pten/tests/api/CMakeLists.txt index e9faa22c4e..1da7fb9613 100644 --- a/paddle/pten/tests/api/CMakeLists.txt +++ b/paddle/pten/tests/api/CMakeLists.txt @@ -1,7 +1,7 @@ if(WITH_ROCM) - hip_test(test_pten_tensor SRCS test_pten_tensor.cc DEPS pten_tensor pten_function_api utils_api glog) + hip_test(test_pten_tensor SRCS test_pten_tensor.cc DEPS pten_tensor pten_function_api manual_api glog) else() - cc_test(test_pten_tensor SRCS test_pten_tensor.cc DEPS pten_tensor pten_function_api utils_api glog) + cc_test(test_pten_tensor SRCS test_pten_tensor.cc DEPS pten_tensor pten_function_api manual_api glog) endif() cc_test(test_pten_exception SRCS test_pten_exception.cc DEPS gtest) diff --git a/paddle/pten/tests/api/test_to_api.cc b/paddle/pten/tests/api/test_to_api.cc index 3a1692603b..641c9e186d 100644 --- a/paddle/pten/tests/api/test_to_api.cc +++ b/paddle/pten/tests/api/test_to_api.cc @@ -15,7 +15,7 @@ limitations under the License. */ #include #include -#include "paddle/pten/api/include/utils.h" +#include "paddle/pten/api/include/manual_api.h" #include "paddle/pten/api/lib/utils/allocator.h" #include "paddle/pten/core/dense_tensor.h" -- GitLab