【Hackathon 6th Fundable Projects 4 No.3】remove ExecutionStrategy (P…

…addlePaddle#65077) * remove ExecutionStrategy * resolve conflict
co63oc · Jun 25, 2024 · 455789b · 455789b
1 parent 8d140c3
commit 455789b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 63 deletions.
diff --git a/paddle/fluid/framework/details/execution_strategy.h b/paddle/fluid/framework/details/execution_strategy.h
diff --git a/paddle/fluid/framework/details/op_handle_base.h b/paddle/fluid/framework/details/op_handle_base.h
@@ -19,7 +19,6 @@
 #include <unordered_set>
 #include <vector>
 
-#include "paddle/fluid/framework/details/execution_strategy.h"
 #include "paddle/fluid/framework/details/var_handle.h"
 #include "paddle/fluid/framework/ir/node.h"
 #include "paddle/fluid/platform/device_context.h"

diff --git a/paddle/fluid/framework/distributed_strategy.proto b/paddle/fluid/framework/distributed_strategy.proto
@@ -183,13 +183,6 @@ message BuildStrategy {
   optional bool fuse_resunit = 21 [ default = false ];
 }
 
-message ExecutionStrategy {
-  optional int32 num_threads = 1 [ default = 1 ];
-  optional int32 num_iteration_per_drop_scope = 2 [ default = 10 ];
-  optional int32 num_iteration_per_run = 3 [ default = 1 ];
-  optional bool use_thread_barrier = 4 [ default = false ];
-}
-
 message GradientScaleConfig {
   // Optional value ['avg', 'sum', 'customized']
   // If avg, loss@grad will be divided by the number of devices,
@@ -428,7 +421,6 @@ message DistributedStrategy {
   optional QatConfig qat_configs = 117;
 
   optional BuildStrategy build_strategy = 201;
-  optional ExecutionStrategy execution_strategy = 202;
   optional GradientScaleConfig gradient_scale_configs = 203;
 }
 

diff --git a/paddle/fluid/framework/ir/memory_optimize_pass/memory_reuse_pass.cc b/paddle/fluid/framework/ir/memory_optimize_pass/memory_reuse_pass.cc
@@ -238,7 +238,6 @@ bool MemoryReusePass::IsInVarReusable(const details::VarHandle &in_var) const {
  *  - it is the first version var. Otherwise, the var may be overwritten
  *    in the second batch, which results in wrong calculation result.
  *    It is critical especially when
- *    ExecutionStrategy::num_iteration_per_drop_scope_ > 1.
  *  - it has not reused other var's memory. It is not necessary to do memory
  *    reuse twice for the same var.
  *  - it is not a persistable var.

diff --git a/python/paddle/distributed/fleet/base/distributed_strategy.py b/python/paddle/distributed/fleet/base/distributed_strategy.py
@@ -185,8 +185,8 @@ def __init__(self):
 
         DistributedStrategy can be serialized into protobuf file or deserialized from protobuf file
 
-        Users who run local training usually configure BuildStrategy and ExecutionStrategy, and
-        DistributedStrategy supports configurations from BuildStrategy and ExecutionStrategy
+        Users who run local training usually configure BuildStrategy, and
+        DistributedStrategy supports configurations from BuildStrategy.
 
         """
         self.strategy = distributed_strategy_pb2.DistributedStrategy()