Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions paddle/cinn/hlir/dialect/operator/ir/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# not found under CINN_ONLY mode
if(NOT CINN_ONLY)
set(CINN_DIALECT_SOURCE_DIR
"${PADDLE_SOURCE_DIR}/paddle/cinn/hlir/dialect/operator/ir")
"${PADDLE_BINARY_DIR}/paddle/cinn/hlir/dialect/operator/ir")

# Generate cinn_op_dialect files defining op using op_gen_file
set(cinn_op_gen_parsed_yaml_file
Expand All @@ -17,7 +17,7 @@ if(NOT CINN_ONLY)
set(cinn_op_yaml_file
${PADDLE_SOURCE_DIR}/paddle/cinn/hlir/dialect/operator/ir/ops.yaml)

set(parsed_op_dir ${PADDLE_SOURCE_DIR}/paddle/cinn/hlir/dialect/generated)
set(parsed_op_dir ${PADDLE_BINARY_DIR}/paddle/cinn/hlir/dialect/generated)

set(cinn_op_parsed_yaml_file ${parsed_op_dir}/ops.parsed.yaml)

Expand Down
94 changes: 60 additions & 34 deletions paddle/fluid/operators/generator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,31 +144,46 @@ message(

execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generator
COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops
COMMAND ${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${op_yaml_file}
--output_path ./parsed_ops/ops.parsed.yaml
COMMAND ${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${legacy_op_yaml_file}
--output_path ./parsed_ops/legacy_ops.parsed.yaml
COMMAND ${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${bw_op_yaml_file}
--output_path ./parsed_ops/backward_ops.parsed.yaml --backward
--output_path ${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/ops.parsed.yaml
COMMAND
${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${legacy_op_yaml_file}
--output_path ${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/legacy_ops.parsed.yaml
COMMAND
${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${bw_op_yaml_file}
--output_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/backward_ops.parsed.yaml --backward
COMMAND
${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${legacy_bw_op_yaml_file}
--output_path ./parsed_ops/legacy_backward_ops.parsed.yaml --backward
COMMAND ${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${static_op_yaml_file}
--output_path ./parsed_ops/static_ops.parsed.yaml
COMMAND ${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${fused_op_yaml_file}
--output_path ./parsed_ops/fused_ops.parsed.yaml
COMMAND ${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${sparse_op_yaml_file}
--output_path ./parsed_ops/sparse_ops.parsed.yaml
--output_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/legacy_backward_ops.parsed.yaml
--backward
COMMAND
${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${static_op_yaml_file}
--output_path ${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/static_ops.parsed.yaml
COMMAND
${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${fused_op_yaml_file}
--output_path ${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/fused_ops.parsed.yaml
COMMAND
${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${sparse_op_yaml_file}
--output_path ${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/sparse_ops.parsed.yaml
COMMAND
${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${sparse_bw_op_yaml_file}
--output_path ./parsed_ops/sparse_backward.parsed.yaml --backward
--output_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/sparse_backward.parsed.yaml
--backward
COMMAND
${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${static_bw_op_yaml_file}
--output_path ./parsed_ops/static_backward.parsed.yaml --backward
--output_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/static_backward.parsed.yaml
--backward
COMMAND
${PYTHON_EXECUTABLE} parse_op.py --op_yaml_path ${fused_bw_op_yaml_file}
--output_path ./parsed_ops/fused_backward.parsed.yaml --backward
RESULTS_VARIABLE _results)
--output_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/fused_backward.parsed.yaml
--backward RESULTS_VARIABLE _results)
foreach(_result in ${_results})
if(${_result})
message(FATAL_ERROR "op yaml parsing failed, exiting.")
Expand All @@ -183,9 +198,11 @@ execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generator
COMMAND
${PYTHON_EXECUTABLE} cross_validate.py --forward_yaml_paths
./parsed_ops/ops.parsed.yaml ./parsed_ops/legacy_ops.parsed.yaml
--backward_yaml_paths ./parsed_ops/backward_ops.parsed.yaml
./parsed_ops/legacy_backward_ops.parsed.yaml
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/ops.parsed.yaml
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/legacy_ops.parsed.yaml
--backward_yaml_paths
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/backward_ops.parsed.yaml
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/legacy_backward_ops.parsed.yaml
RESULT_VARIABLE _result)
if(${_result})
message(FATAL_ERROR "ops validation failed, exiting.")
Expand All @@ -195,8 +212,9 @@ execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generator
COMMAND
${PYTHON_EXECUTABLE} cross_validate.py --forward_yaml_paths
./parsed_ops/static_ops.parsed.yaml --backward_yaml_paths
./parsed_ops/static_backward.parsed.yaml
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/static_ops.parsed.yaml
--backward_yaml_paths
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/static_backward.parsed.yaml
RESULT_VARIABLE _result)
if(${_result})
message(FATAL_ERROR "static ops validation failed, exiting.")
Expand All @@ -206,8 +224,9 @@ execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generator
COMMAND
${PYTHON_EXECUTABLE} cross_validate.py --forward_yaml_paths
./parsed_ops/fused_ops.parsed.yaml --backward_yaml_paths
./parsed_ops/fused_backward.parsed.yaml
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/fused_ops.parsed.yaml
--backward_yaml_paths
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/fused_backward.parsed.yaml
RESULT_VARIABLE _result)
if(${_result})
message(FATAL_ERROR "fused ops validation failed, exiting.")
Expand All @@ -217,8 +236,9 @@ execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generator
COMMAND
${PYTHON_EXECUTABLE} cross_validate.py --forward_yaml_paths
./parsed_ops/sparse_ops.parsed.yaml --backward_yaml_paths
./parsed_ops/sparse_backward.parsed.yaml
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/sparse_ops.parsed.yaml
--backward_yaml_paths
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/sparse_backward.parsed.yaml
RESULT_VARIABLE _result)
if(${_result})
message(FATAL_ERROR "sparse ops validation failed, exiting.")
Expand All @@ -233,8 +253,9 @@ execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generator
COMMAND
${PYTHON_EXECUTABLE} generate_op.py --ops_yaml_path
./parsed_ops/ops.parsed.yaml --backward_yaml_path
./parsed_ops/backward_ops.parsed.yaml --op_version_yaml_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/ops.parsed.yaml --backward_yaml_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/backward_ops.parsed.yaml
--op_version_yaml_path
${CMAKE_SOURCE_DIR}/paddle/phi/api/yaml/op_version.yaml
--op_compat_yaml_path ${CMAKE_SOURCE_DIR}/paddle/phi/api/yaml/op_compat.yaml
--output_op_path "${generated_op_path_1}.tmp" "${generated_op_path_2}.tmp"
Expand All @@ -249,8 +270,10 @@ execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generator
COMMAND
${PYTHON_EXECUTABLE} generate_op.py --ops_yaml_path
./parsed_ops/static_ops.parsed.yaml --backward_yaml_path
./parsed_ops/static_backward.parsed.yaml --op_version_yaml_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/static_ops.parsed.yaml
--backward_yaml_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/static_backward.parsed.yaml
--op_version_yaml_path
${CMAKE_SOURCE_DIR}/paddle/phi/api/yaml/op_version.yaml
--op_compat_yaml_path ${CMAKE_SOURCE_DIR}/paddle/phi/api/yaml/op_compat.yaml
--output_op_path "${generated_static_op_path}.tmp" --output_arg_map_path
Expand All @@ -264,8 +287,10 @@ execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generator
COMMAND
${PYTHON_EXECUTABLE} generate_op.py --ops_yaml_path
./parsed_ops/fused_ops.parsed.yaml --backward_yaml_path
./parsed_ops/fused_backward.parsed.yaml --op_version_yaml_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/fused_ops.parsed.yaml
--backward_yaml_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/fused_backward.parsed.yaml
--op_version_yaml_path
${CMAKE_SOURCE_DIR}/paddle/phi/api/yaml/op_version.yaml
--op_compat_yaml_path ${CMAKE_SOURCE_DIR}/paddle/phi/api/yaml/op_compat.yaml
--output_op_path "${generated_fused_op_path}.tmp" --output_arg_map_path
Expand All @@ -279,9 +304,10 @@ execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generator
COMMAND
${PYTHON_EXECUTABLE} generate_sparse_op.py --ops_yaml_path
./parsed_ops/sparse_ops.parsed.yaml --backward_ops_yaml_path
./parsed_ops/sparse_backward.parsed.yaml --output_op_path
"${generated_sparse_ops_path}.tmp" --output_arg_map_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/sparse_ops.parsed.yaml
--backward_ops_yaml_path
${CMAKE_CURRENT_BINARY_DIR}/parsed_ops/sparse_backward.parsed.yaml
--output_op_path "${generated_sparse_ops_path}.tmp" --output_arg_map_path
"${generated_sparse_argument_mapping_path}.tmp"
RESULT_VARIABLE _result)
if(${_result})
Expand Down
12 changes: 6 additions & 6 deletions paddle/fluid/pir/dialect/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(PD_DIALECT_SOURCE_DIR
"${PADDLE_SOURCE_DIR}/paddle/fluid/pir/dialect/operator/ir")
"${PADDLE_BINARY_DIR}/paddle/fluid/pir/dialect/operator/ir")

# Generate pd_op_dialect files defining op using op_gen_file
set(op_gen_parsed_yaml_file
Expand All @@ -12,16 +12,16 @@ set(op_compat_yaml_file ${PADDLE_SOURCE_DIR}/paddle/phi/api/yaml/op_compat.yaml)

# YAML files for defining operators
set(op_fwd_yaml
${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/ops.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/ops.parsed.yaml
)
set(op_bwd_yaml
${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/backward_ops.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/backward_ops.parsed.yaml
)
set(fused_op_fwd_yaml
${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/fused_ops.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/fused_ops.parsed.yaml
)
set(fused_op_bwd_yaml
${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/fused_backward.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/fused_backward.parsed.yaml
)
set(pir_op_fwd_src_yaml
${PADDLE_SOURCE_DIR}/paddle/fluid/pir/dialect/operator/ir/ops.yaml)
Expand All @@ -31,7 +31,7 @@ set(pir_op_bwd_src_yaml
set(pir_update_op_fwd_src_yaml
${PADDLE_SOURCE_DIR}/paddle/fluid/pir/dialect/operator/ir/update_ops.yaml)
set(parsed_op_dir
${PADDLE_SOURCE_DIR}/paddle/fluid/pir/dialect/operator/ir/generated)
${PADDLE_BINARY_DIR}/paddle/fluid/pir/dialect/operator/ir/generated)
set(pir_op_fwd_yaml ${parsed_op_dir}/ops.parsed.yaml)
set(pir_op_bwd_yaml ${parsed_op_dir}/ops_backward.parsed.yaml)
set(pir_update_op_fwd_yaml ${parsed_op_dir}/update_ops.parsed.yaml)
Expand Down
14 changes: 7 additions & 7 deletions paddle/fluid/pir/drr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ set(op_creator_gen_file
)
set(op_compat_yaml_file ${PADDLE_SOURCE_DIR}/paddle/phi/api/yaml/op_compat.yaml)
set(op_forward_yaml_file1
${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/ops.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/ops.parsed.yaml
)

set(op_forward_yaml_file3
${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/update_ops.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/update_ops.parsed.yaml
)
set(op_backward_yaml_file1
${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/backward_ops.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/backward_ops.parsed.yaml
)
set(fused_op_forward_yaml_file
${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/fused_ops.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/fused_ops.parsed.yaml
)
set(fused_op_backward_yaml_file
${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/fused_backward.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/fused_backward.parsed.yaml
)

set(cinn_op_yaml_file
${PADDLE_SOURCE_DIR}/paddle/cinn/hlir/dialect/generated/ops.parsed.yaml)
${PADDLE_BINARY_DIR}/paddle/cinn/hlir/dialect/generated/ops.parsed.yaml)

set(cinn_op_yaml_source_file
${PADDLE_SOURCE_DIR}/paddle/cinn/hlir/dialect/operator/ir/ops.yaml)

set(parsed_op_dir
${PADDLE_SOURCE_DIR}/paddle/fluid/pir/dialect/operator/ir/generated)
${PADDLE_BINARY_DIR}/paddle/fluid/pir/dialect/operator/ir/generated)

set(op_yaml_file3 ${parsed_op_dir}/ops.parsed.yaml)
set(op_yaml_file4 ${parsed_op_dir}/ops_backward.parsed.yaml)
Expand Down
4 changes: 2 additions & 2 deletions paddle/fluid/prim/api/auto_code_generated/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
set(api_yaml_path
"${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/ops.parsed.yaml"
"${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/ops.parsed.yaml"
)
set(legacy_api_yaml_path
"${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/legacy_ops.parsed.yaml"
"${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops/legacy_ops.parsed.yaml"
)
set(api_compat_yaml_path
"${PADDLE_SOURCE_DIR}/paddle/phi/api/yaml/op_compat.yaml")
Expand Down
4 changes: 2 additions & 2 deletions paddle/fluid/primitive/backend/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
set(eager_backend_files
${CMAKE_CURRENT_SOURCE_DIR}/generated/generated_eager_backend.cc)
${CMAKE_CURRENT_BINARY_DIR}/generated/generated_eager_backend.cc)
if(WITH_PYTHON OR NOT ON_INFER)
cc_library(
primitive_backend_eager_experimental
SRCS ${eager_backend_files}
DEPS final_dygraph_function eager_utils phi common)
endif()
set(static_backend_files
${CMAKE_CURRENT_SOURCE_DIR}/generated/generated_static_backend.cc
${CMAKE_CURRENT_BINARY_DIR}/generated/generated_static_backend.cc
${CMAKE_CURRENT_SOURCE_DIR}/manual/manual_static_backend.cc)
cc_library(
primitive_backend_static_experimental
Expand Down
12 changes: 6 additions & 6 deletions paddle/fluid/primitive/codegen/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
set(parsed_yaml_path
"${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops")
"${PADDLE_BINARY_DIR}/paddle/fluid/operators/generator/parsed_ops")
set(fwd_path ${parsed_yaml_path}/ops.parsed.yaml)
set(rev_path ${parsed_yaml_path}/backward_ops.parsed.yaml)
set(fwd_pd_op_path
${PADDLE_SOURCE_DIR}/paddle/fluid/pir/dialect/operator/ir/generated/ops.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/pir/dialect/operator/ir/generated/ops.parsed.yaml
)
set(update_fwd_pd_op_path
${PADDLE_SOURCE_DIR}/paddle/fluid/pir/dialect/operator/ir/generated/update_ops.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/pir/dialect/operator/ir/generated/update_ops.parsed.yaml
)
set(rev_pd_op_path
${PADDLE_SOURCE_DIR}/paddle/fluid/pir/dialect/operator/ir/generated/ops_backward.parsed.yaml
${PADDLE_BINARY_DIR}/paddle/fluid/pir/dialect/operator/ir/generated/ops_backward.parsed.yaml
)
set(prim_path "${PADDLE_SOURCE_DIR}/paddle/fluid/primitive/primitive.yaml")
set(templates_dir
"${PADDLE_SOURCE_DIR}/paddle/fluid/primitive/codegen/templates/")
set(compat_path "${PADDLE_SOURCE_DIR}/paddle/phi/api/yaml/op_compat.yaml")
set(destination_dir "${PADDLE_SOURCE_DIR}/paddle/fluid/primitive/")
set(destination_dir "${PADDLE_BINARY_DIR}/paddle/fluid/primitive/")
set(scripts "${PADDLE_SOURCE_DIR}/paddle/fluid/primitive/codegen/gen.py")

message("Automatic code generation for paddle/fluid/primitive")
Expand All @@ -42,7 +42,7 @@ execute_process(
${PADDLE_SOURCE_DIR}/paddle/fluid/primitive/codegen/decomp_gen.py --fwd_path
${fwd_path} --fwd_pd_op_path ${fwd_pd_op_path} --templates_dir
${templates_dir} --compat_path ${compat_path} --destination_dir
${PADDLE_SOURCE_DIR}/paddle/fluid/pir/dialect/operator/ir/op_decomp.cc
${PADDLE_BINARY_DIR}/paddle/fluid/pir/dialect/operator/ir/op_decomp.cc
RESULT_VARIABLE _result)
if(${_result})
message(
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/primitive/rule/vjp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(VJP_SRCS
${PADDLE_SOURCE_DIR}/paddle/fluid/primitive/rule/vjp/generated/generated_vjp.cc
${PADDLE_BINARY_DIR}/paddle/fluid/primitive/rule/vjp/generated/generated_vjp.cc
${PADDLE_SOURCE_DIR}/paddle/fluid/primitive/rule/vjp/manual/manual_vjp.cc)
cc_library(
primitive_vjp_experimental
Expand Down