From a2b018fae7cf16e540a41ad4af11df8ac74719fe Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Fri, 6 Dec 2024 14:55:46 -1000 Subject: [PATCH] reverted to FCFS as the default --- include/wrench/services/compute/batch/BatchComputeService.h | 2 +- .../services/compute/batch/BatchComputeServiceProperty.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wrench/services/compute/batch/BatchComputeService.h b/include/wrench/services/compute/batch/BatchComputeService.h index 3a0c00e55..74585fb70 100755 --- a/include/wrench/services/compute/batch/BatchComputeService.h +++ b/include/wrench/services/compute/batch/BatchComputeService.h @@ -63,7 +63,7 @@ namespace wrench { {BatchComputeServiceProperty::BATCH_QUEUE_ORDERING_ALGORITHM, "fcfs"}, #else - {BatchComputeServiceProperty::BATCH_SCHEDULING_ALGORITHM, "easy_bf_depth1"}, + {BatchComputeServiceProperty::BATCH_SCHEDULING_ALGORITHM, "fcfs"}, #endif {BatchComputeServiceProperty::BATCH_RJMS_PADDING_DELAY, "5"}, {BatchComputeServiceProperty::SIMULATED_WORKLOAD_TRACE_FILE, ""}, diff --git a/include/wrench/services/compute/batch/BatchComputeServiceProperty.h b/include/wrench/services/compute/batch/BatchComputeServiceProperty.h index 6c3c92035..82ef1d3c4 100755 --- a/include/wrench/services/compute/batch/BatchComputeServiceProperty.h +++ b/include/wrench/services/compute/batch/BatchComputeServiceProperty.h @@ -30,7 +30,7 @@ namespace wrench { * @brief The batch scheduling algorithm. Can be: * - If ENABLE_BATSCHED is set to off / not set: * - "fcfs": First Come First Serve, which allocates resources at the core level (i.e., two jobs may run on the same node - * if that node has enough cores to support both jobs). + * if that node has enough cores to support both jobs). (DEFAULT) * * - "easy_bf_depth0": a home-grown implementation of EASY (FCFS with backfilling), which only allocates resources at the node level * (i.e., two jobs can never run on the same node even if that node has enough cores to support both jobs), @@ -39,7 +39,7 @@ namespace wrench { * - "easy_bf_depth1": a home-grown implementation of EASY (FCFS with backfilling), which only allocates resources at the node level * (i.e., two jobs can never run on the same node even if that node has enough cores to support both jobs), * and which will never postpone the first (oldest) job in the queue via backfilling actions. - * This is typically considered the standard EASY algorithm. (DEFAULT) + * THIS IS TYPICALLY CONSIDERED THE STANDARD "EASY" ALGORITHM. * * - "conservative_bf": a home-grown implementation of FCFS with conservative backfilling, which only allocates resources at the node level * (i.e., two jobs can never run on the same node even if that node has enough cores to support both jobs)