From: Arnaud Giersch Date: Mon, 17 Jan 2011 10:14:37 +0000 (+0100) Subject: Update copyright in version string, and other cosmetic changes. X-Git-Tag: v0.1~188^2~39 X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/de044764fcc724b2bbfa26ccf77804070498aa12 Update copyright in version string, and other cosmetic changes. --- diff --git a/README b/README index d34cb4b..f6c136d 100644 --- a/README +++ b/README @@ -141,6 +141,8 @@ Liste de fichiers loba_simple.h équilibrage simple loba_simple.cpp (à imiter pour ajouter d'autres algorithmes) + loba_*.{h,cpp} autres algos d'équilibrage + main.cpp le programme principal misc.h divers trucs inclassables @@ -167,6 +169,18 @@ Liste de fichiers version.h gestion de la version du programme version.cpp +* fichiers auto-générés + + misc_autogen.h définition des macros XCLOG(...) + +* scripts + + colorized-loba script pour exécuter loba en colorant les + sorties + + setlocalversion calcule un numéro de version à partir du hash + du dernier commit (git) + * autres fichiers .gitignore liste des fichiers ignorés par git diff --git a/TODO b/TODO index 6fedf48..25c3797 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,7 @@ * verify bookkeeping version. +* add minimum (sleep) time between 2 lb iterations ? + * add options -j/-J : minimum number of iterations ? * add a variant to (not) change neighbor load information at send. diff --git a/communicator.h b/communicator.h index a2f94e5..f00e063 100644 --- a/communicator.h +++ b/communicator.h @@ -9,14 +9,6 @@ #include #include "hostdata.h" -// Cannot include "options.h" without error, so only declare the -// needed functions. -namespace opt { - bool parse_args(int* argc, char* argv[]); - void print(); - void usage(); -} - class message { public: enum message_type { INFO, CREDIT, LOAD, CTRL_CLOSE, DATA_CLOSE }; diff --git a/options.cpp b/options.cpp index 31c23b9..6a6a887 100644 --- a/options.cpp +++ b/options.cpp @@ -7,6 +7,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); +#include "deployment.h" +#include "process.h" #include "loba_simple.h" #include "loba_fairstrategy.h" @@ -45,10 +47,14 @@ namespace opt { bool bookkeeping = false; // Application parameters - cost_func comp_cost("1e9, 0"); // fixme: find better defaults - cost_func comm_cost("1, 0"); // fixme: find better defaults - unsigned comp_maxiter = 10; // fixme: find better defaults - unsigned lb_maxiter = comp_maxiter; // fixme: find better defaults + // fixme: find better defaults + cost_func comp_cost("1e9, 0"); + cost_func comm_cost("1, 0"); + + // Parameters for the end of the simulation + // fixme: find better defaults + unsigned comp_maxiter = 10; + unsigned lb_maxiter = comp_maxiter; bool exit_on_close = false; // Named parameters lists @@ -261,27 +267,27 @@ void opt::print() INFO2("| %s: " format, h.descr(description), value) INFO0(",----[ Simulation parameters ]"); - DESCR("log rate", "%s", h.val_or_string(log_rate, "disabled")); + DESCR("log rate", "%s", h.val_or_string(log_rate, "disabled")); DESCR("platform file", "\"%s\"", platform_file.c_str()); if (auto_depl::enabled) { INFO0("| automatic deployment enabled"); - DESCR("- topology", "%s", auto_depl::topology.c_str()); - DESCR("- number of hosts", "%s", h.val_or_string(auto_depl::nhosts, - "auto")); - DESCR("- initial load", "%s", h.val_or_string(auto_depl::load, - "auto")); + DESCR("- topology", "%s", auto_depl::topology.c_str()); + DESCR("- number of hosts", "%s", h.val_or_string(auto_depl::nhosts, + "auto")); + DESCR("- initial load", "%s", h.val_or_string(auto_depl::load, + "auto")); } else { DESCR("deployment file", "\"%s\"", deployment_file.c_str()); } - DESCR("load balancing algorithm", "%s", loba_algo.c_str()); - DESCR("bookkeeping", "%s", h.on_off(bookkeeping)); - DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str()); + DESCR("load balancing algorithm", "%s", loba_algo.c_str()); + DESCR("bookkeeping", "%s", h.on_off(bookkeeping)); + DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str()); DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str()); 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("exit on close", "%s", h.on_off(exit_on_close)); + DESCR("exit on close", "%s", h.on_off(exit_on_close)); INFO0("`----"); #undef DESCR @@ -340,7 +346,7 @@ void opt::usage() << " (" << opt::loba_algo << ")\n"; if (opt::help_requested > 1) so_list(opt::loba_algorithms); - std::clog << o("-b") << "enable bookkeeping\n"; + std::clog << o("-b") << "enable bookkeeping (\"virtual load\")\n"; std::clog << "\nApplication parameters\n"; std::clog << o("-c [fn,...]f0") @@ -349,13 +355,15 @@ void opt::usage() std::clog << o("-C [fn,...]f0") << "polynomial factors for communication cost" << " (" << opt::comm_cost.to_string() << ")\n"; - std::clog << o("-e") << "exit on reception of \"close\" message\n"; + + 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("-e") << "exit on reception of \"close\" message\n"; if (opt::help_requested < 3) return; diff --git a/options.h b/options.h index 37a4d8c..d507208 100644 --- a/options.h +++ b/options.h @@ -3,9 +3,11 @@ #include #include "cost_func.h" -#include "deployment.h" #include "named_object_list.h" -#include "process.h" + +// These classes may use include options.h, so make forward declarations +class deployment_generator; +class process; // Global parameters, shared by all the processes namespace opt { @@ -40,6 +42,8 @@ namespace opt { // Application parameters extern cost_func comp_cost; extern cost_func comm_cost; + + // Parameters for the end of the simulation extern unsigned comp_maxiter; extern unsigned lb_maxiter; extern bool exit_on_close; diff --git a/process.cpp b/process.cpp index b6afb49..23c7abf 100644 --- a/process.cpp +++ b/process.cpp @@ -156,7 +156,7 @@ double process::sum_of_to_send() const double process::load_balance(double /*my_load*/) { if (lb_iter == 1) // warn only once - WARN0("process::load_balance is a no-op!"); + WARN0("process::load_balance() is a no-op!"); return 0.0; } diff --git a/version.cpp b/version.cpp index 344386d..6b6889a 100644 --- a/version.cpp +++ b/version.cpp @@ -14,7 +14,7 @@ namespace version { (__DATE__ " " __TIME__); const std::string copyright - ("Copyright (c) 2010, Arnaud Giersch "); + ("Copyright (c) 2010-2011, Arnaud Giersch "); }