From 2d6d6fa1ed3e6dca69dc1d3c1bf2248a2743570f Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Sun, 30 Jan 2022 11:04:17 +0800 Subject: [PATCH] delete FLAGS_run_pten_kernel (#39330) --- paddle/fluid/eager/legacy/prepared_operator.cc | 1 - .../tests/performance_tests/benchmark_eager_cpu.cc | 5 ----- .../tests/performance_tests/benchmark_eager_cuda.cc | 4 ---- .../tests/performance_tests/benchmark_fluid_cpu.cc | 5 ----- .../tests/performance_tests/benchmark_fluid_cuda.cc | 5 ----- paddle/fluid/framework/custom_kernel.cc | 6 ------ .../framework/new_executor/interpretercore_util.cc | 1 - paddle/fluid/framework/operator.cc | 1 - paddle/fluid/imperative/prepared_operator.cc | 1 - paddle/fluid/platform/flags.cc | 12 ------------ 10 files changed, 41 deletions(-) diff --git a/paddle/fluid/eager/legacy/prepared_operator.cc b/paddle/fluid/eager/legacy/prepared_operator.cc index fcdf416268..a9a85d50d6 100644 --- a/paddle/fluid/eager/legacy/prepared_operator.cc +++ b/paddle/fluid/eager/legacy/prepared_operator.cc @@ -24,7 +24,6 @@ #include "paddle/fluid/platform/device/xpu/xpu_op_list.h" #endif DECLARE_bool(check_nan_inf); -DECLARE_bool(run_pten_kernel); namespace egr { namespace legacy { diff --git a/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cpu.cc b/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cpu.cc index c100e3b70f..93cd0d1338 100644 --- a/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cpu.cc +++ b/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cpu.cc @@ -36,11 +36,6 @@ using namespace egr; // NOLINT using namespace egr_utils_api; // NOLINT -// Disable pten path -DECLARE_bool(run_pten_kernel); - -TEST(Benchmark, Init) { FLAGS_run_pten_kernel = false; } - TEST(Benchmark, EagerScaleCPU) { // Prepare Device Contexts eager_test::InitEnv(paddle::platform::CPUPlace()); diff --git a/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cuda.cc b/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cuda.cc index c8f4b1b32e..2df44bfcab 100644 --- a/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cuda.cc +++ b/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cuda.cc @@ -35,10 +35,6 @@ using namespace egr; // NOLINT using namespace egr_utils_api; // NOLINT -DECLARE_bool(run_pten_kernel); - -TEST(Benchmark, Init) { FLAGS_run_pten_kernel = false; } - #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP) TEST(Benchmark, EagerScaleCUDA) { diff --git a/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cpu.cc b/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cpu.cc index 68e7512eed..b2a96468ec 100644 --- a/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cpu.cc +++ b/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cpu.cc @@ -34,11 +34,6 @@ #include "gperftools/profiler.h" #endif -// Disable pten path -DECLARE_bool(run_pten_kernel); - -TEST(Benchmark, Init) { FLAGS_run_pten_kernel = false; } - namespace paddle { namespace imperative { diff --git a/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cuda.cc b/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cuda.cc index 50423b5a64..7f8b845b07 100644 --- a/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cuda.cc +++ b/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cuda.cc @@ -34,11 +34,6 @@ #include "gperftools/profiler.h" #endif -// Disable pten path -DECLARE_bool(run_pten_kernel); - -TEST(Benchmark, Init) { FLAGS_run_pten_kernel = false; } - #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP) namespace paddle { diff --git a/paddle/fluid/framework/custom_kernel.cc b/paddle/fluid/framework/custom_kernel.cc index 1ba7c4481e..a04838c9d4 100644 --- a/paddle/fluid/framework/custom_kernel.cc +++ b/paddle/fluid/framework/custom_kernel.cc @@ -29,8 +29,6 @@ limitations under the License. */ #include "paddle/pten/core/kernel_context.h" #include "paddle/pten/core/kernel_registry.h" -DECLARE_bool(run_pten_kernel); - namespace paddle { namespace framework { @@ -279,10 +277,6 @@ static void RunKernelFunc(pten::KernelContext* ctx, void RegisterKernelWithMetaInfo( const std::vector& op_kernel_infos) { - PADDLE_ENFORCE_EQ(FLAGS_run_pten_kernel, true, - platform::errors::Unimplemented( - "Custom Kernel depends on pten kernel enabled,")); - for (size_t i = 0; i < op_kernel_infos.size(); ++i) { auto& kernel_info = op_kernel_infos[i]; auto op_type = OpKernelInfoHelper::GetOpName(kernel_info); diff --git a/paddle/fluid/framework/new_executor/interpretercore_util.cc b/paddle/fluid/framework/new_executor/interpretercore_util.cc index fb0951e87a..50725e5eea 100644 --- a/paddle/fluid/framework/new_executor/interpretercore_util.cc +++ b/paddle/fluid/framework/new_executor/interpretercore_util.cc @@ -24,7 +24,6 @@ PADDLE_DEFINE_EXPORTED_bool( new_executor_sequential_run, false, "Enable sequential execution for standalone executor, used for debug"); -DECLARE_bool(run_pten_kernel); namespace paddle { namespace framework { diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc index 2142d10bc4..50c315bf03 100644 --- a/paddle/fluid/framework/operator.cc +++ b/paddle/fluid/framework/operator.cc @@ -56,7 +56,6 @@ DECLARE_bool(check_nan_inf); DECLARE_bool(enable_unused_var_check); PADDLE_DEFINE_EXPORTED_int32(inner_op_parallelism, 0, "number of threads for inner op"); -DECLARE_bool(run_pten_kernel); DECLARE_bool(run_kp_kernel); namespace paddle { diff --git a/paddle/fluid/imperative/prepared_operator.cc b/paddle/fluid/imperative/prepared_operator.cc index 8eca35c5ce..53f5e0ca8f 100644 --- a/paddle/fluid/imperative/prepared_operator.cc +++ b/paddle/fluid/imperative/prepared_operator.cc @@ -29,7 +29,6 @@ #include "paddle/fluid/platform/profiler.h" DECLARE_bool(check_nan_inf); -DECLARE_bool(run_pten_kernel); DECLARE_bool(benchmark); DECLARE_bool(run_kp_kernel); diff --git a/paddle/fluid/platform/flags.cc b/paddle/fluid/platform/flags.cc index d195b5c04a..b969ba971b 100644 --- a/paddle/fluid/platform/flags.cc +++ b/paddle/fluid/platform/flags.cc @@ -687,18 +687,6 @@ PADDLE_DEFINE_EXPORTED_bool( apply_pass_to_program, false, "It controls whether to apply IR pass to program when using Fleet APIs"); -/** - * Pt kernel related FLAG - * Name: FLAGS_run_pten_kernel - * Since Version: 2.3.0 - * Value Range: bool, default=false - * Example: FLAGS_run_pten_kernel=true would use the pt kernel to compute in the - * Op. - * Note: - */ -PADDLE_DEFINE_EXPORTED_bool(run_pten_kernel, true, - "It controls whether to use pten kernel"); - /** * KP kernel related FLAG * Name: FLAGS_run_kp_kernel -- GitLab