From 0f6a14a19174c4a63f68a219be678bcdb8f85707 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 18 Nov 2019 00:49:28 +0100 Subject: [PATCH] a bit of cleanup, could go further but not now --- src/plugins/vm/VirtualMachineImpl.hpp | 5 +++ src/surf/HostImpl.cpp | 46 -------------------------- src/surf/HostImpl.hpp | 2 +- src/surf/host_clm03.cpp | 47 +++++++++++++++++++++++++++ src/surf/host_clm03.hpp | 2 ++ 5 files changed, 55 insertions(+), 47 deletions(-) diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp index 615d0f2fe3..8f27c16fba 100644 --- a/src/plugins/vm/VirtualMachineImpl.hpp +++ b/src/plugins/vm/VirtualMachineImpl.hpp @@ -84,6 +84,11 @@ public: double next_occurring_event(double now) override; void update_actions_state(double /*now*/, double /*delta*/) override{}; + kernel::resource::Action* execute_parallel(const std::vector& host_list, const double* flops_amount, + const double* bytes_amount, double rate) override + { + return nullptr; + }; }; } } diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 86b966de92..0765a88984 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -22,52 +22,6 @@ namespace surf { /********* * Model * *********/ -/* Helper function for executeParallelTask */ -static inline double has_cost(const double* array, size_t pos) -{ - if (array) - return array[pos]; - return -1.0; -} - -kernel::resource::Action* HostModel::execute_parallel(const std::vector& host_list, - const double* flops_amount, const double* bytes_amount, - double rate) -{ - kernel::resource::Action* action = nullptr; - if ((host_list.size() == 1) && (has_cost(bytes_amount, 0) <= 0) && (has_cost(flops_amount, 0) > 0)) { - action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]); - } else if ((host_list.size() == 1) && (has_cost(flops_amount, 0) <= 0)) { - action = surf_network_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate); - } else if ((host_list.size() == 2) && (has_cost(flops_amount, 0) <= 0) && (has_cost(flops_amount, 1) <= 0)) { - int nb = 0; - double value = 0.0; - - for (size_t i = 0; i < host_list.size() * host_list.size(); i++) { - if (has_cost(bytes_amount, i) > 0.0) { - nb++; - value = has_cost(bytes_amount, i); - } - } - if (nb == 1) { - action = surf_network_model->communicate(host_list[0], host_list[1], value, rate); - } else if (nb == 0) { - xbt_die("Cannot have a communication with no flop to exchange in this model. You should consider using the " - "ptask model"); - } else { - xbt_die("Cannot have a communication that is not a simple point-to-point in this model. You should consider " - "using the ptask model"); - } - } else { - xbt_die( - "This model only accepts one of the following. You should consider using the ptask model for the other cases.\n" - " - execution with one host only and no communication\n" - " - Self-comms with one host only\n" - " - Communications with two hosts and no computation"); - } - return action; -} - /************ * Resource * ************/ diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index 3de2ae6e7a..0aef460423 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -32,7 +32,7 @@ public: virtual kernel::resource::Action* execute_parallel(const std::vector& host_list, const double* flops_amount, const double* bytes_amount, - double rate); + double rate) = 0; }; /************ diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index d7f29954ee..18b646e096 100644 --- a/src/surf/host_clm03.cpp +++ b/src/surf/host_clm03.cpp @@ -30,6 +30,7 @@ HostCLM03Model::HostCLM03Model() { all_existing_models.push_back(this); } + double HostCLM03Model::next_occurring_event(double now) { double min_by_cpu = surf_cpu_model_pm->next_occurring_event(now); @@ -57,5 +58,51 @@ void HostCLM03Model::update_actions_state(double /*now*/, double /*delta*/) /* I've no action to update */ } +/* Helper function for executeParallelTask */ +static inline double has_cost(const double* array, size_t pos) +{ + if (array) + return array[pos]; + return -1.0; +} + +kernel::resource::Action* HostCLM03Model::execute_parallel(const std::vector& host_list, + const double* flops_amount, const double* bytes_amount, + double rate) +{ + kernel::resource::Action* action = nullptr; + if ((host_list.size() == 1) && (has_cost(bytes_amount, 0) <= 0) && (has_cost(flops_amount, 0) > 0)) { + action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]); + } else if ((host_list.size() == 1) && (has_cost(flops_amount, 0) <= 0)) { + action = surf_network_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate); + } else if ((host_list.size() == 2) && (has_cost(flops_amount, 0) <= 0) && (has_cost(flops_amount, 1) <= 0)) { + int nb = 0; + double value = 0.0; + + for (size_t i = 0; i < host_list.size() * host_list.size(); i++) { + if (has_cost(bytes_amount, i) > 0.0) { + nb++; + value = has_cost(bytes_amount, i); + } + } + if (nb == 1) { + action = surf_network_model->communicate(host_list[0], host_list[1], value, rate); + } else if (nb == 0) { + xbt_die("Cannot have a communication with no flop to exchange in this model. You should consider using the " + "ptask model"); + } else { + xbt_die("Cannot have a communication that is not a simple point-to-point in this model. You should consider " + "using the ptask model"); + } + } else { + xbt_die( + "This model only accepts one of the following. You should consider using the ptask model for the other cases.\n" + " - execution with one host only and no communication\n" + " - Self-comms with one host only\n" + " - Communications with two hosts and no computation"); + } + return action; +} + } // namespace surf } // namespace simgrid diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp index 65ed7f5ae6..7ab9e0e4b3 100644 --- a/src/surf/host_clm03.hpp +++ b/src/surf/host_clm03.hpp @@ -20,6 +20,8 @@ public: HostCLM03Model(); double next_occurring_event(double now) override; void update_actions_state(double now, double delta) override; + kernel::resource::Action* execute_parallel(const std::vector& host_list, const double* flops_amount, + const double* bytes_amount, double rate) override; }; } } -- 2.20.1