-/* Copyright (c) 2006-2016. The SimGrid Team.
+/* Copyright (c) 2006-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "simdag_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/surf_interface.hpp"
-#include "src/simdag/simdag_private.h"
-#include "simgrid/simdag.h"
-#include "src/instr/instr_private.h"
+#include <algorithm>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)");
xbt_free(task->flops_amount);
xbt_free(task->bytes_amount);
- task->flops_amount = nullptr;
task->bytes_amount = nullptr;
-}
-
-void* SD_task_new_f()
-{
- SD_task_t task = xbt_new0(s_SD_task_t, 1);
-
- task->inputs = new std::set<SD_task_t>();
- task->outputs = new std::set<SD_task_t>();
- task->predecessors = new std::set<SD_task_t>();
- task->successors = new std::set<SD_task_t>();
- return task;
-}
-
-void SD_task_recycle_f(void *t)
-{
- SD_task_t task = static_cast<SD_task_t>(t);
-
- /* Reset the content */
- task->kind = SD_TASK_NOT_TYPED;
- task->state= SD_NOT_SCHEDULED;
- sd_global->initial_tasks->insert(task);
-
- task->marked = 0;
-
- task->start_time = -1.0;
- task->finish_time = -1.0;
- task->surf_action = nullptr;
- task->watch_points = 0;
-
- /* dependencies */
- task->inputs->clear();
- task->outputs->clear();
- task->predecessors->clear();
- task->successors->clear();
-
- /* scheduling parameters */
- task->host_count = 0;
- task->host_list = nullptr;
task->flops_amount = nullptr;
- task->bytes_amount = nullptr;
- task->rate = -1;
-}
-
-void SD_task_free_f(void *t)
-{
- SD_task_t task = static_cast<SD_task_t>(t);
-
- delete task->inputs;
- delete task->outputs;
- delete task->predecessors;
- delete task->successors;
-
- xbt_free(task);
}
/**
*/
SD_task_t SD_task_create(const char *name, void *data, double amount)
{
- SD_task_t task = static_cast<SD_task_t>(xbt_mallocator_get(sd_global->task_mallocator));
+ SD_task_t task = xbt_new0(s_SD_task_t, 1);
+ task->kind = SD_TASK_NOT_TYPED;
+ task->state= SD_NOT_SCHEDULED;
+ sd_global->initial_tasks->insert(task);
+
+ task->marked = 0;
+ task->start_time = -1.0;
+ task->finish_time = -1.0;
+ task->surf_action = nullptr;
+ task->watch_points = 0;
+
+ task->inputs = new std::set<SD_task_t>();
+ task->outputs = new std::set<SD_task_t>();
+ task->predecessors = new std::set<SD_task_t>();
+ task->successors = new std::set<SD_task_t>();
task->data = data;
task->name = xbt_strdup(name);
task->amount = amount;
- task->remains = amount;
-
+ task->allocation = new std::vector<sg_host_t>();
+ task->rate = -1;
return task;
}
-static inline SD_task_t SD_task_create_sized(const char *name, void *data, double amount, int ws_count)
+static inline SD_task_t SD_task_create_sized(const char *name, void *data, double amount, int count)
{
SD_task_t task = SD_task_create(name, data, amount);
- task->bytes_amount = xbt_new0(double, ws_count * ws_count);
- task->flops_amount = xbt_new0(double, ws_count);
- task->host_count = ws_count;
- task->host_list = xbt_new0(sg_host_t, ws_count);
+ task->bytes_amount = xbt_new0(double, count * count);
+ task->flops_amount = xbt_new0(double, count);
return task;
}
/** @brief create a complex data redistribution task that can then be auto-scheduled
*
- * Auto-scheduling mean that the task can be used with SD_task_schedulev().
+ * Auto-scheduling mean that the task can be used with SD_task_schedulev().
* This allows to specify the task costs at creation, and decouple them from the scheduling process where you just
* specify which resource should communicate.
*
SD_task_t SD_task_create_comm_par_mxn_1d_block(const char *name, void *data, double amount)
{
SD_task_t res = SD_task_create(name, data, amount);
- res->host_list=nullptr;
res->kind = SD_TASK_COMM_PAR_MXN_1D_BLOCK;
return res;
XBT_DEBUG("Destroying task %s...", SD_task_get_name(task));
/* First Remove all dependencies associated with the task. */
- while (!task->predecessors->empty())
+ while (not task->predecessors->empty())
SD_task_dependency_remove(*(task->predecessors->begin()), task);
- while (!task->inputs->empty())
+ while (not task->inputs->empty())
SD_task_dependency_remove(*(task->inputs->begin()), task);
- while (!task->successors->empty())
+ while (not task->successors->empty())
SD_task_dependency_remove(task, *(task->successors->begin()));
- while (!task->outputs->empty())
- SD_task_dependency_remove(task, *(task->outputs->begin()));
+ while (not task->outputs->empty())
+ SD_task_dependency_remove(task, *(task->outputs->begin()));
if (task->state == SD_SCHEDULED || task->state == SD_RUNNABLE)
__SD_task_destroy_scheduling_data(task);
- int idx = xbt_dynar_search_or_negative(sd_global->return_set, &task);
- if (idx >=0) {
- xbt_dynar_remove_at(sd_global->return_set, idx, nullptr);
- }
-
xbt_free(task->name);
if (task->surf_action != nullptr)
task->surf_action->unref();
- xbt_free(task->host_list);
+ delete task->allocation;
xbt_free(task->bytes_amount);
xbt_free(task->flops_amount);
-
- xbt_mallocator_release(sd_global->task_mallocator,task);
+ delete task->inputs;
+ delete task->outputs;
+ delete task->predecessors;
+ delete task->successors;
+ xbt_free(task);
XBT_DEBUG("Task destroyed.");
}
/**
* \brief Sets the user data of a task
*
- * The new data can be \c nullptr. The old data should have been freed first
- * if it was not \c nullptr.
+ * The new data can be \c nullptr. The old data should have been freed first, if it was not \c nullptr.
*
* \param task a task
* \param data the new data you want to associate with this task
{
std::set<SD_task_t>::iterator idx;
XBT_DEBUG("Set state of '%s' to %d", task->name, new_state);
- switch (new_state) {
- case SD_NOT_SCHEDULED:
- case SD_SCHEDULABLE:
- if (SD_task_get_state(task) == SD_FAILED){
- sd_global->completed_tasks->erase(task);
- sd_global->initial_tasks->insert(task);
- }
- break;
- case SD_SCHEDULED:
- if (SD_task_get_state(task) == SD_RUNNABLE){
- sd_global->initial_tasks->insert(task);
- sd_global->runnable_tasks->erase(task);
- }
- break;
- case SD_RUNNABLE:
+ if ((new_state == SD_NOT_SCHEDULED || new_state == SD_SCHEDULABLE) && task->state == SD_FAILED){
+ sd_global->completed_tasks->erase(task);
+ sd_global->initial_tasks->insert(task);
+ }
+
+ if (new_state == SD_SCHEDULED && task->state == SD_RUNNABLE){
+ sd_global->initial_tasks->insert(task);
+ sd_global->runnable_tasks->erase(task);
+ }
+
+ if (new_state == SD_RUNNABLE){
idx = sd_global->initial_tasks->find(task);
if (idx != sd_global->initial_tasks->end()) {
sd_global->runnable_tasks->insert(*idx);
sd_global->initial_tasks->erase(idx);
}
- break;
- case SD_RUNNING:
+ }
+
+ if (new_state == SD_RUNNING)
sd_global->runnable_tasks->erase(task);
- break;
- case SD_DONE:
+
+ if (new_state == SD_DONE || new_state == SD_FAILED){
sd_global->completed_tasks->insert(task);
task->start_time = task->surf_action->getStartTime();
- task->finish_time = task->surf_action->getFinishTime();
- task->surf_action->unref();
- task->surf_action = nullptr;
- task->remains = 0;
-#if HAVE_JEDULE
- jedule_log_sd_event(task);
+ if (new_state == SD_DONE){
+ task->finish_time = task->surf_action->getFinishTime();
+#if SIMGRID_HAVE_JEDULE
+ jedule_log_sd_event(task);
#endif
- break;
- case SD_FAILED:
- sd_global->completed_tasks->insert(task);
- task->start_time = task->surf_action->getStartTime();
- task->finish_time = surf_get_clock();
+ } else
+ task->finish_time = surf_get_clock();
task->surf_action->unref();
task->surf_action = nullptr;
- break;
- default:
- xbt_die( "Invalid state");
+ task->allocation->clear();
}
task->state = new_state;
if (task->watch_points & new_state) {
- XBT_VERB("Watch point reached with task '%s'!", SD_task_get_name(task));
+ XBT_VERB("Watch point reached with task '%s'!", task->name);
sd_global->watch_point_reached = true;
SD_task_unwatch(task, new_state); /* remove the watch point */
}
{
xbt_dynar_t parents = xbt_dynar_new(sizeof(SD_task_t), nullptr);
- for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it)
- xbt_dynar_push(parents, &(*it));
- for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it)
- xbt_dynar_push(parents, &(*it));
+ for (auto const& it : *task->predecessors)
+ xbt_dynar_push(parents, &it);
+ for (auto const& it : *task->inputs)
+ xbt_dynar_push(parents, &it);
return parents;
}
{
xbt_dynar_t children = xbt_dynar_new(sizeof(SD_task_t), nullptr);
- for (std::set<SD_task_t>::iterator it=task->successors->begin(); it!=task->successors->end(); ++it)
- xbt_dynar_push(children, &(*it));
- for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it)
- xbt_dynar_push(children, &(*it));
+ for (auto const& it : *task->successors)
+ xbt_dynar_push(children, &it);
+ for (auto const& it : *task->outputs)
+ xbt_dynar_push(children, &it);
return children;
}
*/
int SD_task_get_workstation_count(SD_task_t task)
{
- return task->host_count;
+ return task->allocation->size();
}
/**
*/
sg_host_t *SD_task_get_workstation_list(SD_task_t task)
{
- return task->host_list;
+ return task->allocation->data();
}
/**
if (task->surf_action)
return task->surf_action->getRemains();
else
- return task->remains;
+ return (task->state == SD_DONE) ? 0 : task->amount;
}
e_SD_task_kind_t SD_task_get_kind(SD_task_t task)
void SD_task_dump(SD_task_t task)
{
XBT_INFO("Displaying task %s", SD_task_get_name(task));
- char *statename = bprintf("%s%s%s%s%s%s%s",
- (task->state == SD_NOT_SCHEDULED ? " not scheduled" : ""),
- (task->state == SD_SCHEDULABLE ? " schedulable" : ""),
- (task->state == SD_SCHEDULED ? " scheduled" : ""),
- (task->state == SD_RUNNABLE ? " runnable" : " not runnable"),
- (task->state == SD_RUNNING ? " running" : ""),
- (task->state == SD_DONE ? " done" : ""),
- (task->state == SD_FAILED ? " failed" : ""));
- XBT_INFO(" - state:%s", statename);
- free(statename);
+ if (task->state == SD_RUNNABLE)
+ XBT_INFO(" - state: runnable");
+ else if (task->state < SD_RUNNABLE)
+ XBT_INFO(" - state: %s not runnable", __get_state_name(task->state));
+ else
+ XBT_INFO(" - state: not runnable %s", __get_state_name(task->state));
if (task->kind != 0) {
switch (task->kind) {
XBT_INFO(" - Dependencies to satisfy: %zu", task->inputs->size()+ task->predecessors->size());
if ((task->inputs->size()+ task->predecessors->size()) > 0) {
XBT_INFO(" - pre-dependencies:");
- for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it)
- XBT_INFO(" %s", SD_task_get_name(*it));
+ for (auto const& it : *task->predecessors)
+ XBT_INFO(" %s", it->name);
- for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it)
- XBT_INFO(" %s", SD_task_get_name(*it));
+ for (auto const& it : *task->inputs)
+ XBT_INFO(" %s", it->name);
}
if ((task->outputs->size() + task->successors->size()) > 0) {
XBT_INFO(" - post-dependencies:");
- for (std::set<SD_task_t>::iterator it=task->successors->begin(); it!=task->successors->end(); ++it)
- XBT_INFO(" %s", SD_task_get_name(*it));
- for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it)
- XBT_INFO(" %s", SD_task_get_name(*it));
+ for (auto const& it : *task->successors)
+ XBT_INFO(" %s", it->name);
+ for (auto const& it : *task->outputs)
+ XBT_INFO(" %s", it->name);
}
}
xbt_die("Unknown task type!");
}
fprintf(fout, "];\n");
- for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it)
- fprintf(fout, " T%p -> T%p;\n", (*it), task);
- for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it)
- fprintf(fout, " T%p -> T%p;\n", (*it), task);
+ for (auto const& it : *task->predecessors)
+ fprintf(fout, " T%p -> T%p;\n", it, task);
+ for (auto const& it : *task->inputs)
+ fprintf(fout, " T%p -> T%p;\n", it, task);
}
/**
* now and if it was the only task.
*
* \param task the task to evaluate
- * \param workstation_nb number of workstations on which the task would be executed
- * \param workstation_list the workstations on which the task would be executed
- * \param flops_amount computation amount for each workstation (i.e., an array of workstation_nb doubles)
- * \param bytes_amount communication amount between each pair of workstations (i.e., a matrix of
- * workstation_nb*workstation_nb doubles)
+ * \param host_count number of hosts on which the task would be executed
+ * \param host_list the hosts on which the task would be executed
+ * \param flops_amount computation amount for each host(i.e., an array of host_count doubles)
+ * \param bytes_amount communication amount between each pair of hosts (i.e., a matrix of host_count*host_count doubles)
* \see SD_schedule()
*/
-double SD_task_get_execution_time(SD_task_t task, int workstation_nb, const sg_host_t *workstation_list,
+double SD_task_get_execution_time(SD_task_t task, int host_count, const sg_host_t *host_list,
const double *flops_amount, const double *bytes_amount)
{
- xbt_assert(workstation_nb > 0, "Invalid parameter");
+ xbt_assert(host_count > 0, "Invalid parameter");
double max_time = 0.0;
/* the task execution time is the maximum execution time of the parallel tasks */
- for (int i = 0; i < workstation_nb; i++) {
+ for (int i = 0; i < host_count; i++) {
double time = 0.0;
if (flops_amount != nullptr)
- time = flops_amount[i] / workstation_list[i]->speed();
+ time = flops_amount[i] / host_list[i]->getSpeed();
if (bytes_amount != nullptr)
- for (int j = 0; j < workstation_nb; j++) {
- if (bytes_amount[i * workstation_nb + j] !=0 ) {
- time += (SD_route_get_latency(workstation_list[i], workstation_list[j]) +
- bytes_amount[i * workstation_nb + j] /
- SD_route_get_bandwidth(workstation_list[i], workstation_list[j]));
- }
- }
+ for (int j = 0; j < host_count; j++)
+ if (bytes_amount[i * host_count + j] != 0)
+ time += (sg_host_route_latency(host_list[i], host_list[j]) +
+ bytes_amount[i * host_count + j] / sg_host_route_bandwidth(host_list[i], host_list[j]));
- if (time > max_time) {
+ if (time > max_time)
max_time = time;
- }
}
return max_time;
}
*
* \param task the task you want to schedule
* \param host_count number of hosts on which the task will be executed
- * \param workstation_list the hosts on which the task will be executed
+ * \param host_list the hosts on which the task will be executed
* \param flops_amount computation amount for each hosts (i.e., an array of host_count doubles)
* \param bytes_amount communication amount between each pair of hosts (i.e., a matrix of host_count*host_count doubles)
* \param rate task execution speed rate
* \see SD_task_unschedule()
*/
-void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * workstation_list,
+void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * host_list,
const double *flops_amount, const double *bytes_amount, double rate)
{
- xbt_assert(host_count > 0, "workstation_nb must be positive");
+ xbt_assert(host_count > 0, "host_count must be positive");
- task->host_count = host_count;
task->rate = rate;
if (flops_amount) {
task->bytes_amount = nullptr;
}
- task->host_list = static_cast<sg_host_t*>(xbt_realloc(task->host_list, sizeof(sg_host_t) * host_count));
- memcpy(task->host_list, workstation_list, sizeof(sg_host_t) * host_count);
+ for(int i =0; i<host_count; i++)
+ task->allocation->push_back(host_list[i]);
SD_task_do_schedule(task);
}
&& ((task->kind == SD_TASK_COMP_PAR_AMDAHL) || (task->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK))) {
/* Don't free scheduling data for typed tasks */
__SD_task_destroy_scheduling_data(task);
- xbt_free(task->host_list);
- task->host_list=nullptr;
- task->host_count = 0;
+ task->allocation->clear();
}
if (SD_task_get_state(task) == SD_RUNNING)
else
SD_task_set_state(task, SD_NOT_SCHEDULED);
}
- task->remains = task->amount;
task->start_time = -1.0;
}
void SD_task_run(SD_task_t task)
{
xbt_assert(task->state == SD_RUNNABLE, "Task '%s' is not runnable! Task state: %d", task->name, (int) task->state);
- xbt_assert(task->host_list != nullptr, "Task '%s': workstation_list is nullptr!", task->name);
+ xbt_assert(task->allocation != nullptr, "Task '%s': host_list is nullptr!", task->name);
XBT_VERB("Executing task '%s'", task->name);
/* Copy the elements of the task into the action */
- int host_nb = task->host_count;
- sg_host_t *hosts = xbt_new(sg_host_t, host_nb);
-
- for (int i = 0; i < host_nb; i++)
- hosts[i] = task->host_list[i];
+ int host_nb = task->allocation->size();
+ sg_host_t* hosts = new sg_host_t[host_nb];
+ std::copy_n(task->allocation->begin(), host_nb, hosts);
- double *flops_amount = xbt_new0(double, host_nb);
- double *bytes_amount = xbt_new0(double, host_nb * host_nb);
+ double* flops_amount = new double[host_nb]();
+ double* bytes_amount = new double[host_nb * host_nb]();
if(task->flops_amount)
- memcpy(flops_amount, task->flops_amount, sizeof(double) * host_nb);
+ std::copy_n(task->flops_amount, host_nb, flops_amount);
if(task->bytes_amount)
- memcpy(bytes_amount, task->bytes_amount, sizeof(double) * host_nb * host_nb);
+ std::copy_n(task->bytes_amount, host_nb * host_nb, bytes_amount);
task->surf_action = surf_host_model->executeParallelTask(host_nb, hosts, flops_amount, bytes_amount, task->rate);
__SD_task_destroy_scheduling_data(task); /* now the scheduling data are not useful anymore */
SD_task_set_state(task, SD_RUNNING);
- xbt_dynar_push(sd_global->return_set, &task);
+ sd_global->return_set->insert(task);
}
/**
return task->finish_time;
}
-void SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count)
+void SD_task_distribute_comp_amdahl(SD_task_t task, int count)
{
xbt_assert(task->kind == SD_TASK_COMP_PAR_AMDAHL, "Task %s is not a SD_TASK_COMP_PAR_AMDAHL typed task."
"Cannot use this function.", task->name);
- task->flops_amount = xbt_new0(double, ws_count);
- task->bytes_amount = xbt_new0(double, ws_count * ws_count);
- xbt_free(task->host_list);
- task->host_count = ws_count;
- task->host_list = xbt_new0(sg_host_t, ws_count);
-
- for(int i=0;i<ws_count;i++){
- task->flops_amount[i] = (task->alpha + (1 - task->alpha)/ws_count) * task->amount;
+ task->flops_amount = xbt_new0(double, count);
+ task->bytes_amount = xbt_new0(double, count * count);
+
+ for (int i=0; i<count; i++){
+ task->flops_amount[i] = (task->alpha + (1 - task->alpha)/count) * task->amount;
+ }
+}
+
+void SD_task_build_MxN_1D_block_matrix(SD_task_t task, int src_nb, int dst_nb){
+ xbt_assert(task->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK, "Task %s is not a SD_TASK_COMM_PAR_MXN_1D_BLOCK typed task."
+ "Cannot use this function.", task->name);
+ xbt_free(task->bytes_amount);
+ task->bytes_amount = xbt_new0(double,task->allocation->size() * task->allocation->size());
+
+ for (int i=0; i<src_nb; i++) {
+ double src_start = i*task->amount/src_nb;
+ double src_end = src_start + task->amount/src_nb;
+ for (int j=0; j<dst_nb; j++) {
+ double dst_start = j*task->amount/dst_nb;
+ double dst_end = dst_start + task->amount/dst_nb;
+ XBT_VERB("(%d->%d): (%.2f, %.2f)-> (%.2f, %.2f)", i, j, src_start, src_end, dst_start, dst_end);
+ task->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0;
+ if ((src_end > dst_start) && (dst_end > src_start)) { /* There is something to send */
+ task->bytes_amount[i*(src_nb+dst_nb)+src_nb+j] = MIN(src_end, dst_end)- MAX(src_start, dst_start);
+ XBT_VERB("==> %.2f", task->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]);
+ }
+ }
}
}
* creation, and decouple them from the scheduling process where you just specify which resource should deliver the
* mandatory power.
*
- * To be auto-schedulable, a task must be type and created with one of the specialized creation functions.
- *
- * @todo
- * We should create tasks kind for the following categories:
- * - Point to point communication (done)
- * - Sequential computation (done)
- * - group communication (redistribution, several kinds)
- * - parallel tasks with no internal communication (one kind per speedup model such as Amdahl)
- * - idem+ internal communication. Task type not enough since we cannot store comm cost alongside to comp one)
+ * To be auto-schedulable, a task must be a typed computation SD_TASK_COMP_SEQ or SD_TASK_COMP_PAR_AMDAHL.
*/
void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
{
- int i;
- int j;
- xbt_assert(task->kind != 0, "Task %s is not typed. Cannot automatically schedule it.", SD_task_get_name(task));
- switch (task->kind) {
- case SD_TASK_COMP_PAR_AMDAHL:
- SD_task_distribute_comp_amdahl(task, count);
- /* no break */
- case SD_TASK_COMM_E2E:
- case SD_TASK_COMP_SEQ:
- xbt_assert(task->host_count == count, "Got %d locations, but were expecting %d locations", count,task->host_count);
- for (i = 0; i < count; i++)
- task->host_list[i] = list[i];
- if (SD_task_get_kind(task)== SD_TASK_COMP_SEQ && !task->flops_amount){
- /*This task has failed and is rescheduled. Reset the flops_amount*/
+ xbt_assert(task->kind == SD_TASK_COMP_SEQ || task->kind == SD_TASK_COMP_PAR_AMDAHL,
+ "Task %s is not typed. Cannot automatically schedule it.", SD_task_get_name(task));
+
+ for(int i =0; i<count; i++)
+ task->allocation->push_back(list[i]);
+
+ XBT_VERB("Schedule computation task %s on %zu host(s)", task->name, task->allocation->size());
+
+ if (task->kind == SD_TASK_COMP_SEQ) {
+ if (not task->flops_amount) { /*This task has failed and is rescheduled. Reset the flops_amount*/
task->flops_amount = xbt_new0(double, 1);
- task->flops_amount[0] = task->remains;
+ task->flops_amount[0] = task->amount;
}
- SD_task_do_schedule(task);
- break;
- default:
- xbt_die("Kind of task %s not supported by SD_task_schedulev()", SD_task_get_name(task));
+ XBT_VERB("It costs %.f flops", task->flops_amount[0]);
}
- if (task->kind == SD_TASK_COMM_E2E) {
- XBT_VERB("Schedule comm task %s between %s -> %s. It costs %.f bytes", SD_task_get_name(task),
- sg_host_get_name(task->host_list[0]), sg_host_get_name(task->host_list[1]), task->bytes_amount[2]);
+ if (task->kind == SD_TASK_COMP_PAR_AMDAHL) {
+ SD_task_distribute_comp_amdahl(task, count);
+ XBT_VERB("%.f flops will be distributed following Amdahl's Law", task->flops_amount[0]);
}
- /* Iterate over all inputs and outputs to say where I am located (and start them if runnable) */
- if (task->kind == SD_TASK_COMP_SEQ) {
- XBT_VERB("Schedule computation task %s on %s. It costs %.f flops", SD_task_get_name(task),
- sg_host_get_name(task->host_list[0]), task->flops_amount[0]);
-
- for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it){
- SD_task_t input = *it;
- input->host_list[1] = task->host_list[0];
- if (input->host_list[0] && (SD_task_get_state(input) < SD_SCHEDULED)) {
- SD_task_do_schedule(input);
- XBT_VERB ("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes", SD_task_get_name(input),
- sg_host_get_name(input->host_list[0]), sg_host_get_name(input->host_list[1]), input->bytes_amount[2]);
- }
- }
+ SD_task_do_schedule(task);
- for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){
- SD_task_t output = *it;
- output->host_list[0] = task->host_list[0];
- if (output->host_list[1] && (SD_task_get_state(output) < SD_SCHEDULED)) {
- SD_task_do_schedule(output);
- XBT_VERB ("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes", SD_task_get_name(output),
- sg_host_get_name(output->host_list[0]), sg_host_get_name(output->host_list[1]),
- output->bytes_amount[2]);
- }
+ /* Iterate over all inputs and outputs to say where I am located (and start them if runnable) */
+ for (auto const& input : *task->inputs) {
+ int src_nb = input->allocation->size();
+ int dst_nb = count;
+ if (input->allocation->empty())
+ XBT_VERB("Sender side of '%s' not scheduled. Set receiver side to '%s''s allocation", input->name, task->name);
+
+ for (int i=0; i<count;i++)
+ input->allocation->push_back(task->allocation->at(i));
+
+ if (input->allocation->size () > task->allocation->size()) {
+ if (task->kind == SD_TASK_COMP_PAR_AMDAHL)
+ SD_task_build_MxN_1D_block_matrix(input, src_nb, dst_nb);
+
+ SD_task_do_schedule(input);
+ XBT_VERB ("Auto-Schedule Communication task '%s'. Send %.f bytes from %d hosts to %d hosts.",
+ input->name,input->amount, src_nb, dst_nb);
}
}
- /* Iterate over all children and parents being MXN_1D_BLOCK to say where I am located (and start them if runnable) */
- if (task->kind == SD_TASK_COMP_PAR_AMDAHL) {
- XBT_VERB("Schedule computation task %s on %d workstations. %.f flops will be distributed following Amdahl's Law",
- SD_task_get_name(task), task->host_count, task->flops_amount[0]);
- for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it){
- SD_task_t input = *it;
- if (!input->host_list){
- XBT_VERB("Sender side of Task %s is not scheduled yet", SD_task_get_name(input));
- input->host_list = xbt_new0(sg_host_t, count);
- input->host_count = count;
- XBT_VERB("Fill the workstation list with list of Task '%s'", SD_task_get_name(task));
- for (i=0;i<count;i++)
- input->host_list[i] = task->host_list[i];
- } else {
- XBT_VERB("Build communication matrix for task '%s'", SD_task_get_name(input));
- int src_nb, dst_nb;
- double src_start, src_end, dst_start, dst_end;
- src_nb = input->host_count;
- dst_nb = count;
- input->host_list = static_cast<sg_host_t*>(xbt_realloc(input->host_list, (input->host_count+count)*sizeof(sg_host_t)));
- for(i=0; i<count; i++)
- input->host_list[input->host_count+i] = task->host_list[i];
-
- input->host_count += count;
- xbt_free(input->flops_amount);
- xbt_free(input->bytes_amount);
- input->flops_amount = xbt_new0(double, input->host_count);
- input->bytes_amount = xbt_new0(double, input->host_count* input->host_count);
-
- for(i=0;i<src_nb;i++){
- src_start = i*input->amount/src_nb;
- src_end = src_start + input->amount/src_nb;
- for(j=0; j<dst_nb; j++){
- dst_start = j*input->amount/dst_nb;
- dst_end = dst_start + input->amount/dst_nb;
- XBT_VERB("(%s->%s): (%.2f, %.2f)-> (%.2f, %.2f)", sg_host_get_name(input->host_list[i]),
- sg_host_get_name(input->host_list[src_nb+j]), src_start, src_end, dst_start, dst_end);
- if ((src_end <= dst_start) || (dst_end <= src_start)) {
- input->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0;
- } else {
- input->bytes_amount[i*(src_nb+dst_nb)+src_nb+j] = MIN(src_end, dst_end) - MAX(src_start, dst_start);
- }
- XBT_VERB("==> %.2f", input->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]);
- }
- }
-
- if (SD_task_get_state(input)< SD_SCHEDULED) {
- SD_task_do_schedule(input);
- XBT_VERB ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.",
- SD_task_get_name(input),input->amount, src_nb, dst_nb);
- }
- }
- }
+ for (auto const& output : *task->outputs) {
+ int src_nb = count;
+ int dst_nb = output->allocation->size();
+ if (output->allocation->empty())
+ XBT_VERB("Receiver side of '%s' not scheduled. Set sender side to '%s''s allocation", output->name, task->name);
- for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){
- SD_task_t output = *it;
- if (!output->host_list){
- XBT_VERB("Receiver side of Task '%s' is not scheduled yet", SD_task_get_name(output));
- output->host_list = xbt_new0(sg_host_t, count);
- output->host_count = count;
- XBT_VERB("Fill the workstation list with list of Task '%s'", SD_task_get_name(task));
- for (i=0;i<count;i++)
- output->host_list[i] = task->host_list[i];
- } else {
- int src_nb, dst_nb;
- double src_start, src_end, dst_start, dst_end;
- src_nb = count;
- dst_nb = output->host_count;
- output->host_list = static_cast<sg_host_t*>(xbt_realloc(output->host_list, (output->host_count+count)*sizeof(sg_host_t)));
- for(i=output->host_count - 1; i>=0; i--)
- output->host_list[count+i] = output->host_list[i];
- for(i=0; i<count; i++)
- output->host_list[i] = task->host_list[i];
-
- output->host_count += count;
-
- xbt_free(output->flops_amount);
- xbt_free(output->bytes_amount);
-
- output->flops_amount = xbt_new0(double, output->host_count);
- output->bytes_amount = xbt_new0(double, output->host_count* output->host_count);
-
- for(i=0;i<src_nb;i++){
- src_start = i*output->amount/src_nb;
- src_end = src_start + output->amount/src_nb;
- for(j=0; j<dst_nb; j++){
- dst_start = j*output->amount/dst_nb;
- dst_end = dst_start + output->amount/dst_nb;
- XBT_VERB("(%d->%d): (%.2f, %.2f)-> (%.2f, %.2f)", i, j, src_start, src_end, dst_start, dst_end);
- if ((src_end <= dst_start) || (dst_end <= src_start)) {
- output->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0;
- } else {
- output->bytes_amount[i*(src_nb+dst_nb)+src_nb+j] = MIN(src_end, dst_end)- MAX(src_start, dst_start);
- }
- XBT_VERB("==> %.2f", output->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]);
- }
- }
-
- if (SD_task_get_state(output)< SD_SCHEDULED) {
- SD_task_do_schedule(output);
- XBT_VERB ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.",
- output->name, output->amount, src_nb, dst_nb);
- }
- }
+ for (int i=0; i<count;i++)
+ output->allocation->insert(output->allocation->begin()+i, task->allocation->at(i));
+
+ if (output->allocation->size () > task->allocation->size()) {
+ if (task->kind == SD_TASK_COMP_PAR_AMDAHL)
+ SD_task_build_MxN_1D_block_matrix(output, src_nb, dst_nb);
+
+ SD_task_do_schedule(output);
+ XBT_VERB ("Auto-Schedule Communication task %s. Send %.f bytes from %d hosts to %d hosts.",
+ output->name, output->amount, src_nb, dst_nb);
}
}
}
-/** @brief autoschedule a task on a list of workstations
+/** @brief autoschedule a task on a list of hosts
*
- * This function is very similar to SD_task_schedulev(), but takes the list of workstations to schedule onto as
- * separate parameters.
- * It builds a proper vector of workstations and then call SD_task_schedulev()
+ * This function is similar to SD_task_schedulev(), but takes the list of hosts to schedule onto as separate parameters.
+ * It builds a proper vector of hosts and then call SD_task_schedulev()
*/
void SD_task_schedulel(SD_task_t task, int count, ...)
{
va_list ap;
- sg_host_t *list = xbt_new(sg_host_t, count);
+ sg_host_t* list = new sg_host_t[count];
va_start(ap, count);
- for (int i = 0; i < count; i++) {
+ for (int i=0; i<count; i++)
list[i] = va_arg(ap, sg_host_t);
- }
+
va_end(ap);
SD_task_schedulev(task, count, list);
- free(list);
+ delete[] list;
}
