Replace EnableMKLDNN EnableONEDNN [fluid_ops] (#74180)

Author: co63oc

paddle/fluid/framework/executor.cc

@@ -184,7 +184,7 @@ void Executor::Run(const ProgramDesc& pdesc,
  phi::RecordEvent record_run(
  "Executor::Run", phi::TracerEventType::UserDefined, 1);
  platform::RecordBlock b(block_id);
- if (FLAGS_use_mkldnn) EnableMKLDNN(pdesc);
+ if (FLAGS_use_mkldnn) EnableONEDNN(pdesc);
  auto ctx = Prepare(pdesc, block_id, skip_ref_cnt_vars, force_disable_gc);
 #ifdef PADDLE_WITH_DNNL
  platform::AttachPointerHashToONEDNNKey(this, place_);
@@ -330,7 +330,7 @@ void Executor::Run(const ProgramDesc& program,
  phi::RecordEvent record_run(
  "Executor::Run", phi::TracerEventType::UserDefined, 1);
  platform::RecordBlock b(kProgramId);
- if (FLAGS_use_mkldnn) EnableMKLDNN(program);
+ if (FLAGS_use_mkldnn) EnableONEDNN(program);
 #ifdef PADDLE_WITH_DNNL
  platform::AttachPointerHashToONEDNNKey(this, place_);
 #endif
@@ -592,7 +592,7 @@ void Executor::RunPreparedContext(
  }
 }
 
-void Executor::EnableMKLDNN(const ProgramDesc& program) {
+void Executor::EnableONEDNN(const ProgramDesc& program) {
 #ifdef PADDLE_WITH_DNNL
  VLOG(3) << "use_mkldnn=True";
  for (size_t bid = 0; bid < program.Size(); ++bid) {

paddle/fluid/framework/executor.h

@@ -146,7 +146,7 @@ class TEST_API Executor {
  bool create_vars = true,
  bool keep_kids = false);
 
- void EnableMKLDNN(const ProgramDesc& program);
+ void EnableONEDNN(const ProgramDesc& program);
 
  std::shared_ptr<TrainerBase> InitForDataset(
  const ProgramDesc& main_program,

paddle/fluid/inference/api/analysis_config.cc

@@ -665,7 +665,7 @@ void AnalysisConfig::EnableCUDNN() {
  Update();
 }
 
-void AnalysisConfig::EnableMKLDNN() {
+void AnalysisConfig::EnableONEDNN() {
 #ifdef PADDLE_WITH_DNNL
  use_onednn_ = true;
 #else
@@ -967,7 +967,7 @@ void AnalysisConfig::Update() {
  }
 
 #ifdef PADDLE_WITH_DNNL
- // Since EnableMKLDNN is default, the pass_builder has created in the first
+ // Since EnableONEDNN is default, the pass_builder has created in the first
  // time.
  // Case1: User manually disable onednn after pass_builder
  // create.(config.disable_mkldnn())
@@ -1033,7 +1033,7 @@ void AnalysisConfig::Update() {
  if (use_onednn_ && enable_ir_optim_) {
 #ifdef PADDLE_WITH_DNNL
  // default enable onednn when device is cpu and enable_ir_optim
- pass_builder()->EnableMKLDNN();
+ pass_builder()->EnableONEDNN();
 #endif
  }
  }

paddle/fluid/inference/api/paddle_analysis_config.h

@@ -869,7 +869,7 @@ struct PD_INFER_DECL AnalysisConfig {
  /// \brief Turn on OneDNN.
  ///
  ///
- void EnableMKLDNN();
+ void EnableONEDNN();
 
  ///
  /// \brief Turn down OneDNN.

paddle/fluid/inference/api/paddle_pass_builder.cc

@@ -317,7 +317,7 @@ void GpuPassStrategy::EnableCUDNN() {
  use_cudnn_ = true;
 }
 
-void GpuPassStrategy::EnableMKLDNN() {
+void GpuPassStrategy::EnableONEDNN() {
  LOG(ERROR) << "GPU not support MKLDNN yet";
 }
 
@@ -343,7 +343,7 @@ CpuPassStrategy::CpuPassStrategy() : PassStrategy({}) {
 
 void CpuPassStrategy::EnableCUDNN() { LOG(ERROR) << "CPU not support cuDNN"; }
 
-void CpuPassStrategy::EnableMKLDNN() {
+void CpuPassStrategy::EnableONEDNN() {
 // TODO(Superjomn) Consider the way to mix CPU with GPU.
 #ifdef PADDLE_WITH_DNNL
  if (!use_onednn_) {

paddle/fluid/inference/api/paddle_pass_builder.h

@@ -142,7 +142,7 @@ class PD_INFER_DECL PassStrategy : public PaddlePassBuilder {
  /// \brief Enable the use of OneDNN.
  /// The OneDNN control exists in both CPU and GPU mode, because there can
  /// still be some CPU kernels running in GPU mode.
- virtual void EnableMKLDNN() {}
+ virtual void EnableONEDNN() {}
 
  /// \brief Disable the use of OneDNN.
  virtual void DisableMKLDNN() {}
@@ -211,7 +211,7 @@ class PD_INFER_DECL CpuPassStrategy : public PassStrategy {
  void EnableCUDNN() override;
 
  /// \brief Enable the use of OneDNN.
- void EnableMKLDNN() override;
+ void EnableONEDNN() override;
 
  /// \brief Disable the use of OneDNN.
  void DisableMKLDNN() override;
@@ -257,7 +257,7 @@ class PD_INFER_DECL GpuPassStrategy : public PassStrategy {
  void EnableCUDNN() override;
 
  /// \brief Not supported in GPU mode yet.
- void EnableMKLDNN() override;
+ void EnableONEDNN() override;
 
  /// \brief Not supported in GPU mode yet.
  void EnableMkldnnBfloat16() override;

paddle/fluid/inference/capi/paddle_c_api.h

@@ -233,7 +233,7 @@ typedef struct PD_MaxInputShape {
 PADDLE_CAPI_EXPORT extern void PD_SwitchIrDebug(PD_AnalysisConfig* config,
  bool x);
 
-PADDLE_CAPI_EXPORT extern void PD_EnableMKLDNN(PD_AnalysisConfig* config);
+PADDLE_CAPI_EXPORT extern void PD_EnableONEDNN(PD_AnalysisConfig* config);
 
 PADDLE_CAPI_EXPORT extern void PD_SetMkldnnCacheCapacity(
  PD_AnalysisConfig* config, int capacity);

paddle/fluid/inference/capi/pd_config.cc

@@ -277,12 +277,12 @@ void PD_SwitchIrDebug(PD_AnalysisConfig* config, bool x) {
  config->config.SwitchIrDebug(x);
 }
 
-void PD_EnableMKLDNN(PD_AnalysisConfig* config) {
+void PD_EnableONEDNN(PD_AnalysisConfig* config) {
  PADDLE_ENFORCE_NOT_NULL(
  config,
  common::errors::InvalidArgument(
  "The pointer of analysis configuration shouldn't be nullptr"));
- config->config.EnableMKLDNN();
+ config->config.EnableONEDNN();
 }
 
 void PD_SetMkldnnCacheCapacity(PD_AnalysisConfig* config, int capacity) {

paddle/fluid/inference/capi_exp/pd_config.cc

@@ -363,9 +363,9 @@ void PD_ConfigSwitchIrDebug(__pd_keep PD_Config* pd_config, PD_Bool x) {
  CHECK_AND_CONVERT_PD_CONFIG;
  config->SwitchIrDebug(x);
 }
-void PD_ConfigEnableMKLDNN(__pd_keep PD_Config* pd_config) {
+void PD_ConfigEnableONEDNN(__pd_keep PD_Config* pd_config) {
  CHECK_AND_CONVERT_PD_CONFIG;
- config->EnableMKLDNN();
+ config->EnableONEDNN();
 }
 void PD_ConfigSetMkldnnCacheCapacity(__pd_keep PD_Config* pd_config,
  int32_t capacity) {

paddle/fluid/inference/capi_exp/pd_config.h

@@ -504,7 +504,7 @@ PADDLE_CAPI_EXPORT extern void PD_ConfigSwitchIrDebug(
 ///
 /// \param[in] pd_config config
 ///
-PADDLE_CAPI_EXPORT extern void PD_ConfigEnableMKLDNN(
+PADDLE_CAPI_EXPORT extern void PD_ConfigEnableONEDNN(
  __pd_keep PD_Config* pd_config);
 ///
 /// \brief Set the cache capacity of different input shapes for OneDNN.