From 96311be045a24d96c20acfc876b43c91858464e4 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 18 Jan 2011 11:26:47 +0100 Subject: [PATCH 1/1] Interchange lb_iter and comp_iter, and improve process main loop. --- options.cpp | 20 +++++++++----------- options.h | 2 +- process.cpp | 43 ++++++++++++++++++++++--------------------- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/options.cpp b/options.cpp index dc29495..aa953f9 100644 --- a/options.cpp +++ b/options.cpp @@ -54,8 +54,8 @@ namespace opt { // Parameters for the end of the simulation // fixme: find better defaults - unsigned comp_maxiter = 10; - unsigned lb_maxiter = comp_maxiter; + unsigned lb_maxiter = 10; + unsigned comp_maxiter = 0; double time_limit = 0; bool exit_on_close = false; @@ -203,12 +203,10 @@ bool opt::parse_args(int* argc, char* argv[]) opt::comm_cost = cost_func(optarg); break; case 'i': - std::istringstream(optarg) >> opt::comp_maxiter; + std::istringstream(optarg) >> opt::lb_maxiter; break; case 'I': - std::istringstream(optarg) >> opt::lb_maxiter; - ERROR0("option -I not implemented yet"); - result = false; + std::istringstream(optarg) >> opt::comp_maxiter; break; case 'l': std::istringstream(optarg) >> opt::log_rate; @@ -292,10 +290,10 @@ void opt::print() 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 iterations", "%g", min_iter_duration); - DESCR("maximum number of comp. iterations", "%s", - h.val_or_string(comp_maxiter, "infinity")); DESCR("maximum number of lb. iterations", "%s", h.val_or_string(lb_maxiter, "infinity")); + DESCR("maximum number of comp. iterations", "%s", + h.val_or_string(comp_maxiter, "infinity")); DESCR("time limit", "%s", h.val_or_string(time_limit, "infinity")); DESCR("exit on close", "%s", h.on_off(exit_on_close)); INFO0("`----"); @@ -371,11 +369,11 @@ void opt::usage() std::clog << "\nParameters for the end of the simulation\n"; std::clog << o("-i value") - << "maximum number of comp. iterations, 0 for infinity" - << " (" << opt::comp_maxiter << ")\n"; - std::clog << o("-I value") << "maximum number of lb. iterations, 0 for infinity" << " (" << opt::lb_maxiter << ")\n"; + std::clog << o("-I value") + << "maximum number of comp. iterations, 0 for infinity" + << " (" << opt::comp_maxiter << ")\n"; std::clog << o("-t value") << "time limit (simulated time), 0 for infinity" << " (" << opt::time_limit << ")\n"; diff --git a/options.h b/options.h index 20a1683..fe0df82 100644 --- a/options.h +++ b/options.h @@ -45,8 +45,8 @@ namespace opt { extern double min_iter_duration; // Parameters for the end of the simulation - extern unsigned comp_maxiter; extern unsigned lb_maxiter; + extern unsigned comp_maxiter; extern double time_limit; extern bool exit_on_close; diff --git a/process.cpp b/process.cpp index 0afbf29..9f46f8f 100644 --- a/process.cpp +++ b/process.cpp @@ -80,39 +80,40 @@ int process::run() next_iter_after_date = MSG_get_clock() + opt::min_iter_duration; } - if (load > 0.0) { - ++comp_iter; - if (opt::log_rate && comp_iter % opt::log_rate == 0) { + double ld = lb_load(); + if (ld > 0.0) { + ++lb_iter; + + if (opt::log_rate && lb_iter % opt::log_rate == 0) { if (opt::bookkeeping) INFO4("(%u:%u) current load: %g ; expected: %g", - comp_iter, lb_iter, load, expected_load); + lb_iter, comp_iter, load, expected_load); else INFO2("(%u) current load: %g", - comp_iter, load); + lb_iter, load); } - double ld = lb_load(); ld -= load_balance(ld); - lb_load() = ld; print_loads(true, xbt_log_priority_debug); + } + lb_load() = ld; - send(); + // send load information, and load (data) if any + send(); + if (load > 0.0) { + ++comp_iter; compute(); - - } else { - // send load information, and load when bookkeeping - send(); } - if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter) { - VERB2("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter); - break; - } if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter) { VERB2("Reached lb_maxiter: %d/%d", lb_iter, opt::lb_maxiter); break; } + if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter) { + VERB2("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter); + break; + } if (opt::time_limit && MSG_get_clock() >= opt::time_limit) { VERB2("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit); break; @@ -156,13 +157,13 @@ int process::run() VERB0("Done."); if (opt::bookkeeping) { INFO4("Final load after %d:%d iterations: %g ; expected: %g", - comp_iter, lb_iter, load, expected_load); + lb_iter, comp_iter, load, expected_load); } else { INFO2("Final load after %d iterations: %g", - comp_iter, load); - if (comp_iter != lb_iter) - WARN2("comp_iter (%d) and lb_iter (%d) differ!", - comp_iter, lb_iter); + lb_iter, load); + if (lb_iter != comp_iter) + WARN2("lb_iter (%d) and comp_iter (%d) differ!", + lb_iter, comp_iter); } return 0; } -- 2.39.5