diff --git a/paddle/fluid/extension/include/op_meta_info.h b/paddle/fluid/extension/include/op_meta_info.h index 2f3d973a8f69789774ab5d48f2fe89e339cc4e49..a670e345ba06953879a7abc44309c8569e5c8eef 100644 --- a/paddle/fluid/extension/include/op_meta_info.h +++ b/paddle/fluid/extension/include/op_meta_info.h @@ -290,12 +290,12 @@ class OpMetaInfoBuilder { /////////////////////// Op register API ///////////////////////// // For inference: compile directly with framework -// Call after PD_BUILD_OPERATOR(...) +// Call after PD_BUILD_OP(...) void RegisterAllCustomOperator(); /////////////////////// Op register Macro ///////////////////////// -#define PD_BUILD_OPERATOR(op_name) \ +#define PD_BUILD_OP(op_name) \ static ::paddle::OpMetaInfoBuilder __op_meta_info_##__COUNTER__##__ = \ ::paddle::OpMetaInfoBuilder(op_name) diff --git a/paddle/fluid/extension/src/tensor.cc b/paddle/fluid/extension/src/tensor.cc index ef747567b226c0f69fff97fa21102dc2a384548c..12f701a131e2cb8acf1921342beaa4b7f99da346 100644 --- a/paddle/fluid/extension/src/tensor.cc +++ b/paddle/fluid/extension/src/tensor.cc @@ -125,8 +125,6 @@ T *Tensor::mutable_data() { #ifdef PADDLE_WITH_CUDA case static_cast(PlaceType::kGPU): { int device_num = platform::GetCurrentDeviceId(); - VLOG(1) << "Custom Operator: mutable data cuda device id - " - << device_num; return tensor->mutable_data(platform::CUDAPlace(device_num)); } #endif diff --git a/python/paddle/fluid/tests/custom_op/relu_op3_simple.cc b/python/paddle/fluid/tests/custom_op/relu_op3_simple.cc index 9a72db10069a00aec76063de8e4399587ca146af..9df808a38a6f139a9deee80ecd393be2c1ad546b 100644 --- a/python/paddle/fluid/tests/custom_op/relu_op3_simple.cc +++ b/python/paddle/fluid/tests/custom_op/relu_op3_simple.cc @@ -31,7 +31,7 @@ std::vector ReluInferDType(paddle::DataType x_dtype); // Reuse codes in `relu_op_simple.cc/cu` to register another custom operator // to test jointly compile multi operators at same time. -PD_BUILD_OPERATOR("relu3") +PD_BUILD_OP("relu3") .Inputs({"X"}) .Outputs({"Out"}) .SetKernelFn(PD_KERNEL(ReluForward)) diff --git a/python/paddle/fluid/tests/custom_op/relu_op_simple.cc b/python/paddle/fluid/tests/custom_op/relu_op_simple.cc index 684466a734147e8f3999f3bb9e6204a88974b4e6..5abd1b77da71ffd67a570eae24e11c87987a664a 100644 --- a/python/paddle/fluid/tests/custom_op/relu_op_simple.cc +++ b/python/paddle/fluid/tests/custom_op/relu_op_simple.cc @@ -104,7 +104,7 @@ std::vector ReluInferDType(paddle::DataType x_dtype) { return {x_dtype}; } -PD_BUILD_OPERATOR("relu2") +PD_BUILD_OP("relu2") .Inputs({"X"}) .Outputs({"Out"}) .SetKernelFn(PD_KERNEL(ReluForward)) diff --git a/python/paddle/utils/cpp_extension/extension_utils.py b/python/paddle/utils/cpp_extension/extension_utils.py index f4c83998626e69430196bf166e00a597d35a2e49..ea855c7e2ca0eb56cc4a3ca9de7a3a76cd33b3c6 100644 --- a/python/paddle/utils/cpp_extension/extension_utils.py +++ b/python/paddle/utils/cpp_extension/extension_utils.py @@ -612,7 +612,7 @@ def parse_op_name_from(sources): def regex(content): if USING_NEW_CUSTOM_OP_LOAD_METHOD: - pattern = re.compile(r'BUILD_OPERATOR\(([^,]+),') + pattern = re.compile(r'PD_BUILD_OP\(([^,\)]+)\)') else: pattern = re.compile(r'REGISTER_OPERATOR\(([^,]+),')