From 728bbaa4e33f1b7543d15f60b2544e51695fb57a Mon Sep 17 00:00:00 2001
From: Qiao Longfei <qiaolongfei@baidu.com>
Date: Fri, 17 May 2019 13:02:32 +0800
Subject: [PATCH] add cache_update_mutex_ for operator test=develop (#17124)

* add cache_update_mutex_ for operator
---
 paddle/fluid/framework/operator.cc | 20 ++++++++++++--------
 paddle/fluid/framework/operator.h  |  3 ++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc
index 7756fe4f8f2..fa6de326bc1 100644
--- a/paddle/fluid/framework/operator.cc
+++ b/paddle/fluid/framework/operator.cc
@@ -884,8 +884,6 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
   // result of HasAttr.
   if (!enable_cache_runtime_context && HasAttr(kEnableCacheRuntimeContext))
     enable_cache_runtime_context = true;
-  if (!enable_cache_expected_kernel && HasAttr(kEnableCacheExpectedKernel))
-    enable_cache_expected_kernel = true;
   if (!all_kernels_must_compute_runtime_shape &&
       HasAttr(kAllKernelsMustComputeRuntimeShape))
     all_kernels_must_compute_runtime_shape = true;
@@ -894,9 +892,12 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
     RunImpl(scope, place, &ctx);
   } else {
     const Scope* cur_scope = &scope;
-    if (!runtime_ctx_ || pre_scope_ != cur_scope) {
-      runtime_ctx_.reset(new RuntimeContext(Inputs(), Outputs(), scope));
-      pre_scope_ = cur_scope;
+    if (runtime_ctx_.get() == nullptr || pre_scope_ != cur_scope) {
+      std::lock_guard<std::mutex> lock(cache_update_mutex_);
+      if (runtime_ctx_.get() == nullptr || pre_scope_ != cur_scope) {
+        runtime_ctx_.reset(new RuntimeContext(Inputs(), Outputs(), scope));
+        pre_scope_ = cur_scope;
+      }
     }
     RunImpl(scope, place, runtime_ctx_.get());
   }
@@ -908,7 +909,7 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
   platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance();
   auto* dev_ctx = pool.Get(place);
 
-  if (!enable_cache_expected_kernel || !kernel_type_) {
+  if (kernel_type_.get() == nullptr || kernel_func_.get() == nullptr) {
     ChooseKernel(*runtime_ctx, scope, place);
   }
 
@@ -996,8 +997,11 @@ void OperatorWithKernel::ChooseKernel(const RuntimeContext& ctx,
                  KernelTypeToString(expected_kernel_key));
   }
 
-  kernel_type_.reset(new OpKernelType(expected_kernel_key));
-  kernel_func_.reset(new OpKernelFunc(kernel_iter->second));
+  std::lock_guard<std::mutex> lock(cache_update_mutex_);
+  if (kernel_type_.get() == nullptr || kernel_func_.get() == nullptr) {
+    kernel_type_.reset(new OpKernelType(expected_kernel_key));
+    kernel_func_.reset(new OpKernelFunc(kernel_iter->second));
+  }
 }
 
 void OperatorWithKernel::TransferInplaceVarsBack(
diff --git a/paddle/fluid/framework/operator.h b/paddle/fluid/framework/operator.h
index 3332530b3c0..9090b7e1d13 100644
--- a/paddle/fluid/framework/operator.h
+++ b/paddle/fluid/framework/operator.h
@@ -17,6 +17,7 @@ limitations under the License. */
 #include <algorithm>
 #include <atomic>
 #include <memory>
+#include <mutex>  // NOLINT
 #include <string>
 #include <tuple>
 #include <unordered_map>
@@ -508,8 +509,8 @@ class OperatorWithKernel : public OperatorBase {
   mutable std::unique_ptr<RuntimeContext> runtime_ctx_;
   mutable const Scope* pre_scope_ = nullptr;
   mutable bool enable_cache_runtime_context = false;
-  mutable bool enable_cache_expected_kernel = false;
   mutable bool all_kernels_must_compute_runtime_shape = false;
+  mutable std::mutex cache_update_mutex_;
 };
 
 extern bool OpSupportGPU(const std::string& op_type);
-- 
GitLab