From 661b38ea12b67d1f792c35fd3420cecb663e010c Mon Sep 17 00:00:00 2001
From: Nicolas Michon <nicolas.michon@inria.fr>
Date: Fri, 17 Mar 2017 14:28:08 +0100
Subject: [PATCH] [dev] wiki cpu_parameters: take microarchitecture from input
instead of local file
---
generators/wiki/clusters_data.yml | 98 -------------------------------
generators/wiki/cpu_parameters.rb | 6 +-
2 files changed, 1 insertion(+), 103 deletions(-)
delete mode 100644 generators/wiki/clusters_data.yml
diff --git a/generators/wiki/clusters_data.yml b/generators/wiki/clusters_data.yml
deleted file mode 100644
index 7d7dc0886d8..00000000000
--- a/generators/wiki/clusters_data.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-sagittaire:
- cpu_codename: N/A
-
-sol:
- cpu_codename: N/A
-
-granduc:
- cpu_codename: Merom
-
-chinqchint:
- cpu_codename: Penryn
-
-genepi:
- cpu_codename: Penryn
-
-griffon:
- cpu_codename: Penryn
-
-talc:
- cpu_codename: Penryn
-
-parapide:
- cpu_codename: Nehalem
-
-edel:
- cpu_codename: Nehalem
-
-suno:
- cpu_codename: Nehalem
-
-parapluie:
- cpu_codename: N/A
-
-chirloute:
- cpu_codename: Westmere
-
-graphene:
- cpu_codename: Nehalem
-
-chimint:
- cpu_codename: Westmere
-
-hercule:
- cpu_codename: Sandy Bridge
-
-orion:
- cpu_codename: Sandy Bridge
-
-taurus:
- cpu_codename: Sandy Bridge
-
-econome:
- cpu_codename: Sandy Bridge
-
-petitprince:
- cpu_codename: Sandy Bridge
-
-graphite:
- cpu_codename: Sandy Bridge
-
-paranoia:
- cpu_codename: Sandy Bridge
-
-graphique:
- cpu_codename: Haswell
-
-parasilo:
- cpu_codename: Haswell
-
-paravance:
- cpu_codename: Haswell
-
-graoully:
- cpu_codename: Haswell
-
-grimoire:
- cpu_codename: Haswell
-
-grisou:
- cpu_codename: Haswell
-
-nova:
- cpu_codename: Broadwell
-
-grimani:
- cpu_codename: Haswell
-
-uva:
- cpu_codename: Westmere
-
-uvb:
- cpu_codename: Dunnington
-
-chetemi:
- cpu_codename: Broadwell
-
-chifflet:
- cpu_codename: Broadwell
diff --git a/generators/wiki/cpu_parameters.rb b/generators/wiki/cpu_parameters.rb
index 95f416136a4..dae5e097424 100644
--- a/generators/wiki/cpu_parameters.rb
+++ b/generators/wiki/cpu_parameters.rb
@@ -31,9 +31,6 @@ table_columns = ["Installation date", "Site", "Cluster", "CPU Family", "CPU Vers
table_data = []
-#Static cluster information not present in the ref-repo
-cluster_data = YAML::load_file(File.join(File.dirname(File.expand_path(__FILE__)), 'clusters_data.yml'))
-
global_hash = load_yaml_file_hierarchy(File.expand_path("../../input/grid5000/", File.dirname(__FILE__)))
# Loop over Grid'5000 sites
@@ -46,14 +43,13 @@ global_hash["sites"].each { |site_uid, site_hash|
cpu_family = node_hash["processor"]["model"] rescue ""
cpu_version = node_hash["processor"]["version"] rescue ""
cpu_freq = node_hash["processor"]["clock_speed"] / 1000000000.0 rescue 0.0 #GHz
+ cpu_codename = node_hash["processor"]["microarchitecture"] rescue ""
ht_enabled = node_hash["bios"]["configuration"]["ht_enabled"] rescue false
turboboost_enabled = node_hash["bios"]["configuration"]["turboboost_enabled"] rescue false
pstate_driver = node_hash["operating_system"]["pstate_driver"] rescue ""
cstate_driver = node_hash["operating_system"]["cstate_driver"] rescue ""
- cpu_codename = cluster_data[cluster_uid]["cpu_codename"] rescue ""
-
#One line per cluster
table_data << [
DateTime.new(*cluster_hash["created_at"].to_s.scan(/\d+/).map {|i| i.to_i}).strftime("%Y-%m-%d"),
--
GitLab