Skip to content

[API Compatiblity] Support the Args Mapper mechanism when the Python API is integrated into the C++ layer #74750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 22, 2025
Merged

[API Compatiblity] Support the Args Mapper mechanism when the Python API is integrated into the C++ layer #74750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f8e0e5
support args mapper
DanielSun11 Aug 19, 2025
9919276
Merge branch 'PaddlePaddle:develop' into arg_mapper
DanielSun11 Aug 19, 2025
5058ab9
format
DanielSun11 Aug 19, 2025
4afe55d
fix none
DanielSun11 Aug 19, 2025
195fbc5
add test time out
DanielSun11 Aug 20, 2025
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
33 changes: 15 additions & 18 deletions paddle/fluid/eager/auto_code_generator/generator/codegen_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,10 +499,8 @@ def __init__(self, forward_api_contents, namespace):
self.dygraph_pre_process = (
"" # The pre_process function calling code for dygraph
)
self.static_pre_process = (
"" # The pre_process function calling code for static graph
)
self.args_parser_func_name = "" # The custom args parser function

self.args_mapper_func_name = None # The custom args parser function
self.python_api_names = ""

def ParseForwardInplaceInfo(self):
Expand Down Expand Up @@ -535,20 +533,19 @@ def ParsePythonAPIInfo(self):
self.args_alias_map = args_alias
if 'pre_process' in python_api_info.keys():
pre_process = python_api_info['pre_process']
if 'func' in pre_process.keys():
self.dygraph_pre_process = pre_process['func']
self.static_pre_process = pre_process['func']
# TODO check len(pre_process) > 1

if 'dygraph_func' in pre_process.keys():
self.dygraph_pre_process = pre_process['dygraph_func']
if 'static_func' in pre_process.keys():
self.static_pre_process = pre_process['static_func']
if (
'args_parser' in python_api_info.keys()
and 'func' in python_api_info['args_parser']
):
self.args_parser_func_name = python_api_info['args_parser']['func']
if pre_process is not None:
if 'dygraph_func' in pre_process.keys():
self.dygraph_pre_process = pre_process['dygraph_func']
elif 'func' in pre_process.keys():
self.dygraph_pre_process = pre_process['func']

if 'args_mapper' in python_api_info.keys():
args_mapper = python_api_info['args_mapper']
if args_mapper is not None:
if 'dygraph_func' in args_mapper.keys():
self.args_mapper_func_name = args_mapper['dygraph_func']
elif 'func' in args_mapper.keys():
self.args_mapper_func_name = args_mapper['func']

