From ed59157427ae319f6865d2976116ade96559ff15 Mon Sep 17 00:00:00 2001 From: andsonder Date: Fri, 11 Aug 2023 04:09:59 +0000 Subject: [PATCH 01/10] remove execution_config.used_for_control_flow_op --- paddle/fluid/framework/new_executor/program_interpreter.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/paddle/fluid/framework/new_executor/program_interpreter.cc b/paddle/fluid/framework/new_executor/program_interpreter.cc index 7f12e6b9100b8..eab9d9fb54bce 100644 --- a/paddle/fluid/framework/new_executor/program_interpreter.cc +++ b/paddle/fluid/framework/new_executor/program_interpreter.cc @@ -47,7 +47,6 @@ ProgramInterpreter::ProgramInterpreter(const platform::Place& place, static_build_ = FLAGS_new_executor_static_build && !FLAGS_new_executor_use_cuda_graph && - !execution_config.used_for_control_flow_op && interpreter::BlockCanBeStaticBuilt(block); exception_notifier_ = main_thread_blocker_.RegisterEvent(kExceptionCaught); From af02b65569c9275e82c530bfa9614e66fe5f69fe Mon Sep 17 00:00:00 2001 From: andsonder Date: Fri, 11 Aug 2023 12:24:54 +0000 Subject: [PATCH 02/10] update --- paddle/fluid/framework/new_executor/program_interpreter.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/paddle/fluid/framework/new_executor/program_interpreter.cc b/paddle/fluid/framework/new_executor/program_interpreter.cc index eab9d9fb54bce..94ef9967375b8 100644 --- a/paddle/fluid/framework/new_executor/program_interpreter.cc +++ b/paddle/fluid/framework/new_executor/program_interpreter.cc @@ -48,7 +48,6 @@ ProgramInterpreter::ProgramInterpreter(const platform::Place& place, static_build_ = FLAGS_new_executor_static_build && !FLAGS_new_executor_use_cuda_graph && interpreter::BlockCanBeStaticBuilt(block); - exception_notifier_ = main_thread_blocker_.RegisterEvent(kExceptionCaught); completion_notifier_ = main_thread_blocker_.RegisterEvent(kTaskCompletion); From fba2e52839f7d0a05f8278e3abcf2c1149d117d4 Mon Sep 17 00:00:00 2001 From: andsonder Date: Fri, 11 Aug 2023 12:25:24 +0000 Subject: [PATCH 03/10] update --- paddle/fluid/framework/new_executor/program_interpreter.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/paddle/fluid/framework/new_executor/program_interpreter.cc b/paddle/fluid/framework/new_executor/program_interpreter.cc index 94ef9967375b8..eab9d9fb54bce 100644 --- a/paddle/fluid/framework/new_executor/program_interpreter.cc +++ b/paddle/fluid/framework/new_executor/program_interpreter.cc @@ -48,6 +48,7 @@ ProgramInterpreter::ProgramInterpreter(const platform::Place& place, static_build_ = FLAGS_new_executor_static_build && !FLAGS_new_executor_use_cuda_graph && interpreter::BlockCanBeStaticBuilt(block); + exception_notifier_ = main_thread_blocker_.RegisterEvent(kExceptionCaught); completion_notifier_ = main_thread_blocker_.RegisterEvent(kTaskCompletion); From 6c6e7c0217374e3c280b9ce33877fafb324ee25b Mon Sep 17 00:00:00 2001 From: andsonder Date: Sat, 12 Aug 2023 11:26:08 +0000 Subject: [PATCH 04/10] open static build flag --- paddle/fluid/framework/new_executor/interpretercore.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paddle/fluid/framework/new_executor/interpretercore.cc b/paddle/fluid/framework/new_executor/interpretercore.cc index 9ee34fcc39c11..6e26592904481 100644 --- a/paddle/fluid/framework/new_executor/interpretercore.cc +++ b/paddle/fluid/framework/new_executor/interpretercore.cc @@ -25,7 +25,7 @@ PADDLE_DEFINE_EXPORTED_bool( "Enable serial execution for standalone executor, used for debug."); PADDLE_DEFINE_EXPORTED_bool( new_executor_static_build, - false, + true, "Build the interpreterCore statically without running kernels."); PADDLE_DEFINE_EXPORTED_bool(new_executor_use_inplace, false, From 598bac8ed4084d863f7f12f47b36710d3cc22512 Mon Sep 17 00:00:00 2001 From: andsonder Date: Sat, 12 Aug 2023 13:29:52 +0000 Subject: [PATCH 05/10] close static build flag --- paddle/fluid/framework/new_executor/interpretercore.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paddle/fluid/framework/new_executor/interpretercore.cc b/paddle/fluid/framework/new_executor/interpretercore.cc index 6e26592904481..9ee34fcc39c11 100644 --- a/paddle/fluid/framework/new_executor/interpretercore.cc +++ b/paddle/fluid/framework/new_executor/interpretercore.cc @@ -25,7 +25,7 @@ PADDLE_DEFINE_EXPORTED_bool( "Enable serial execution for standalone executor, used for debug."); PADDLE_DEFINE_EXPORTED_bool( new_executor_static_build, - true, + false, "Build the interpreterCore statically without running kernels."); PADDLE_DEFINE_EXPORTED_bool(new_executor_use_inplace, false, From 6202068d9ebd6fb370a959de4a2d812e1802d832 Mon Sep 17 00:00:00 2001 From: andsonder Date: Sat, 12 Aug 2023 13:30:08 +0000 Subject: [PATCH 06/10] open static build flag --- paddle/fluid/framework/new_executor/interpretercore.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paddle/fluid/framework/new_executor/interpretercore.cc b/paddle/fluid/framework/new_executor/interpretercore.cc index 9ee34fcc39c11..6e26592904481 100644 --- a/paddle/fluid/framework/new_executor/interpretercore.cc +++ b/paddle/fluid/framework/new_executor/interpretercore.cc @@ -25,7 +25,7 @@ PADDLE_DEFINE_EXPORTED_bool( "Enable serial execution for standalone executor, used for debug."); PADDLE_DEFINE_EXPORTED_bool( new_executor_static_build, - false, + true, "Build the interpreterCore statically without running kernels."); PADDLE_DEFINE_EXPORTED_bool(new_executor_use_inplace, false, From bc413f6e38ad5bf7e7321af497caf63593c18765 Mon Sep 17 00:00:00 2001 From: andsonder Date: Mon, 14 Aug 2023 06:00:13 +0000 Subject: [PATCH 07/10] add searchsorted to analyze dtype list --- .../framework/new_executor/interpreter/static_build.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/paddle/fluid/framework/new_executor/interpreter/static_build.cc b/paddle/fluid/framework/new_executor/interpreter/static_build.cc index 2a9987874e4e8..10d75f1be6f15 100644 --- a/paddle/fluid/framework/new_executor/interpreter/static_build.cc +++ b/paddle/fluid/framework/new_executor/interpreter/static_build.cc @@ -474,6 +474,13 @@ void FakeInitializeOutputsForFunctionKernel( ? DataType::INT64 : in_dtype; } + } else if (op_type == "searchsorted") { + bool out_int32 = op.Attr("out_int32"); + if (out_int32) { + dtype = DataType::INT32; + } else { + dtype = DataType::INT64; + } } else { VLOG(4) << "Get dtype result from InferMeta"; RuntimeInferShapeContext infer_shape_ctx(op, runtime_ctx); From 55f99dc9902dadce90da689cd50ddc40b197c3df Mon Sep 17 00:00:00 2001 From: andsonder Date: Tue, 15 Aug 2023 06:22:48 +0000 Subject: [PATCH 08/10] recover and add test_searchsorted_op to static build list --- paddle/fluid/framework/new_executor/interpretercore.cc | 2 +- test/legacy_test/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/paddle/fluid/framework/new_executor/interpretercore.cc b/paddle/fluid/framework/new_executor/interpretercore.cc index bfcc98502a0a2..384c668ed2e56 100644 --- a/paddle/fluid/framework/new_executor/interpretercore.cc +++ b/paddle/fluid/framework/new_executor/interpretercore.cc @@ -25,7 +25,7 @@ PADDLE_DEFINE_EXPORTED_bool( "Enable serial execution for standalone executor, used for debug."); PADDLE_DEFINE_EXPORTED_bool( new_executor_static_build, - true, + false, "Build the interpreterCore statically without running kernels."); PADDLE_DEFINE_EXPORTED_bool(new_executor_use_inplace, false, diff --git a/test/legacy_test/CMakeLists.txt b/test/legacy_test/CMakeLists.txt index e29d9e60b3ec7..ea44387c22abc 100644 --- a/test/legacy_test/CMakeLists.txt +++ b/test/legacy_test/CMakeLists.txt @@ -1408,6 +1408,7 @@ set(STRIED_TESTS test_real_imag_op test_reshape_op test_set_value_op + test_searchsorted_op test_signal test_slice_op test_solve_op From 0d70a2d1036aa3c212546ae68eb2180a4074284c Mon Sep 17 00:00:00 2001 From: Sonder <55493212+AndSonder@users.noreply.github.com> Date: Wed, 16 Aug 2023 13:58:09 +0800 Subject: [PATCH 09/10] Update CMakeLists.txt --- test/legacy_test/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/legacy_test/CMakeLists.txt b/test/legacy_test/CMakeLists.txt index ea44387c22abc..bcfc784707efb 100644 --- a/test/legacy_test/CMakeLists.txt +++ b/test/legacy_test/CMakeLists.txt @@ -1393,6 +1393,7 @@ foreach(IR_OP_TEST ${NEW_IR_OP_RELAXED_TESTS}) endforeach() set(STRIED_TESTS + test_bucketize_api test_complex_getitem test_complex_grad_accumulated test_complex_simplenet @@ -1417,7 +1418,8 @@ set(STRIED_TESTS test_unbind_op test_unsqueeze_op test_unsqueeze2_op - test_var_base) + test_var_base + test_zero_dim_tensor) foreach(STRIED_TEST ${STRIED_TESTS}) py_test_modules(${STRIED_TEST}_with_stride MODULES ${STRIED_TEST} ENVS From ba2f9fd61da17f5054a03c8b77615c1d8ab90c70 Mon Sep 17 00:00:00 2001 From: Sonder <55493212+AndSonder@users.noreply.github.com> Date: Wed, 16 Aug 2023 22:28:07 +0800 Subject: [PATCH 10/10] Update CMakeLists.txt --- test/legacy_test/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/legacy_test/CMakeLists.txt b/test/legacy_test/CMakeLists.txt index bcfc784707efb..292bfa53dca25 100644 --- a/test/legacy_test/CMakeLists.txt +++ b/test/legacy_test/CMakeLists.txt @@ -1272,6 +1272,7 @@ set(STATIC_BUILD_TESTS test_adamw_op test_arg_min_max_op test_assign_pos_op + test_bucketize_api test_bincount_op test_c_embedding_op test_decayed_adagrad_op @@ -1302,6 +1303,7 @@ set(STATIC_BUILD_TESTS test_prune_gate_by_capacity_op test_random_routing_op test_reduce_op + test_searchsorted_op test_segment_ops test_sparse_momentum_op test_sgd_op_bf16 @@ -1393,7 +1395,6 @@ foreach(IR_OP_TEST ${NEW_IR_OP_RELAXED_TESTS}) endforeach() set(STRIED_TESTS - test_bucketize_api test_complex_getitem test_complex_grad_accumulated test_complex_simplenet @@ -1409,7 +1410,6 @@ set(STRIED_TESTS test_real_imag_op test_reshape_op test_set_value_op - test_searchsorted_op test_signal test_slice_op test_solve_op @@ -1418,8 +1418,7 @@ set(STRIED_TESTS test_unbind_op test_unsqueeze_op test_unsqueeze2_op - test_var_base - test_zero_dim_tensor) + test_var_base) foreach(STRIED_TEST ${STRIED_TESTS}) py_test_modules(${STRIED_TEST}_with_stride MODULES ${STRIED_TEST} ENVS