[fleet_executor] Remove runtime graph, all scheduler on python side

paddle/fluid/distributed/fleet_executor/carrier.cc

@@ -229,13 +229,12 @@ void Carrier::CreateInterceptors() {
             task_node->run_at_offset(), task_node->run_per_steps()));
 
     std::unique_ptr<Interceptor> interceptor;
-    if (task_node->type().empty()) {
-      // TODO(wangxi): delete this in future
-      interceptor.reset(new Interceptor(interceptor_id, task_node));
-    } else {
-      interceptor = InterceptorFactory::Create(task_node->type(),
-                                               interceptor_id, task_node);
-    }
+    PADDLE_ENFORCE_NE(task_node->type().empty(), true,
+                      platform::errors::NotFound(
+                          "Cannot found type for task node with id %lld",
+                          task_node->task_id()));
+    interceptor = InterceptorFactory::Create(task_node->type(), interceptor_id,
+                                             task_node);
     interceptor->SetPlace(place_);
     interceptor->SetMiniBatchScope(minibatch_scope_);
     interceptor->SetMicroBatchScope(microbatch_scopes_);

paddle/fluid/distributed/fleet_executor/fleet_executor.cc

@@ -40,32 +40,29 @@ void FleetExecutor::Init(
     const framework::ProgramDesc& program_desc, framework::Scope* scope,
     const platform::Place& place, const std::vector<TaskNode*>& task_nodes,
     const std::unordered_map<int64_t, int64_t>& task_id_to_rank) {
-  if (task_nodes.size() == 0) {
-    LOG(INFO) << "fleet executor will use c++ side scheduler construction.";
-    runtime_graph_ = std::make_shared<RuntimeGraph>(program_desc, exe_desc_);
-  } else {
-    LOG(INFO) << "fleet executor has been set dependency on python side.";
-    // TODO(fleet_exe devs): the unused_vars should be got from run time graph
-    std::vector<std::unique_ptr<framework::OperatorBase>> ops;
-    for (auto task_node : task_nodes) {
-      for (auto op : task_node->ops()) {
-        ops.emplace_back(std::unique_ptr<framework::OperatorBase>(op));
-      }
-    }
-    auto unused_vars = framework::GetUnusedVars(program_desc.Block(0), ops, {});
-    runtime_graph_ = std::make_shared<RuntimeGraph>();
-    std::unordered_map<int64_t, TaskNode*> interceptor_id_to_task;
-    for (auto task_node : task_nodes) {
-      task_node->SetUnusedVars(unused_vars);
-      int64_t interceptor_id = task_node->task_id();
-      interceptor_id_to_task.emplace(interceptor_id, task_node);
-    }
-    runtime_graph_->SetInterceptorIdToRank(task_id_to_rank);
-    runtime_graph_->SetInterceptorIdToNode(interceptor_id_to_task);
-    for (auto& unique_op : ops) {
-      unique_op.release();
+  PADDLE_ENFORCE_GT(task_nodes.size(), 0,
+                    platform::errors::InvalidArgument(
+                        "Fleet executor is inited with empty task node"));
+  // TODO(fleet_exe devs): the unused_vars should be got from run time graph
+  std::vector<std::unique_ptr<framework::OperatorBase>> ops;
+  for (auto task_node : task_nodes) {
+    for (auto op : task_node->ops()) {
+      ops.emplace_back(std::unique_ptr<framework::OperatorBase>(op));
     }
   }
+  auto unused_vars = framework::GetUnusedVars(program_desc.Block(0), ops, {});
+  runtime_graph_ = std::make_shared<RuntimeGraph>();
+  std::unordered_map<int64_t, TaskNode*> interceptor_id_to_task;
+  for (auto task_node : task_nodes) {
+    task_node->SetUnusedVars(unused_vars);
+    int64_t interceptor_id = task_node->task_id();
+    interceptor_id_to_task.emplace(interceptor_id, task_node);
+  }
+  runtime_graph_->SetInterceptorIdToRank(task_id_to_rank);
+  runtime_graph_->SetInterceptorIdToNode(interceptor_id_to_task);
+  for (auto& unique_op : ops) {
+    unique_op.release();
+  }
   root_scope_ = scope;
   place_ = place;
   PADDLE_ENFORCE_NOT_NULL(root_scope_, platform::errors::InvalidArgument(

paddle/fluid/distributed/fleet_executor/fleet_executor_desc.proto

@@ -23,9 +23,5 @@ message RankInfo {
 message FleetExecutorDesc {
   optional int64 cur_rank = 1 [ default = 0 ]; // Rank id of current processor
   repeated RankInfo cluster_info = 2;
-  optional int32 dp_degree = 3 [ default = 1 ];
-  optional int32 mp_degree = 4 [ default = 1 ];
-  optional int32 pp_degree = 5 [ default = 1 ];
-  optional int64 num_micro_batches = 6 [ default = 1 ];
-  optional int64 num_slots = 7 [ default = 1 ];
+  optional int64 num_micro_batches = 3 [ default = 1 ];
 }

paddle/fluid/distributed/fleet_executor/runtime_graph.cc

@@ -14,300 +14,15 @@
 
 #include "paddle/fluid/distributed/fleet_executor/runtime_graph.h"
 #include "paddle/fluid/distributed/fleet_executor/task_node.h"
-#include "paddle/fluid/framework/executor_gc_helper.h"
-#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/framework/program_desc.h"
 
 namespace paddle {
 namespace distributed {
-namespace {
-
-using OperatorBase = RuntimeGraph::OperatorBase;
-using OpRole = paddle::framework::OpRole;
-using OpRegistry = paddle::framework::OpRegistry;
-using ProgramDesc = paddle::framework::ProgramDesc;
-
-bool IsForward(int32_t op_role) {
-  return (op_role == static_cast<int32_t>(OpRole::kForward)) ||
-         (op_role == (static_cast<int32_t>(OpRole::kForward) |
-                      static_cast<int32_t>(OpRole::kLoss)));
-}
-
-bool IsLRSched(int32_t op_role) {
-  return op_role == static_cast<int32_t>(OpRole::kLRSched);
-}
-
-bool IsBackward(int32_t op_role) {
-  return (op_role == static_cast<int32_t>(OpRole::kBackward)) ||
-         (op_role == (static_cast<int32_t>(OpRole::kBackward) |
-                      static_cast<int32_t>(OpRole::kLoss)));
-}
-
-bool IsOptimize(int32_t op_role) {
-  return op_role == static_cast<int32_t>(OpRole::kOptimize);
-}
-
-struct DistCoord {
-  int32_t dp_idx;
-  int32_t pp_idx;
-  int32_t mp_idx;
-};
-
-class DistCoordSys final {
- public:
-  DistCoordSys(int32_t dp_degree, int32_t pp_degree, int32_t mp_degree)
-      : dp_degree_(dp_degree), pp_degree_(pp_degree), mp_degree_(mp_degree) {}
-  DistCoord RankToCoord(int64_t rank) const;
-  int64_t CoordToRank(const DistCoord& coord) const;
-
- private:
-  DISABLE_COPY_AND_ASSIGN(DistCoordSys);
-  bool InvalidCoord(const DistCoord& coord) const;
-  int32_t dp_degree_;
-  int32_t pp_degree_;
-  int32_t mp_degree_;
-};
-
-DistCoord DistCoordSys::RankToCoord(int64_t rank) const {
-  DistCoord coord;
-  coord.mp_idx = rank % mp_degree_;
-  rank /= mp_degree_;
-  coord.pp_idx = rank % pp_degree_;
-  rank /= pp_degree_;
-  coord.dp_idx = rank % dp_degree_;
-  return coord;
-}
-
-int64_t DistCoordSys::CoordToRank(const DistCoord& coord) const {
-  if (InvalidCoord(coord)) {
-    return -1;
-  }
-  return coord.dp_idx * pp_degree_ * mp_degree_ + coord.pp_idx * mp_degree_ +
-         coord.mp_idx;
-}
-
-bool DistCoordSys::InvalidCoord(const DistCoord& coord) const {
-  return coord.mp_idx < 0 || coord.mp_idx >= mp_degree_ || coord.pp_idx < 0 ||
-         coord.pp_idx >= pp_degree_ || coord.dp_idx < 0 ||
-         coord.dp_idx >= dp_degree_;
-}
-
-}  // namespace
-
-std::vector<OpRole> RuntimeGraph::functionality_order = {
-    OpRole::kLRSched, OpRole::kForward, OpRole::kBackward, OpRole::kOptimize};
-
-RuntimeGraph::RuntimeGraph(const ProgramDesc& program,
-                           const FleetExecutorDesc& exe_desc)
-    : exe_desc_(exe_desc) {
-  if (exe_desc.pp_degree() == 1) {
-    OriginProgramCompile(program);
-  } else {
-    SplitProgramBasedFunctionality(program);
-    AssignTaskToIntercepter();
-    FakeDependence();
-    FakeRuntimeInfo();
-  }
-}
-
-void RuntimeGraph::OriginProgramCompile(const ProgramDesc& program) {
-  int64_t cur_rank = exe_desc_.cur_rank();
-  int64_t max_run_times = exe_desc_.num_micro_batches();
-  int64_t max_slot_nums = exe_desc_.num_slots();
-
-  auto task_node = std::make_unique<TaskNode>(program, cur_rank, max_run_times,
-                                              max_slot_nums);
-  // TODO(wangxi): add skip vars
-  auto unused_vars =
-      framework::GetUnusedVars(program.Block(0), task_node->unique_ops(), {});
-  task_node->SetType("Compute");
-  task_node->SetUnusedVars(unused_vars);
-
-  task_nodes_.emplace_back(std::move(task_node));
-  int64_t task_id = task_nodes_[0]->task_id();
-  intercepter_id_to_rank_.insert({task_id, cur_rank});
-  intercepter_id_to_node_.insert({task_id, task_nodes_[0].get()});
-}
-
-void RuntimeGraph::SplitProgramBasedFunctionality(const ProgramDesc& program) {
-  for (const auto& op_desc : program.Block(0).AllOps()) {
-    ops_.emplace_back(OpRegistry::CreateOp(*op_desc));
-  }
-  // TODO(wangxi): how to gc pipeline backward send
-  auto unused_vars = framework::GetUnusedVars(program.Block(0), ops_, {});
-
-  std::unordered_map<int32_t, std::vector<OperatorBase*>> role_to_ops;
-  for (const auto& op : ops_) {
-    int32_t op_role = op->Attr<int32_t>("op_role");
-    OpRole new_op_role;
-    if (IsLRSched(op_role)) {
-      new_op_role = OpRole::kLRSched;
-    } else if (IsForward(op_role)) {
-      new_op_role = OpRole::kForward;
-    } else if (IsBackward(op_role)) {
-      new_op_role = OpRole::kBackward;
-    } else if (IsOptimize(op_role)) {
-      new_op_role = OpRole::kOptimize;
-    } else {
-      PADDLE_THROW(platform::errors::PreconditionNotMet(
-          "The op %s is None of LRSched, Forward, Backward or Optimize.",
-          op->Type()));
-    }
-    int32_t new_op_role_id = static_cast<int32_t>(new_op_role);
-    if (role_to_ops.find(new_op_role_id) == role_to_ops.end()) {
-      role_to_ops.insert({new_op_role_id, {}});
-    }
-    role_to_ops.at(new_op_role_id).emplace_back(op.get());
-  }
-
-  int64_t cur_rank = exe_desc_.cur_rank();
-  DistCoordSys coord_sys(exe_desc_.dp_degree(), exe_desc_.pp_degree(),
-                         exe_desc_.mp_degree());
-  const auto& coord = coord_sys.RankToCoord(cur_rank);
-  int pipeline_stage = coord.pp_idx;
-  int64_t num_pipeline_stages = exe_desc_.pp_degree();
-
-  // TODO(fleet_executor dev): start up steps should be a config `num_slots`
-  int64_t start_up_steps = num_pipeline_stages - pipeline_stage;
-  int64_t num_micro_batches = exe_desc_.num_micro_batches();
-  int64_t task_id = cur_rank * functionality_order.size();
-  for (std::size_t i = 0; i < functionality_order.size(); ++i) {
-    VLOG(3) << "Runtime graph is creating task node for: " << task_id << ".";
-    OpRole role = functionality_order[i];
-    int32_t role_id = static_cast<int64_t>(role);
-    int64_t max_run_times = num_micro_batches;
-    int64_t max_slot_nums = start_up_steps;
-    // NOTE: use short path, each interceptor should run for max_run_times
-    std::vector<OperatorBase*> task_ops{};
-    if (role_to_ops.find(role_id) != role_to_ops.end()) {
-      task_ops = role_to_ops.at(role_id);
-    }
-    std::unique_ptr<TaskNode> task_node = std::make_unique<TaskNode>(
-        role_id, task_ops, cur_rank, task_id, max_run_times, max_slot_nums);
-    if (IsLRSched(role_id) || IsOptimize(role_id)) {
-      task_node->SetType("Amplifier");
-      if (IsLRSched(role_id)) {
-        task_node->SetRunPerSteps(max_run_times);
-      } else {
-        task_node->SetRunAtOffset(max_run_times - 1);
-        task_node->SetRunPerSteps(max_run_times);
-      }
-    } else {
-      task_node->SetType("Compute");
-    }
-    task_node->SetUnusedVars(unused_vars);
-    task_nodes_.emplace_back(std::move(task_node));
-    ++task_id;
-  }
-}
-
-void RuntimeGraph::FakeDependence() {
-  int64_t cur_rank = exe_desc_.cur_rank();
-  DistCoordSys coord_sys(exe_desc_.dp_degree(), exe_desc_.pp_degree(),
-                         exe_desc_.mp_degree());
-  const auto& coord = coord_sys.RankToCoord(cur_rank);
-  DistCoord upstream_coord = coord, downstream_coord = coord;
-  upstream_coord.pp_idx -= 1;
-  downstream_coord.pp_idx += 1;
-  int64_t pp_upstream = coord_sys.CoordToRank(upstream_coord);
-  int64_t pp_downstream = coord_sys.CoordToRank(downstream_coord);
-  bool is_first_stage = (pp_upstream == -1);
-  bool is_last_stage = (pp_downstream == -1);
-
-  int32_t num_of_functionality = functionality_order.size();
-  // lr(1:m) -> forward -> backward -> (m:1)optimize
-  //               ↑          ↓
-  // lr(1:m) -> forward -> backward -> (m:1)optimize
-  //               ↑          ↓
-  // lr(1:m) -> forward -> backward -> (m:1)optimize
-  for (std::size_t i = 0; i < task_nodes_.size(); ++i) {
-    auto& node = task_nodes_[i];
-    bool is_forward = IsForward(node->role());
-    bool is_backward = IsBackward(node->role());
-
-    int64_t cur_id = cur_rank * num_of_functionality + i;
-    int64_t prev_id = cur_id - 1;
-    int64_t next_id = cur_id + 1;
-
-    int64_t upstream_id = pp_upstream * num_of_functionality + i;
-    int64_t downstream_id = pp_downstream * num_of_functionality + i;
-
-    // 1F1B, last stage pp_buff_size should be 1, while first stage
-    // pp_buff_size should be pp_degree
-    int64_t pp_buff_size = exe_desc_.pp_degree() - coord.pp_idx;
-
-    std::vector<std::pair<int64_t, int64_t>> ups;
-    std::vector<std::pair<int64_t, int64_t>> downs;
-
-    if (i != 0) {  // not lr
-      int64_t buff_size = is_backward ? pp_buff_size : 2;
-      ups.emplace_back(prev_id, buff_size);
-    }
-    if (i != task_nodes_.size() - 1) {  // not optimize
-      int64_t buff_size = is_forward ? pp_buff_size : 2;
-      downs.emplace_back(next_id, buff_size);
-    }
-
-    if (is_forward) {
-      if (!is_first_stage) {
-        ups.emplace_back(upstream_id, 2);
-      }
-      if (!is_last_stage) {
-        downs.emplace_back(downstream_id, 2);
-      }
-    } else if (is_backward) {
-      if (!is_last_stage) {
-        ups.emplace_back(downstream_id, 2);
-      }
-      if (!is_first_stage) {
-        downs.emplace_back(upstream_id, 2);
-      }
-    }
-
-    for (auto up : ups) {
-      VLOG(3) << "Task(" << cur_id << ") AddUpstream Task(" << up.first
-              << ") with buff_size=" << up.second;
-      node->AddUpstreamTask(up.first, up.second);
-    }
-    for (auto down : downs) {
-      VLOG(3) << "Task(" << cur_id << ") AddDownstream Task(" << down.first
-              << ") with buff_size=" << down.second;
-      node->AddDownstreamTask(down.first, down.second);
-    }
-  }
-}
-
-void RuntimeGraph::AssignTaskToIntercepter() {
-  for (const auto& task : task_nodes_) {
-    int64_t intercepter_id = task->task_id();
-    VLOG(3) << "Runtime graph is assigning task to interceptor: "
-            << intercepter_id << " with type: " << task->type() << ".";
-    if (intercepter_id_to_node_.find(intercepter_id) !=
-        intercepter_id_to_node_.end()) {
-      PADDLE_THROW(platform::errors::PreconditionNotMet(
-          "Repeated intercepter id: %d", intercepter_id));
-    }
-    intercepter_id_to_node_.insert({intercepter_id, task.get()});
-  }
-}
-
-void RuntimeGraph::FakeRuntimeInfo() {
-  int64_t nrank = exe_desc_.cluster_info().size();
-  int32_t num_of_functionality = functionality_order.size();
-  for (int64_t i = 0; i < nrank; ++i) {
-    for (int32_t j = 0; j < num_of_functionality; ++j) {
-      int64_t intercepter_id = i * num_of_functionality + j;
-      intercepter_id_to_rank_.insert({intercepter_id, i});
-    }
-  }
-}
 
 std::string RuntimeGraph::DebugString() const {
   std::ostringstream os;
   os << "\nRuntime Graph Debug: \n";
-  for (const auto& task : task_nodes_) {
-    os << task->DebugString();
+  for (const auto& pair : intercepter_id_to_node_) {
+    os << pair.second->DebugString();
     os << "\n";
   }
   return os.str();