From 6ad7f1b12050bbbeb28924806c321238bba7cd35 Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Fri, 10 Jun 2011 11:42:24 +0200
Subject: [PATCH] [orsay] Update CPU frequencies of gdx-[307-310] to 2.G.
---
.../sites/orsay/clusters/gdx/nodes/gdx-307.json | 4 ++--
.../sites/orsay/clusters/gdx/nodes/gdx-308.json | 4 ++--
.../sites/orsay/clusters/gdx/nodes/gdx-309.json | 4 ++--
.../sites/orsay/clusters/gdx/nodes/gdx-310.json | 4 ++--
data/grid5000/sites/orsay/orsay.json | 12 +-----------
generators/input/orsay-gdx.rb | 2 +-
6 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
index ea138eaa0e8..a13cce2d098 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -95,12 +95,12 @@
"cache_l1d": null,
"cache_l1i": null,
"cache_l2": 1048576,
- "clock_speed": 2400000000.0,
+ "clock_speed": 2000000000,
"instruction_set": "",
"model": "AMD Opteron",
"other_description": "",
"vendor": "AMD",
- "version": "250"
+ "version": "246"
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
index 5d4b1a6bc88..84645df9b46 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -95,12 +95,12 @@
"cache_l1d": null,
"cache_l1i": null,
"cache_l2": 1048576,
- "clock_speed": 2400000000.0,
+ "clock_speed": 2000000000,
"instruction_set": "",
"model": "AMD Opteron",
"other_description": "",
"vendor": "AMD",
- "version": "250"
+ "version": "246"
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
index 2808d76781b..f0706365bd6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -95,12 +95,12 @@
"cache_l1d": null,
"cache_l1i": null,
"cache_l2": 1048576,
- "clock_speed": 2400000000.0,
+ "clock_speed": 2000000000,
"instruction_set": "",
"model": "AMD Opteron",
"other_description": "",
"vendor": "AMD",
- "version": "250"
+ "version": "246"
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
index d3ddee07232..53bcd56d7a5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -95,12 +95,12 @@
"cache_l1d": null,
"cache_l1i": null,
"cache_l2": 1048576,
- "clock_speed": 2400000000.0,
+ "clock_speed": 2000000000,
"instruction_set": "",
"model": "AMD Opteron",
"other_description": "",
"vendor": "AMD",
- "version": "250"
+ "version": "246"
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/orsay/orsay.json b/data/grid5000/sites/orsay/orsay.json
index f46cdb53a67..200637b60b2 100755
--- a/data/grid5000/sites/orsay/orsay.json
+++ b/data/grid5000/sites/orsay/orsay.json
@@ -1,14 +1,4 @@
{
- "description": "",
- "email_contact": "orsay-staff@lists.grid5000.fr",
- "latitude": 48.7,
- "location": "Orsay, France",
- "longitude": 2.2,
- "name": "Orsay",
- "security_contact": "orsay-staff@lists.grid5000.fr",
- "sys_admin_contact": "orsay-staff@lists.grid5000.fr",
"type": "site",
- "uid": "orsay",
- "user_support_contact": "orsay-staff@lists.grid5000.fr",
- "web": "https://www.grid5000.fr/mediawiki/index.php/Orsay:Home"
+ "uid": "orsay"
}
\ No newline at end of file
diff --git a/generators/input/orsay-gdx.rb b/generators/input/orsay-gdx.rb
index d2d8bfceb84..0555acf39f3 100644
--- a/generators/input/orsay-gdx.rb
+++ b/generators/input/orsay-gdx.rb
@@ -133,7 +133,7 @@ site :orsay do |site_uid|
end
# extension specifics, starting at node 181
- (181).upto(312-2) do |i|
+ (181).upto(306) do |i|
node "#{cluster_uid}-#{i}" do
processor({
:version => "250",
--
GitLab