[Dy2St] Add lock free interface for scope (#73522)

huangjiyi · web-flow · commit 0c29fe48f6e6 · 2025-06-22T05:29:23.000+08:00
diff --git a/paddle/fluid/eager/to_static/run_program_op_node.h b/paddle/fluid/eager/to_static/run_program_op_node.h
@@ -165,27 +165,27 @@ static void ShareTensorsIntoScopeWithName(
         name == paddle::framework::kEmptyVarName) {
       continue;
     }
-    auto *var = scope->Var(name);
+    auto *var = scope->VarLockFree(name);
     // share tensor
     auto tensor_base = tensors[i].impl();
     if (phi::DenseTensor::classof(tensor_base.get())) {
       auto *dst_tensor = var->GetMutable<phi::DenseTensor>();
-      auto t = std::dynamic_pointer_cast<phi::DenseTensor>(tensor_base);
+      auto t = std::static_pointer_cast<phi::DenseTensor>(tensor_base);
       *dst_tensor = *t;
     } else if (phi::SelectedRows::classof(tensor_base.get())) {
       auto *dst_tensor = var->GetMutable<phi::SelectedRows>();
-      auto t = std::dynamic_pointer_cast<phi::SelectedRows>(tensor_base);
+      auto t = std::static_pointer_cast<phi::SelectedRows>(tensor_base);
       *dst_tensor = *t;
     } else if (paddle::framework::VariableRefArray::classof(
                    tensor_base.get())) {
       auto *dst_tensor = var->GetMutable<paddle::framework::VariableRefArray>();
-      auto t = std::dynamic_pointer_cast<paddle::framework::VariableRefArray>(
+      auto t = std::static_pointer_cast<paddle::framework::VariableRefArray>(
           tensor_base);
       *dst_tensor = *t;
     } else if (phi::distributed::DistTensor::classof(tensor_base.get())) {
       auto *dst_tensor = var->GetMutable<phi::DenseTensor>();
       auto t =
-          std::dynamic_pointer_cast<phi::distributed::DistTensor>(tensor_base);
+          std::static_pointer_cast<phi::distributed::DistTensor>(tensor_base);
       *dst_tensor = t->value();
     } else {
       PADDLE_THROW(common::errors::InvalidArgument(
@@ -230,7 +230,7 @@ static void ShareTensorsFromScopeWithName(const std::vector<Tensor *> &tensors,
       // skip stop_gradient.
       continue;
     }
-    auto *var = scope->FindVar(name);
+    auto *var = scope->FindVarLockFree(name);
     PADDLE_ENFORCE_NOT_NULL(
         var,
         common::errors::NotFound("The output tensor %s is not in "
diff --git a/paddle/fluid/framework/scope.cc b/paddle/fluid/framework/scope.cc
@@ -54,6 +54,10 @@ Variable* Scope::Var(const std::string& name) {
   return ret;
 }
 
+Variable* Scope::VarLockFree(const std::string& name) {
+  return VarInternal(name);
+}
+
 Variable* Scope::Var(std::string* name) {
   Variable* ret = nullptr;
   std::string new_name;
@@ -74,6 +78,10 @@ Variable* Scope::FindVar(const std::string& name) const {
   return FindVarInternal(name);
 }
 
+Variable* Scope::FindVarLockFree(const std::string& name) const {
+  return FindVarInternal(name);
+}
+
 Variable* Scope::GetVar(const std::string& name) const {
   auto* var = FindVar(name);
   PADDLE_ENFORCE_NOT_NULL(
diff --git a/paddle/fluid/framework/scope.h b/paddle/fluid/framework/scope.h
@@ -74,6 +74,9 @@ class TEST_API Scope {
   /// Caller doesn't own the returned Variable.
   Variable* Var(const std::string& name);
 
+  /// Lock free version of Var
+  Variable* VarLockFree(const std::string& name);
+
   /// Create a variable with a scope-unique name.
   /// Caller doesn't own the returned Variable.
   Variable* Var(std::string* name = nullptr);
@@ -88,6 +91,9 @@ class TEST_API Scope {
   /// Caller doesn't own the returned Variable.
   Variable* FindVar(const std::string& name) const;
 
+  /// Lock free version of FindVar
+  Variable* FindVarLockFree(const std::string& name) const;
+
   // Get a variable in the scope or any of its ancestors. Enforce
   /// the returned Variable is not nullptr
   Variable* GetVar(const std::string& name) const;
