Commit cedf2538 authored by esabate's avatar esabate
Browse files

Renamed scheduler class and adapted pom files to take this change into account.

parent a576795f
......@@ -452,7 +452,7 @@ install_compss() {
cp -r "${SOURCES_DIR}/files" "${TMP_DIR}"
cp -r "${SOURCES_DIR}/maven-plugins" "${TMP_DIR}"
cp -r "${SOURCES_DIR}/utils" "${TMP_DIR}"
cp -r "${SOURCES_DIR}/ilp" "${TMP_DIR}"
#cp -r "${SOURCES_DIR}/ilp" "${TMP_DIR}"
cp "${SOURCES_DIR}/LICENSE" "${TMP_DIR}"
cp "${SOURCES_DIR}/NOTICE" "${TMP_DIR}"
cp "${SOURCES_DIR}/pom.xml" "${TMP_DIR}"
......@@ -497,7 +497,6 @@ install_compss() {
cp "${TMP_DIR}/NOTICE" ${targetDir}
cp "${TMP_DIR}/README.md" ${targetDir}
cp "${TMP_DIR}/RELEASE_NOTES" ${targetDir}
cp -r "${TMP_DIR}/ilp/" ${targetDir}/Runtime/configuration/
# DEPENDENCIES
echo "--- Copy dependencies"
......
......@@ -45,7 +45,7 @@
<module>lifoScheduler</module>
<module>fifoDataScheduler</module>
<module>loadBalancingScheduler</module>
<module>paperScheduler</module>
<module>rtheuristicsScheduler</module>
<module>prometheusScheduler</module>
<module>heuristics</module>
</modules>
......
......@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package es.bsc.compss.scheduler.paper;
package es.bsc.compss.scheduler.rtheuristics;
import es.bsc.compss.components.impl.ResourceScheduler;
import es.bsc.compss.scheduler.types.AllocatableAction;
......
......@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package es.bsc.compss.scheduler.paper;
package es.bsc.compss.scheduler.rtheuristics;
import es.bsc.compss.components.impl.ResourceScheduler;
import es.bsc.compss.scheduler.exceptions.BlockedActionException;
......
package es.bsc.compss.scheduler.paper;
package es.bsc.compss.scheduler.rtheuristics;
import es.bsc.compss.COMPSsConstants;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
public class PaperConfiguration {
public class RTHeuristicsConfiguration {
public static String INPUT_FILE = "/tmp/input.txt";
......
......@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package es.bsc.compss.scheduler.paper;
package es.bsc.compss.scheduler.rtheuristics;
import es.bsc.compss.components.impl.ResourceScheduler;
import es.bsc.compss.scheduler.exceptions.ActionNotFoundException;
......@@ -36,9 +36,9 @@ import java.util.PriorityQueue;
import org.json.JSONObject;
public class PaperResourceScheduler<T extends WorkerResourceDescription> extends ResourceScheduler<T> {
public class RTHeuristicsResourceScheduler<T extends WorkerResourceDescription> extends ResourceScheduler<T> {
private PaperScheduler scheduler;
private RTHeuristicsScheduler scheduler;
/**
......@@ -48,7 +48,7 @@ public class PaperResourceScheduler<T extends WorkerResourceDescription> extends
* @param resJSON Resource JSON file
* @param implJSON Implementation JSON file
*/
public PaperResourceScheduler(Worker<T> w, JSONObject resJSON, JSONObject implJSON, PaperScheduler sched) {
public RTHeuristicsResourceScheduler(Worker<T> w, JSONObject resJSON, JSONObject implJSON, RTHeuristicsScheduler sched) {
super(w, resJSON, implJSON);
this.scheduler = sched;
}
......
......@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package es.bsc.compss.scheduler.paper;
package es.bsc.compss.scheduler.rtheuristics;
import es.bsc.compss.components.impl.ResourceScheduler;
import es.bsc.compss.components.impl.TaskScheduler;
......@@ -53,7 +53,7 @@ import org.json.JSONObject;
/**
* Representation of a Scheduler that considers only ready tasks and sorts them in FIFO mode.
*/
public class PaperScheduler extends TaskScheduler {
public class RTHeuristicsScheduler extends TaskScheduler {
// map that relates each task with a predefined resource, according to the output of the Paper
private LinkedHashMap<Long, String> taskResource;
......@@ -91,9 +91,9 @@ public class PaperScheduler extends TaskScheduler {
/**
* Constructs a new Paper Scheduler instance.
*/
public PaperScheduler() {
public RTHeuristicsScheduler() {
super();
PaperConfiguration.load();
RTHeuristicsConfiguration.load();
// readInputFile();
this.unassignedActions = new ArrayList<>();
this.orderInWorkers = new LinkedHashMap<>();
......@@ -106,8 +106,8 @@ public class PaperScheduler extends TaskScheduler {
private void readInputFile() {
taskResource = new LinkedHashMap<>();
this.numTasks = 0;
try (FileReader fr = new FileReader(new File(PaperConfiguration.INPUT_FILE));
BufferedReader br = new BufferedReader(fr)) {
try (FileReader fr = new FileReader(new File(RTHeuristicsConfiguration.INPUT_FILE));
BufferedReader br = new BufferedReader(fr)) {
String lines;
String resourceId;
long taskId;
......@@ -167,8 +167,8 @@ public class PaperScheduler extends TaskScheduler {
* *********************************************************************************************************
*/
@Override
public <T extends WorkerResourceDescription> PaperResourceScheduler<T> generateSchedulerForResource(Worker<T> w,
JSONObject resJSON, JSONObject implJSON) {
public <T extends WorkerResourceDescription> RTHeuristicsResourceScheduler<T> generateSchedulerForResource(Worker<T> w,
JSONObject resJSON, JSONObject implJSON) {
LOGGER.debug("[PaperScheduler] Generate scheduler for resource " + w.getName());
// noWorkers = false;
newWorkers = true;
......@@ -178,7 +178,7 @@ public class PaperScheduler extends TaskScheduler {
cloudWorkers
.add(new AbstractMap.SimpleEntry<>(w.getName(), ((CloudMethodWorker) w).getProvider().getName()));
}
return new PaperResourceScheduler<>(w, resJSON, implJSON, this);
return new RTHeuristicsResourceScheduler<>(w, resJSON, implJSON, this);
}
public void newWorkersAlreadyUp() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment