diff --git a/paddle/fluid/distributed/fleet_executor/dist_model.cc b/paddle/fluid/distributed/fleet_executor/dist_model.cc index 452c666a1523cb81f7857684896997f1ad20d20d..e0b755c66bb17acf9f3ff5783b90a0a29f7699b9 100644 --- a/paddle/fluid/distributed/fleet_executor/dist_model.cc +++ b/paddle/fluid/distributed/fleet_executor/dist_model.cc @@ -611,27 +611,43 @@ bool DistModel::Run(const std::vector &input_data, DistModelTimer timer; timer.tic(); + double feed_elapse; + double fleet_exe_elapse; + double fetch_elapse; if (!FeedData(input_data, scope_.get())) { LOG(ERROR) << "DistModel failed at feeding data."; return false; } - double feed_elapse = timer.toc(); - VLOG(3) << "Finish loading data, cost " << feed_elapse << "ms."; + if (config_.enable_timer) { + feed_elapse = timer.toc(); + LOG(INFO) << "Finish loading data, cost " << feed_elapse << "ms."; + } else { + VLOG(3) << "Finish loading data."; + } fleet_exe->Run(carrier_id_); - double fleet_exe_elapse = timer.toc(); - VLOG(3) << "Finish FleetExe running, cost " << fleet_exe_elapse - feed_elapse - << "ms."; + if (config_.enable_timer) { + fleet_exe_elapse = timer.toc(); + LOG(INFO) << "Finish FleetExe running, cost " + << fleet_exe_elapse - feed_elapse << "ms."; + } else { + VLOG(3) << "Finish FleetExe running."; + } if (!FetchResults(output_data, scope_.get())) { LOG(ERROR) << "DistModel failed at fetching result."; return false; } - double fetch_elapse = timer.toc(); - VLOG(3) << "Finish fetching data, cost " << fetch_elapse - fleet_exe_elapse - << "ms."; - VLOG(3) << "DistModel finish inf, cost " << fetch_elapse << "ms"; + if (config_.enable_timer) { + fetch_elapse = timer.toc(); + LOG(INFO) << "Finish fetching data, cost " + << fetch_elapse - fleet_exe_elapse << "ms."; + LOG(INFO) << "DistModel finish inf, cost " << fetch_elapse << "ms"; + } else { + VLOG(3) << "Finish fetching data."; + VLOG(3) << "DistModel finish inf."; + } return true; } diff --git a/paddle/fluid/distributed/fleet_executor/dist_model.h b/paddle/fluid/distributed/fleet_executor/dist_model.h index e6ad94e266a964bdc3c6cfba39cbf86786a4acea..c980178b67c5244e751a8e89b945f353110a7456 100644 --- a/paddle/fluid/distributed/fleet_executor/dist_model.h +++ b/paddle/fluid/distributed/fleet_executor/dist_model.h @@ -52,6 +52,7 @@ struct DistModelConfig { int64_t mp_ring_id{-1}; int64_t pp_upstream_ring_id{-1}; int64_t pp_downstream_ring_id{-1}; + bool enable_timer{false}; }; class DistModel { diff --git a/paddle/fluid/pybind/bind_fleet_executor.cc b/paddle/fluid/pybind/bind_fleet_executor.cc index 72ee451fe7c31deeec714ba899b6cf2535edc88a..0422a9cf8cc0ad984621fe09ee28bb7d624897d6 100644 --- a/paddle/fluid/pybind/bind_fleet_executor.cc +++ b/paddle/fluid/pybind/bind_fleet_executor.cc @@ -154,6 +154,7 @@ void BindFleetExecutor(py::module* m) { .def_readwrite("mp_degree", &DistModelConfig::mp_degree) .def_readwrite("pp_degree", &DistModelConfig::pp_degree) .def_readwrite("mp_ring_id", &DistModelConfig::mp_ring_id) + .def_readwrite("enable_timer", &DistModelConfig::enable_timer) .def_readwrite("pp_upstream_ring_id", &DistModelConfig::pp_upstream_ring_id) .def_readwrite("pp_downstream_ring_id",