From 9793054ae3d7e158930379655cdc881879934441 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 14 Feb 2011 15:49:06 +0100 Subject: [PATCH] Move min_lb_iter_duration in load-balancing parameters. --- options.cpp | 21 +++++++++------------ options.h | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/options.cpp b/options.cpp index cf9bb0f..107b180 100644 --- a/options.cpp +++ b/options.cpp @@ -47,13 +47,12 @@ namespace opt { // Load balancing algorithm std::string loba_algo("simple"); bool bookkeeping = false; + double min_lb_iter_duration = 1.0; // fixme: find better defaults // Application parameters - // fixme: find better defaults - cost_func comp_cost("1e9, 0"); - cost_func comm_cost("1e6, 0"); - double min_lb_iter_duration = 1.0; - double min_comp_iter_duration = 1.0; + cost_func comp_cost("1e9, 0"); // fixme: find better defaults + cost_func comm_cost("1e6, 0"); // fixme: find better defaults + double min_comp_iter_duration = 1.0; // fixme: find better defaults // Parameters for the end of the simulation unsigned lb_maxiter = 0; @@ -319,12 +318,10 @@ void opt::print() } DESCR("load balancing algorithm", "%s", loba_algo.c_str()); DESCR("bookkeeping", "%s", h.on_off(bookkeeping)); + DESCR("minimum duration between lb. iterations", "%g", min_lb_iter_duration); DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str()); DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str()); - DESCR("minimum duration between lb. iterations", "%g", - min_lb_iter_duration); - DESCR("minimum duration between comp. iterations", "%g", - min_comp_iter_duration); + DESCR("minimum duration between comp. iterations", "%g", min_comp_iter_duration); DESCR("maximum number of lb. iterations", "%s", h.val_or_string(lb_maxiter, "infinity")); DESCR("maximum number of comp. iterations", "%s", @@ -391,6 +388,9 @@ void opt::usage() so_list(opt::loba_algorithms); std::clog << o("-b") << "toggle bookkeeping (\"virtual load\")" << " [" << opt_helper::on_off(opt::bookkeeping) << "]\n"; + std::clog << o("-s value") + << "minimum duration between lb. iterations" + << " [" << opt::min_lb_iter_duration << "]\n"; std::clog << "\nApplication parameters\n"; std::clog << o("-c [aN,...]a0") @@ -399,9 +399,6 @@ void opt::usage() std::clog << o("-C [aN,...]a0") << "polynomial factors for communication cost" << " [" << opt::comm_cost.to_string() << "]\n"; - std::clog << o("-s value") - << "minimum duration between lb. iterations" - << " [" << opt::min_lb_iter_duration << "]\n"; std::clog << o("-S value") << "minimum duration between comp. iterations" << " [" << opt::min_comp_iter_duration << "]\n"; diff --git a/options.h b/options.h index ed5b498..8a48ed1 100644 --- a/options.h +++ b/options.h @@ -38,11 +38,11 @@ namespace opt { // Load balancing algorithm extern std::string loba_algo; extern bool bookkeeping; + extern double min_lb_iter_duration; // Application parameters extern cost_func comp_cost; extern cost_func comm_cost; - extern double min_lb_iter_duration; extern double min_comp_iter_duration; // Parameters for the end of the simulation -- 2.39.5