Commit 2ab40a72 authored by MARGERY David's avatar MARGERY David
Browse files

fixes #7285 : remove reliance on availability of smt_size to count the number of cores

parent 5daa16b0
......@@ -38,8 +38,9 @@
%div#hard_state{"ex:role" => "facet", "ex:expression" => ".hard_state", "ex:sortMode" => "count", "ex:showMissing" => "false", "ex:scroll" => "false", "ex:facetLabel" => "Hardware State"}
%div#soft_state{"ex:role" => "facet", "ex:expression" => ".syst_state", "ex:sortMode" => "count", "ex:showMissing" => "false", "ex:scroll" => "false", "ex:facetLabel" => "System State"}
%div#available_for{"ex:role" => "facet", "ex:facetClass" => "Slider", "ex:expression" => ".available_for", "ex:interval" => "1", "ex:scroll" => "true", "ex:facetLabel" => "Available for (Hours)", "ex:histogram" => "false", "ex:horizontal" => "true", "ex:width" => "100"}
%div#architecture_smp_size{"ex:role" => "facet", "ex:expression" => ".architecture_smp_size", "ex:sortMode" => "value", "ex:scroll" => "true", "ex:facetLabel" => "# CPUs"}
%div#architecture_smt_size{"ex:role" => "facet", "ex:expression" => ".architecture_smt_size", "ex:sortMode" => "value", "ex:scroll" => "true", "ex:facetLabel" => "# Cores"}
%div#architecture_nb_procs{"ex:role" => "facet", "ex:expression" => ".architecture_nb_procs", "ex:sortMode" => "value", "ex:scroll" => "true", "ex:showMissing" => "false", "ex:facetLabel" => "# CPUs"}
%div#architecture_nb_cores{"ex:role" => "facet", "ex:expression" => ".architecture_nb_cores", "ex:sortMode" => "value", "ex:scroll" => "true", "ex:showMissing" => "false", "ex:facetLabel" => "# Cores"}
%div#architecture_ht_enabled{"ex:role" => "facet", "ex:expression" => ".operating_system_ht_enabled", "ex:sortMode" => "count", "ex:scroll" => "false", "ex:showMissing" => "false", "ex:facetLabel" => "HT activated"}
%div#main_memory_ram_size{"ex:role" => "facet", "ex:expression" => ".main_memory_ram_size", "ex:sortMode" => "value", "ex:scroll" => "true", "ex:facetLabel" => "RAM (MiB)"}
%div#processor_clock_speed{"ex:role" => "facet", "ex:expression" => ".processor_clock_speed", "ex:sortMode" => "value", "ex:scroll" => "true", "ex:facetLabel" => "CPU Clock Speed (GHz)"}
%div#processor_model{"ex:role" => "facet", "ex:expression" => ".processor_model", "ex:sortMode" => "count", "ex:scroll" => "false", "ex:facetLabel" => "Processor model"}
......
......@@ -56,7 +56,7 @@ $(document).ready(function() {
var site_index = this.site_index;
$.each(nodes_collection.items, function(i, node) {
sites[site_index]['nodes_count'] = (sites[site_index].nodes_count || 0) + 1;
sites[site_index]['cores_count'] = (sites[site_index].cores_count || 0) + node.architecture.smt_size;
sites[site_index]['cores_count'] = (sites[site_index].cores_count || 0) + node.architecture.nb_cores;
}); // each node
}, // success
error: function(XMLHttpRequest, textStatus, errorThrown) {
......@@ -94,4 +94,4 @@ $(document).ready(function() {
})
}
});
});
\ No newline at end of file
});
......@@ -11,7 +11,7 @@ function jsonConverter(allNodes){
network_adapters_1_rate:{valueType:"number"},
network_adapters_2_rate:{valueType:"number"},
network_adapters_3_rate:{valueType:"number"},
architecture_smt_size:{valueType:"number"},
architecture_nb_cores:{valueType:"number"},
max_storage_capacity_device:{valueType:"number"},
storage_capacity_node:{valueType:"number"}
},
......@@ -97,7 +97,7 @@ function jsonConverter(allNodes){
//avoid bug #6132
value=("B"+value).replace('B','');
return (parseInt(value)*GIBI/GIGA/GIGA).toFixed(0);
case "architecture_smt_size":
case "architecture_nb_cores":
return parseInt(value) ;
case "main_memory_ram_size":
return (parseInt(value)/MEBI);
......
......@@ -188,7 +188,7 @@ $(document).ajaxStop(function() {
"network_adapters_1_rate":{valueType:"number"},
"network_adapters_2_rate":{valueType:"number"},
"network_adapters_3_rate":{valueType:"number"},
"architecture_smt_size":{valueType:"number"}
"architecture_nb_cores":{valueType:"number"}
},
types:{"node":{"pluralLabel":"nodes"}},
items: _.values(reference)
......
......@@ -161,7 +161,7 @@ function nodeConverter( item ) {
//avoid bug #6132
value=("B"+value).replace('B','');
return (parseInt(value)*GIBI/GIGA/GIGA).toFixed(0);
case "architecture_smt_size":
case "architecture_nb_cores":
return parseInt(value) ;
case "main_memory_ram_size":
return (parseInt(value)/MEBI);
......
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