diff --git a/README.md b/README.md index 7c0fc8a..17de390 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ And, one of the following: ## Dependencies - [Batsched](https://gitlab.inria.fr/batsim/batsched) -- [WRENCH](https://github.com/wrench-project/wrench) - Built with ```cmake -DENABLE_BATSCHED=on``` +- [WRENCH version 1.7](https://wrench-project.org/downloads.html) - Built with ```cmake -DENABLE_BATSCHED=on``` ## Installation diff --git a/src/Simulator.cpp b/src/Simulator.cpp index 1e8adef..515da05 100644 --- a/src/Simulator.cpp +++ b/src/Simulator.cpp @@ -462,7 +462,7 @@ Workflow *Simulator::createIndepWorkflow(std::vector spec_tokens) { static std::uniform_int_distribution m_udist(min_time, max_time); for (unsigned long i = 0; i < num_tasks; i++) { unsigned long flops = m_udist(rng); - auto t = workflow->addTask("Task_" + std::to_string(i), (double) flops, 1, 1, 1.0, 0.0); + auto t = workflow->addTask("Task_" + std::to_string(i), (double) flops, 1, 1, 1.0); WRENCH_INFO("AAAAA %s %lf", t->getID().c_str(), t->getFlops() ); } @@ -517,7 +517,7 @@ Workflow *Simulator::createLevelsWorkflow(std::vector spec_tokens) for (unsigned long t = 0; t < num_tasks[l]; t++) { unsigned long flops = (*m_udists[l])(rng); wrench::WorkflowTask *task = workflow->addTask("Task_l" + std::to_string(l) + "_" + - std::to_string(t), (double) flops, 1, 1, 1.0, 0.0); + std::to_string(t), (double) flops, 1, 1, 1.0); tasks[l].push_back(task); } } @@ -552,7 +552,7 @@ Workflow *Simulator::createDAXWorkflow(std::vector spec_tokens) { // Add task replicas for (auto t : original_workflow->getTasks()) { // WRENCH_INFO("t->getFlops() = %lf", t->getFlops()); - workflow->addTask(t->getID(), t->getFlops(), 1, 1, 1.0, 0); + workflow->addTask(t->getID(), t->getFlops(), 1, 1, 1.0); } // Deal with all dependencies (brute-force, but whatever) diff --git a/src/StaticClusteringAlgorithms/ClusteredJob.cpp b/src/StaticClusteringAlgorithms/ClusteredJob.cpp index 58a7288..b2a4c00 100644 --- a/src/StaticClusteringAlgorithms/ClusteredJob.cpp +++ b/src/StaticClusteringAlgorithms/ClusteredJob.cpp @@ -174,7 +174,7 @@ namespace wrench { auto real_workflow = this->getTasks().at(0)->getWorkflow(); auto tmp_workflow = new Workflow(); for (auto real_task : this->getTasks()) { - tmp_workflow->addTask(real_task->getID(), 1.0, 1, 1, 1.0, 0); + tmp_workflow->addTask(real_task->getID(), 1.0, 1, 1, 1.0); } for (auto tmp_parent : this->getTasks()) { diff --git a/src/StaticClusteringAlgorithms/StaticClusteringWMS.cpp b/src/StaticClusteringAlgorithms/StaticClusteringWMS.cpp index cea6e20..788b83f 100644 --- a/src/StaticClusteringAlgorithms/StaticClusteringWMS.cpp +++ b/src/StaticClusteringAlgorithms/StaticClusteringWMS.cpp @@ -881,7 +881,7 @@ void StaticClusteringWMS::mergeSingleParentSingleChildPairs(Workflow *workflow) wrench::WorkflowTask *merged_task = workflow->addTask( parent_to_merge->getID() + "_" + child_to_merge->getID(), parent_to_merge->getFlops() + child_to_merge->getFlops(), - 1, 1, 1.0, 0); + 1, 1, 1.0); for (auto parent : workflow->getTaskParents(parent_to_merge)) { workflow->addControlDependency(parent, merged_task);