def ParseNoNeedBuffer(self):
grad_api_contents = self.grad_api_contents
Expand Down
138 changes: 89 additions & 49 deletions paddle/fluid/eager/auto_code_generator/generator/python_c_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@ def FindParsingFunctionFromAttributeType(atype):
"""
CALL_PRE_PROCESS_TEMPLATE = """ {};
"""
PARAMS_DECLARE_TEMPLE = """ {type} {name};\n"""
CALL_ARGS_MAPPER_TEMPLATE = """ {func_name}(args,kwargs{params});
"""
DISABLE_TIPS = (
" // This part of the function will be performed by a custom args mapper"
)
RECORD_EVENT_TEMPLATE = (
'phi::RecordEvent {}("{} {}", phi::TracerEventType::UserDefined, 1);'
)
Expand All @@ -152,6 +158,10 @@ def FindParsingFunctionFromAttributeType(atype):
// Parse Attributes if needed
{}
// Check Reminding Params validity if needed
{}
// Custom Args Mapper if need
{}
// Convert to Dist
{}
// Call Pre_Process before calling dygraph function if needed
{}
Expand Down Expand Up @@ -234,7 +244,7 @@ def FindParsingFunctionFromAttributeType(atype):
#include "paddle/fluid/pybind/eager.h"
#include "paddle/fluid/pybind/eager_op_function.h"
#include "paddle/fluid/pybind/arg_pre_process.h"

#include "paddle/fluid/pybind/args_mapper.h"
namespace paddle {{
namespace pybind {{

Expand Down Expand Up @@ -384,10 +394,10 @@ def GeneratePythonCFunction(self, no_input_out_tensor=False):
forward_inputs_position_map
)
dygraph_pre_process = self.dygraph_pre_process

args_mapper_func = self.args_mapper_func_name
inplace_args_pos_map = {}
inplace_returns_pos_map = {}
get_params_nums_and_check_str = "// NO NEED"
get_params_nums_and_check_str = " // NO NEED"
if need_parse_python_api_args:
get_params_nums_and_check_str = (
PARSE_PYTHON_C_NUM_ARGS_TEMPLATE.format(max_args)
Expand Down Expand Up @@ -480,52 +490,7 @@ def _get_keywords(name, alias_map):
keywords,
"false",
)
# No inputs, skip convert to DistTensor
if len(input_names) > 0:
optional_and_vector_convert_code = ""
for name, (ttype, pos) in forward_inputs_position_map.items():
is_optional = name in optional_inputs
if IsVectorTensorType(ttype):
if is_optional:
optional_and_vector_convert_code += CONVERT_TO_DISTTENSOR_AND_PARSE_PYTHON_C_TENSORS_TEMPLATE.format(
name,
"GetOptionalTensorListFromArgs",
forward_api_name,
name,
pos,
"true",
)
else:
optional_and_vector_convert_code += CONVERT_TO_DISTTENSOR_AND_PARSE_PYTHON_C_TENSORS_TEMPLATE.format(
name,
"GetTensorListFromArgs",
forward_api_name,
name,
pos,
"false",
)
else:
if is_optional:
optional_and_vector_convert_code += CONVERT_TO_DISTTENSOR_AND_PARSE_PYTHON_C_TENSORS_TEMPLATE.format(
name,
"GetOptionalTensorFromArgs",
forward_api_name,
name,
pos,
"true",
)

if len(input_single_tensor_names) > 0:
get_eager_tensor_str += CONVERT_INPUT_TENSORS_TO_DIST_TENSOR_WITH_SINGLE_TENSOR_TEMPLATE.format(
input_names=input_names,
input_single_tensor_names=input_single_tensor_names,
optional_and_vector_convert_code=optional_and_vector_convert_code,
)
else:
get_eager_tensor_str += CONVERT_INPUT_TENSORS_TO_DIST_TENSOR_WITHOUT_SINGLE_TENSOR_TEMPLATE.format(
input_names=input_names,
optional_and_vector_convert_code=optional_and_vector_convert_code,
)
if forward_inplace_map:
for name, (ttype, pos) in forward_outputs_position_map.items():
if name in forward_inplace_map.values():
Expand Down Expand Up @@ -593,7 +558,7 @@ def _get_keywords(name, alias_map):
check_remaining_params_validity_str = (
CHECK_REMAINING_ARGS_VALID_TEMPLATE
)
pre_process_str = " //NO NEED"
pre_process_str = " // NO NEED"
if need_parse_python_api_args and len(dygraph_pre_process) > 0:

def pre_process_add_ampersand(s):
Expand All @@ -602,6 +567,77 @@ def pre_process_add_ampersand(s):
pre_process_str = CALL_PRE_PROCESS_TEMPLATE.format(
pre_process_add_ampersand(dygraph_pre_process)
)
args_mapper_str = " // NO NEED"
if args_mapper_func is not None:
all_params_list = []
args_mapper_str = ""
for name, (ttype, pos) in forward_inputs_position_map.items():
args_mapper_str += PARAMS_DECLARE_TEMPLE.format(
type=ttype, name=name
)
all_params_list.append(name)
for name, atype, default_value, pos in orig_forward_attrs_list:
args_mapper_str += PARAMS_DECLARE_TEMPLE.format(
type=atype, name=name
)
all_params_list.append(name)
params = ',&' + ',&'.join(all_params_list)
args_mapper_str += CALL_ARGS_MAPPER_TEMPLATE.format(
func_name=args_mapper_func, params=params
)
# disable the generated args parser
get_params_nums_and_check_str = DISABLE_TIPS
get_eager_tensor_str = DISABLE_TIPS
parse_attributes_str = DISABLE_TIPS
check_remaining_params_validity_str = DISABLE_TIPS

convert_to_dist_str = ""
# No inputs, skip convert to DistTensor
if len(input_names) > 0:
optional_and_vector_convert_code = ""
for name, (ttype, pos) in forward_inputs_position_map.items():
is_optional = name in optional_inputs
if IsVectorTensorType(ttype):
if is_optional:
optional_and_vector_convert_code += CONVERT_TO_DISTTENSOR_AND_PARSE_PYTHON_C_TENSORS_TEMPLATE.format(
name,
"GetOptionalTensorListFromArgs",
forward_api_name,
name,
pos,
"true",
)
else:
optional_and_vector_convert_code += CONVERT_TO_DISTTENSOR_AND_PARSE_PYTHON_C_TENSORS_TEMPLATE.format(
name,
"GetTensorListFromArgs",
forward_api_name,
name,
pos,
"false",
)
else:
if is_optional:
optional_and_vector_convert_code += CONVERT_TO_DISTTENSOR_AND_PARSE_PYTHON_C_TENSORS_TEMPLATE.format(
name,
"GetOptionalTensorFromArgs",
forward_api_name,
name,
pos,
"true",
)
if len(input_single_tensor_names) > 0:
convert_to_dist_str += CONVERT_INPUT_TENSORS_TO_DIST_TENSOR_WITH_SINGLE_TENSOR_TEMPLATE.format(
input_names=input_names,
input_single_tensor_names=input_single_tensor_names,
optional_and_vector_convert_code=optional_and_vector_convert_code,
)
else:
convert_to_dist_str += CONVERT_INPUT_TENSORS_TO_DIST_TENSOR_WITHOUT_SINGLE_TENSOR_TEMPLATE.format(
input_names=input_names,
optional_and_vector_convert_code=optional_and_vector_convert_code,
)

set_device_str = FUNCTION_SET_DEVICE_TEMPLATE.format(expected_place_str)

# Generate Dygraph Function Call Logic
Expand Down Expand Up @@ -658,6 +694,8 @@ def pre_process_add_ampersand(s):
get_eager_tensor_str,
parse_attributes_str,
check_remaining_params_validity_str,
args_mapper_str,
convert_to_dist_str,
pre_process_str,
get_input_out_str,
set_device_str,
Expand Down Expand Up @@ -720,6 +758,8 @@ def pre_process_add_ampersand(s):
get_eager_tensor_str,
parse_attributes_str,
check_remaining_params_validity_str,
args_mapper_str,
convert_to_dist_str,
pre_process_str,
"",
set_device_str,
Expand Down
Loading