Fix

Author: co63oc

paddle/fluid/inference/api/analysis_predictor.cc

@@ -1590,7 +1590,7 @@ void AnalysisPredictor::MkldnnPreSet(
  if (config_.onednn_cache_capacity_ > 0) {
  VLOG(2) << "In mkldnn cache clear mode.";
  phi::OneDNNContext::tls().set_cur_mkldnn_session_id(
- phi::OneDNNContextThreadLocals::kMKLDNNSessionID_CacheClearing);
+ phi::OneDNNContextThreadLocals::kONEDNNSessionID_CacheClearing);
  // Set current_input_shape for caching dynamic shape.
  std::stringstream ss;
  for (const auto &input_shape : inputs_shape) {

paddle/phi/backends/onednn/onednn_context.cc

@@ -27,7 +27,7 @@ namespace phi {
 
 OneDNNContextThreadLocals::Body::Body()
  : cur_engine(dnnl::engine::kind::cpu, 0), cur_stream(cur_engine) {
- cur_mkldnn_session_id = kMKLDNNSessionID_Default;
+ cur_mkldnn_session_id = kONEDNNSessionID_Default;
  cur_input_shape_str = "";
  cur_input_shape_cache_capacity = 1;
  cur_paddle_data_layout = DataLayout::kNCHW;
@@ -208,7 +208,7 @@ struct OneDNNContext::Impl {
  // In cache clearing mode, cur_input_shape_cache_capacity defines
  // max pblob capacity
  if ((static_cast<size_t>(sid) ==
- OneDNNContextThreadLocals::kMKLDNNSessionID_CacheClearing) &&
+ OneDNNContextThreadLocals::kONEDNNSessionID_CacheClearing) &&
  !sBlob->empty() &&
  (sBlob->size() >=
  static_cast<size_t>(

paddle/phi/backends/onednn/onednn_context.h

@@ -74,9 +74,9 @@ class OneDNNContextThreadLocals {
 
  public:
  // default onednn session id
- static constexpr size_t kMKLDNNSessionID_Default = 0;
+ static constexpr size_t kONEDNNSessionID_Default = 0;
  // onednn session id for cache clearing mode
- static constexpr size_t kMKLDNNSessionID_CacheClearing = -1;
+ static constexpr size_t kONEDNNSessionID_CacheClearing = -1;
  TEST_API static Body& fetch();
 };