diff --git a/paddle/fluid/framework/new_executor/interpreter_base_impl.h b/paddle/fluid/framework/new_executor/interpreter_base_impl.h index 88ac481d16c5b796553d6f9cb0cfdd5d0a52f193..2c030ef1dc264d25218642323ba93d6361ed376b 100644 --- a/paddle/fluid/framework/new_executor/interpreter_base_impl.h +++ b/paddle/fluid/framework/new_executor/interpreter_base_impl.h @@ -45,7 +45,7 @@ PD_DECLARE_bool(new_executor_use_local_scope); PHI_DECLARE_bool(check_nan_inf); PD_DECLARE_bool(benchmark); -PD_DECLARE_uint64(executor_log_deps_every_microseconds); +PHI_DECLARE_uint64(executor_log_deps_every_microseconds); PHI_DECLARE_bool(new_executor_use_cuda_graph); PHI_DECLARE_bool(enable_new_ir_in_executor); #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP) diff --git a/paddle/fluid/framework/op_kernel_type.h b/paddle/fluid/framework/op_kernel_type.h index 558ae8f9b9078a6c9ce36e4848d860d2810f2ba4..3bfe90dd6b92111c6c505b543e4ddb79d98ba9d7 100644 --- a/paddle/fluid/framework/op_kernel_type.h +++ b/paddle/fluid/framework/op_kernel_type.h @@ -26,7 +26,7 @@ limitations under the License. */ #include "paddle/phi/core/kernel_factory.h" #include "paddle/utils/flags.h" -PD_DECLARE_bool(use_stride_kernel); +PHI_DECLARE_bool(use_stride_kernel); namespace paddle { namespace framework { diff --git a/paddle/fluid/imperative/tracer.cc b/paddle/fluid/imperative/tracer.cc index 785e5f2f757855b309716ac9df6d4d0f1b53cfdb..cc00af31e61aacdffd603ead46b205e843d3b426 100644 --- a/paddle/fluid/imperative/tracer.cc +++ b/paddle/fluid/imperative/tracer.cc @@ -38,7 +38,7 @@ PHI_DECLARE_bool(use_mkldnn); PHI_DECLARE_string(tracer_mkldnn_ops_on); PHI_DECLARE_string(tracer_mkldnn_ops_off); -PD_DECLARE_bool(use_stride_kernel); +PHI_DECLARE_bool(use_stride_kernel); namespace paddle { namespace imperative { diff --git a/paddle/fluid/imperative/tracer.h b/paddle/fluid/imperative/tracer.h index 49b94c743fdb8d35620ca7a5c47efa61455fa10d..3eced7804c3205cf49a3d66444979a09412777ce 100644 --- a/paddle/fluid/imperative/tracer.h +++ b/paddle/fluid/imperative/tracer.h @@ -32,7 +32,7 @@ #include "paddle/fluid/platform/macros.h" #include "paddle/phi/core/compat/arg_map_context.h" -PD_DECLARE_bool(use_stride_kernel); +PHI_DECLARE_bool(use_stride_kernel); namespace paddle { namespace imperative { diff --git a/paddle/fluid/pybind/eager_method.cc b/paddle/fluid/pybind/eager_method.cc index dd99770e05faea68077cfff99a69d233a93d5047..5200db761d0495118f2b4641e305274718e3bc17 100644 --- a/paddle/fluid/pybind/eager_method.cc +++ b/paddle/fluid/pybind/eager_method.cc @@ -69,7 +69,7 @@ typedef SSIZE_T ssize_t; #include "paddle/utils/pybind.h" PHI_DECLARE_bool(set_to_1d); -PD_DECLARE_bool(use_stride_kernel); +PHI_DECLARE_bool(use_stride_kernel); namespace paddle { namespace pybind { diff --git a/paddle/phi/api/lib/api_gen_utils.cc b/paddle/phi/api/lib/api_gen_utils.cc index 80e169fae10c89069dda69318a591c6b570ce9ae..51875ed9175ec08656732917dc8186b017261787 100644 --- a/paddle/phi/api/lib/api_gen_utils.cc +++ b/paddle/phi/api/lib/api_gen_utils.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. */ #include "paddle/phi/api/lib/api_gen_utils.h" +#include "paddle/phi/core/flags.h" #include "paddle/phi/core/visit_type.h" #include "paddle/phi/kernels/strided_copy_kernel.h" -#include "paddle/utils/flags.h" -PD_DECLARE_bool(use_stride_kernel); +PHI_DECLARE_bool(use_stride_kernel); #include "glog/logging.h" diff --git a/paddle/phi/api/lib/data_transform.cc b/paddle/phi/api/lib/data_transform.cc index a8eb379e359fc49a2106d979e167e77596614c23..b1559908ebc3ff593334dc9476fa47450461a14e 100644 --- a/paddle/phi/api/lib/data_transform.cc +++ b/paddle/phi/api/lib/data_transform.cc @@ -21,15 +21,15 @@ limitations under the License. */ #include "paddle/phi/api/lib/utils/allocator.h" #include "paddle/phi/backends/context_pool.h" #include "paddle/phi/core/distributed/auto_parallel/dist_tensor.h" +#include "paddle/phi/core/flags.h" #include "paddle/phi/core/kernel_registry.h" #include "paddle/phi/core/tensor_utils.h" #include "paddle/phi/core/visit_type.h" #include "paddle/phi/kernels/cast_kernel.h" #include "paddle/phi/kernels/contiguous_kernel.h" #include "paddle/phi/kernels/transfer_layout_kernel.h" -#include "paddle/utils/flags.h" -PD_DECLARE_bool(use_stride_kernel); +PHI_DECLARE_bool(use_stride_kernel); namespace paddle { namespace experimental { diff --git a/paddle/phi/core/kernel_factory.cc b/paddle/phi/core/kernel_factory.cc index 3ead251e332207d75bfb4fefd40e1e05fa44a15c..d58decadfadca7972940294d579f70059de0e040 100644 --- a/paddle/phi/core/kernel_factory.cc +++ b/paddle/phi/core/kernel_factory.cc @@ -25,14 +25,13 @@ #if defined(PADDLE_WITH_CUSTOM_DEVICE) #include "paddle/phi/backends/custom/custom_device_op_list.h" #endif -#include "paddle/fluid/platform/flags.h" #include "paddle/phi/core/compat/op_utils.h" +#include "paddle/phi/core/flags.h" #include "paddle/utils/string/string_helper.h" -PADDLE_DEFINE_EXPORTED_bool( - use_stride_kernel, - true, - "Whether to use strdie kernel if op support stride."); +PHI_DEFINE_EXPORTED_bool(use_stride_kernel, + true, + "Whether to use strdie kernel if op support stride."); PD_DECLARE_int32(low_precision_op_list); PD_DECLARE_bool(enable_api_kernel_fallback);