Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Liu 303 - Correcting Scheduler Algorithms #450

Merged
merged 5 commits into from
Sep 27, 2022
Merged

Liu 303 - Correcting Scheduler Algorithms #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d575804
Removes 'simple' algorithm option (it does not exist in DALiuGE)
pritchardn Sep 20, 2022
9692e70
Adds node option to all translation algorithms.
pritchardn Sep 20, 2022
c422c52
Removes 'None' algorithm option, it cannot be shown in GOJS or launch…
pritchardn Sep 20, 2022
92feb02
Merge branch 'master' into LIU-303
pritchardn Sep 20, 2022
882e9f5
Replaces algorithm index notation for genGPT calls with strings direc…
pritchardn Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/Config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,6 @@ export class Config {
static readonly paletteNodeHeight : number = 22;
static readonly paletteNodeWidth : number = 130;

// translation algorithms
static readonly translationAlgorithms = [
"none",
"metis",
"mysarkar",
"min_num_parts",
"pso",
"simple"
];

static readonly DALIUGE_PARAMETER_NAMES = [
"data_volume",
"execution_time",
Expand Down
15 changes: 8 additions & 7 deletions src/Translator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

import * as ko from "knockout";

import {Config} from './Config';
import {Eagle} from './Eagle';
import {LogicalGraph} from './LogicalGraph';
import {Setting} from './Setting';
Expand Down Expand Up @@ -108,9 +107,11 @@ export class Translator {
//----------------- Physical Graph Generation --------------------------------
/**
* Generate Physical Graph Template.
* @param algorithmIndex Algorithm number.
* @param algorithmName
* @param testingMode
* @param format
*/
genPGT = (algorithmIndex : number, testingMode: boolean, format: Eagle.DALiuGESchemaVersion) : void => {
genPGT = (algorithmName : string, testingMode: boolean, format: Eagle.DALiuGESchemaVersion) : void => {
const eagle: Eagle = Eagle.getInstance();

if (eagle.logicalGraph().getNumNodes() === 0) {
Expand All @@ -124,7 +125,7 @@ export class Translator {
}

const translatorURL : string = Setting.findValue(Utils.TRANSLATOR_URL);
console.log("Eagle.getPGT() : algorithm index:", algorithmIndex, "algorithm name:", Config.translationAlgorithms[algorithmIndex], "translator URL", translatorURL);
console.log("Eagle.getPGT() : ", "algorithm name:", algorithmName, "translator URL", translatorURL);

// set the schema version
format = Eagle.DALiuGESchemaVersion.OJS;
Expand All @@ -146,10 +147,10 @@ export class Translator {
this._genPGT(eagle, translatorURL, algorithmIndex, testingMode, format);
}
*/
this._genPGT(eagle, translatorURL, algorithmIndex, testingMode, format);
this._genPGT(eagle, translatorURL, algorithmName, testingMode, format);
}

private _genPGT = (eagle: Eagle, translatorURL: string, algorithmIndex : number, testingMode: boolean, format: Eagle.DALiuGESchemaVersion) : void => {
private _genPGT = (eagle: Eagle, translatorURL: string, algorithmName : string, testingMode: boolean, format: Eagle.DALiuGESchemaVersion) : void => {
// get json for logical graph
let json;
switch (format){
Expand All @@ -173,7 +174,7 @@ export class Translator {
}

const translatorData = {
algo: Config.translationAlgorithms[algorithmIndex],
algo: algorithmName,
lg_name: eagle.logicalGraph().fileInfo().name,
json_data: JSON.stringify(json),
test: testingMode.toString()
Expand Down
91 changes: 30 additions & 61 deletions templates/translation_menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,6 @@
<div class="row">
<div class="accordion" id="translatorAccordion" >

<div class="accordion-item" id="agl-0" data-bind="visible: translatorAlgorithmVisible('agl-0')">
<div class="accordion-header">
<h5>
<input class="form-check-input translationDefault" value="false" type="checkbox">
<button id="headingOne" class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
<span>Algorithm 0 (none)</span>
</button>
</h5>
</div>
<div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-bs-parent="#translatorAccordion">
<div class="accordion-body">
<p class="card-text">Base PGT Generation</p>
<button id="alg0PGT" class="btn btn-primary btn_wide generatePgt" data-bind="click: function(){eagle.translator().genPGT(0, false, Eagle.DALiuGESchemaVersion.Unknown);}">Generate PGT</button>
<button id="test0PGT" class="btn btn-secondary btn_wide" data-bind="click: function(){eagle.translator().genPGT(0, true, Eagle.DALiuGESchemaVersion.Unknown);}, eagleTooltip: 'Submit to translator in test mode. All apps will be replaced with placeholders. Useful for debugging.'">Test PGT</button>
</div>
</div>
</div>

<div class="accordion-item" id="agl-1" data-bind="visible: translatorAlgorithmVisible('agl-1')">
<div class="accordion-header">
<h5>
Expand Down Expand Up @@ -62,8 +44,8 @@ <h5>
</div>

<p class="card-text"></p>
<button id="alg1PGT" class="btn btn-primary btn_wide generatePgt" data-bind="click: function(){eagle.translator().genPGT(1, false, Eagle.DALiuGESchemaVersion.Unknown);}">Generate PGT</button>
<button id="test1PGT" class="btn btn-secondary btn_wide" data-bind="click: function(){eagle.translator().genPGT(1, true, Eagle.DALiuGESchemaVersion.Unknown);}, eagleTooltip: 'Submit to translator in test mode. All apps will be replaced with placeholders. Useful for debugging.'">Test PGT</button>
<button id="alg1PGT" class="btn btn-primary btn_wide generatePgt" data-bind="click: function(){eagle.translator().genPGT('metis', false, Eagle.DALiuGESchemaVersion.Unknown);}">Generate PGT</button>
<button id="test1PGT" class="btn btn-secondary btn_wide" data-bind="click: function(){eagle.translator().genPGT('metis', true, Eagle.DALiuGESchemaVersion.Unknown);}, eagleTooltip: 'Submit to translator in test mode. All apps will be replaced with placeholders. Useful for debugging.'">Test PGT</button>
</div>
</div>
</div>
Expand All @@ -89,7 +71,13 @@ <h5>
</div>
<div class="input-group mb-1">
<div class="input-group-prepend">
<span class="input-group-text" id="alg2-partition-label">Partition label</span>
<span class="input-group-text" id="alg2-nodes">No. of nodes</span>
</div>
<input type="text" class="form-control" placeholder="" aria-label="Key" aria-describedby="alg2-nodes" data-bind="value: translator().numberOfNodes">
</div>
<div class="input-group mb-1">
<div class="input-group-prepend">
<span class="input-group-text" id="alg2-partition-label">Partition label</span>
</div>
<input type="text" class="form-control" placeholder="" aria-label="Key" aria-describedby="alg2-partition-label" data-bind="value: translator().partitionLabel">
</div>
Expand All @@ -101,8 +89,8 @@ <h5>
</div>

<p class="card-text"></p>
<button id="alg2PGT" class="btn btn-primary btn_wide generatePgt" data-bind="click: function(){eagle.translator().genPGT(2, false, Eagle.DALiuGESchemaVersion.Unknown);}">Generate PGT</button>
<button id="test2PGT" class="btn btn-secondary btn_wide" data-bind="click: function(){eagle.translator().genPGT(2, true, Eagle.DALiuGESchemaVersion.Unknown);}, eagleTooltip: 'Submit to translator in test mode. All apps will be replaced with placeholders. Useful for debugging.'">Test PGT</button>
<button id="alg2PGT" class="btn btn-primary btn_wide generatePgt" data-bind="click: function(){eagle.translator().genPGT('mysarkar', false, Eagle.DALiuGESchemaVersion.Unknown);}">Generate PGT</button>
<button id="test2PGT" class="btn btn-secondary btn_wide" data-bind="click: function(){eagle.translator().genPGT('mysarkar', true, Eagle.DALiuGESchemaVersion.Unknown);}, eagleTooltip: 'Submit to translator in test mode. All apps will be replaced with placeholders. Useful for debugging.'">Test PGT</button>
</div>
</div>
</div>
Expand All @@ -128,7 +116,13 @@ <h5>
</div>
<div class="input-group mb-1">
<div class="input-group-prepend">
<span class="input-group-text" id="alg3-greediness">Greediness of deadline pursuit</span>
<span class="input-group-text" id="alg3-nodes">No. of nodes</span>
</div>
<input type="text" class="form-control" placeholder="" aria-label="Key" aria-describedby="alg3-nodes" data-bind="value: translator().numberOfNodes">
</div>
<div class="input-group mb-1">
<div class="input-group-prepend">
<span class="input-group-text" id="alg3-greediness">Greediness of deadline pursuit</span>
</div>
<input type="text" class="form-control" placeholder="" aria-label="Key" aria-describedby="alg3-greediness" data-bind="value: translator().greediness">
<div class="input-group-append">
Expand Down Expand Up @@ -158,8 +152,8 @@ <h5>
</div>

<p class="card-text"></p>
<button id="alg3PGT" class="btn btn-primary btn_wide generatePgt" data-bind="click: function(){eagle.translator().genPGT(3, false, Eagle.DALiuGESchemaVersion.Unknown);}">Generate PGT</button>
<button id="test3PGT" class="btn btn-secondary btn_wide" data-bind="click: function(){eagle.translator().genPGT(3, true, Eagle.DALiuGESchemaVersion.Unknown);}, eagleTooltip: 'Submit to translator in test mode. All apps will be replaced with placeholders. Useful for debugging.'">Test PGT</button>
<button id="alg3PGT" class="btn btn-primary btn_wide generatePgt" data-bind="click: function(){eagle.translator().genPGT('min_num_parts', false, Eagle.DALiuGESchemaVersion.Unknown);}">Generate PGT</button>
<button id="test3PGT" class="btn btn-secondary btn_wide" data-bind="click: function(){eagle.translator().genPGT('min_num_parts', true, Eagle.DALiuGESchemaVersion.Unknown);}, eagleTooltip: 'Submit to translator in test mode. All apps will be replaced with placeholders. Useful for debugging.'">Test PGT</button>
</div>
</div>
</div>
Expand All @@ -185,7 +179,13 @@ <h5>
</div>
<div class="input-group mb-1">
<div class="input-group-prepend">
<span class="input-group-text" id="alg4-swarm-size">Swarm size</span>
<span class="input-group-text" id="alg4-nodes">No. of nodes</span>
</div>
<input type="text" class="form-control" placeholder="" aria-label="Key" aria-describedby="alg4-nodes" data-bind="value: translator().numberOfNodes">
</div>
<div class="input-group mb-1">
<div class="input-group-prepend">
<span class="input-group-text" id="alg4-swarm-size">Swarm size</span>
</div>
<input type="text" class="form-control" placeholder="" aria-label="Key" aria-describedby="alg4-swarm-size" data-bind="value: translator().swarmSize">
</div>
Expand Down Expand Up @@ -218,43 +218,12 @@ <h5>
</div>

<p class="card-text"></p>
<button id="alg4PGT" class="btn btn-primary generatePgt" data-bind="click: function(){eagle.translator().genPGT(4, false, Eagle.DALiuGESchemaVersion.Unknown);}">Generate PGT</button>
<button id="test4PGT" class="btn btn-secondary btn_wide" data-bind="click: function(){eagle.translator().genPGT(4, true, Eagle.DALiuGESchemaVersion.Unknown);}, eagleTooltip: 'Submit to translator in test mode. All apps will be replaced with placeholders. Useful for debugging.'">Test PGT</button>
<button id="alg4PGT" class="btn btn-primary generatePgt" data-bind="click: function(){eagle.translator().genPGT('pso', false, Eagle.DALiuGESchemaVersion.Unknown);}">Generate PGT</button>
<button id="test4PGT" class="btn btn-secondary btn_wide" data-bind="click: function(){eagle.translator().genPGT('pso', true, Eagle.DALiuGESchemaVersion.Unknown);}, eagleTooltip: 'Submit to translator in test mode. All apps will be replaced with placeholders. Useful for debugging.'">Test PGT</button>
</div>
</div>
</div>

<div class="accordion-item" id="agl-5" data-bind="visible: translatorAlgorithmVisible('agl-5')">
<div class="accordion-header">
<h5>
<input class="form-check-input translationDefault" value="false" type="checkbox">
<button id="headingSix" class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSix" aria-expanded="true" aria-controls="collapseSix">
<span>Algorithm 5 (simple)</span>
</button>
</h5>
</div>
<div id="collapseSix" class="collapse" aria-labelledby="headingSix" data-bs-parent="#translatorAccordion">
<div class="accordion-body">
<!--<p class="card-text">Base PGT Generation</p>-->
<div class="input-group mb-1">
<div class="input-group-prepend">
<span class="input-group-text" id="alg5-nodes">No. of nodes</span>
</div>
<input type="text" class="form-control" placeholder="" aria-label="Key" aria-describedby="alg5-nodes" data-bind="value: translator().numberOfNodes">
</div>
<div class="input-group mb-1">
<div class="input-group-prepend">
<span class="input-group-text" id="alg5-parallel-task-streams">No. of parallel task streams</span>
</div>
<input type="text" class="form-control" placeholder="" aria-label="Key" aria-describedby="alg5-parallel-task-streams" data-bind="value: translator().numberOfParallelTaskStreams">
</div>

<p class="card-text"></p>
<button id="alg5PGT" class="btn btn-primary btn_wide generatePgt" data-bind="click: function(){eagle.translator().genPGT(5, false, Eagle.DALiuGESchemaVersion.Unknown);}">Generate PGT</button>
<button id="test5PGT" class="btn btn-secondary btn_wide" data-bind="click: function(){eagle.translator().genPGT(5, true, Eagle.DALiuGESchemaVersion.Unknown);}, eagleTooltip: 'Submit to translator in test mode. All apps will be replaced with placeholders. Useful for debugging.'">Test PGT</button>
</div>
</div>
</div>
</div>
<div class="hierarchyDividerLine"></div>
<div class="input-group mb-1">
Expand All @@ -275,7 +244,7 @@ <h5>
</select>
<input type="hidden" class="form-control" placeholder="0" id="alg1-rmode-value" aria-label="Key" aria-describedby="alg1-rmode-label" data-bind="value: translator().rmode">
</div>
<div class="input-group mb-1">
<div class="input-group mb-1">
<button type="button" id="setTranslatorUrlBtn" class="btn btn-primary btn-block btn_wide" data-bind="click: setTranslatorUrl">Set Translator URL</button>
</div>
</div>
Expand Down