Commit 72af970f authored by Ziwen Su's avatar Ziwen Su

Optimized partition structure.

parent 2a334e26
......@@ -136,28 +136,32 @@ export class JobChartComponent extends JobBaseComponent {
this.rows = rows;
this.timelines = [];
this.timelines.push(new TimelineChart(this.monitoringservice, 0, 'cpu_usage', this.selectedValueType, this.rows));
this.timelines.push(new TimelineChart(this.monitoringservice, 1, 'mem_used', this.selectedValueType, this.rows));
/* we replaced cpi with ipc on Wednesday, July 17 2019 at 2pm */
var metric = 'ipc';
if ( Number(this.job_start) < 1563364800 )
metric = 'cpi';
this.timelines.push(new TimelineChart(this.monitoringservice, 2, metric, this.selectedValueType, this.rows));
var partition = "haswell";
if ( rows[0]["PARTITION"].includes('ml') ){
partition = "ml";
var partition = "broadwell";
var list:string[] = this.monitoringservice.getPartitions("list");
for(let i = 0; i < list.length; i++){
if ( rows[0]["PARTITION"].includes(list[i]) ){
partition = list[i];
}
}
else if ( rows[0]["PARTITION"].includes('gpu') || rows[0]["PARTITION"].includes('hpdlf') ) {
partition = "gpu";
var displays:string[] = this.monitoringservice.getPartitions(partition);
if ( displays[0] == "DefaultDisplay" ){
displays = this.monitoringservice.getPartitions("default");
} else if ( displays[0] == "DefaultPrefix" ){
if ( displays.length == 1 ){
displays = this.monitoringservice.getPartitions("prefix");
} else{
displays.shift();
var displaysprefix: string[] = this.monitoringservice.getPartitions("prefix");
displays = displaysprefix.concat(displays);
}
}
else if ( rows[0]["PARTITION"].includes('west') ) {
partition = "west";
/* we replaced cpi with ipc on Wednesday, July 17 2019 at 2pm */
if ( Number(this.job_start) < 1563364800 ){
displays[2] = "cpi";
}
var displays:string[] = this.monitoringservice.getPartitions(partition);
for(let i = 0; i < displays.length; i++) {
this.timelines.push(new TimelineChart(this.monitoringservice, i+3, displays[i], this.selectedValueType, this.rows));
this.timelines.push(new TimelineChart(this.monitoringservice, i, displays[i], this.selectedValueType, this.rows));
}
this.loading = false;
this.show_timelines = true;
......
......@@ -342,6 +342,8 @@ export class MonitoringService {
getPartitions(key: string){
if ( key == "list" ){
return Object.keys(this.appConfig.getConfig().PartitionConfig);
} else if ( key == "default" || key == "prefix" ){
return this.appConfig.getConfig().DefaultDisplays[key];
} else {
return this.appConfig.getConfig().PartitionConfig[key]["displays"];
}
......
......@@ -3,54 +3,58 @@
"backend_url": "http://localhost/php/",
"footprint_url": "https://hpcmon.zih.tu-dresden.de/"
},
"DefaultDisplays":{
"default":["cpu_usage", "mem_used", "ipc", "io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"],
"prefix":["cpu_usage", "mem_used", "ipc", "io", "flops", "io_meta", "mem_bw", "infiniband_bw"]
},
"PartitionConfig":{
"broadwell":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"gpu":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "gpu_usage", "gpu_power", "gpu_mem", "gpu_temperature", "cpu_power"]
"displays":["DefaultPrefix", "gpu_usage", "gpu_power", "gpu_mem", "gpu_temperature", "cpu_power"]
},
"haswell":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"hpdlf":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "gpu_usage", "gpu_power", "gpu_mem", "gpu_temperature", "cpu_power"]
"displays":["DefaultPrefix", "gpu_usage", "gpu_power", "gpu_mem", "gpu_temperature", "cpu_power"]
},
"ifm":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"interactive":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"ml":{
"displays":["local_io", "flops", "local_io_meta", "mem_bw", "infiniband_bw", "gpu_usage", "gpu_power", "gpu_mem", "gpu_temperature"]
"displays":["cpu_usage", "mem_used", "ipc", "local_io", "flops", "local_io_meta", "mem_bw", "infiniband_bw", "gpu_usage", "gpu_power", "gpu_mem", "gpu_temperature"]
},
"nvme":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"romeo":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"sandy":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"sl":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"smp":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"test":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"triton":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"vis":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw", "cpu_power"]
"displays":["DefaultDisplay"]
},
"west":{
"displays":["io", "flops", "io_meta", "mem_bw", "infiniband_bw"]
"displays":["DefaultPrefix"]
}
}
}
\ No newline at end of file
Markdown is supported
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