From eb861a90ec23c28c3efbbd4257646fe75ed206d5 Mon Sep 17 00:00:00 2001 From: Sebastien Badia <sebastien.badia@inria.fr> Date: Thu, 5 Jan 2012 15:12:31 +0100 Subject: [PATCH] [luxembourg] Typo ivt support, and regenerate --- .../sites/luxembourg/clusters/granduc/nodes/granduc-1.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-10.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-11.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-12.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-13.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-14.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-15.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-16.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-17.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-18.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-19.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-2.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-20.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-21.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-22.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-3.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-4.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-5.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-6.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-7.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-8.json | 4 ++-- .../sites/luxembourg/clusters/granduc/nodes/granduc-9.json | 4 ++-- generators/input/luxembourg-granduc.rb | 2 +- 23 files changed, 45 insertions(+), 45 deletions(-) diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json index 4975294c343..32027818175 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-1" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json index f3154d153aa..86df72b7ddd 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-10" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json index 3368232196a..dfbe817d8b3 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-11" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json index 7c5fbeea62b..ea61cd27a5e 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-12" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json index 69561e817b8..aece2306680 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-13" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json index 82927348d6c..de010e8b368 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-14" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json index 3cdc05c655b..68530ee31c3 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-15" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json index aa8dbfe715a..81a5e0fbcb0 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-16" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json index b914f7e52f8..ca34d6daf28 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "10/27/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-17" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json index afd3e166377..bf9f553a40e 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "10/27/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-18" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json index 480f128c345..86240280ce0 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-19" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json index bb129162913..c5e55960506 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-2" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json index f8b739891b3..8cc04caf2c9 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-20" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json index c337107c7e2..bafe50d2ea4 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "10/27/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-21" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json index afc205b19dd..f2e729a397c 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "10/27/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-22" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json index 959ed1fbbd9..fa53c91bfc2 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "10/27/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-3" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json index 52b0c868152..16063eb49c9 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "10/27/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-4" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json index dbbe2e88504..c3ce9d9709a 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-5" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json index d7b10e9b9ed..0bd20b308ce 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "10/27/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-6" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json index 3927821b747..995fe3a7d34 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-7" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json index a92ddee9fbb..5d30f2a59d3 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-8" diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json index 8708ed7d497..2cc234cb3d1 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json @@ -2,7 +2,7 @@ "architecture": { "platform_type": "x86_64", "smp_size": 2, - "smt_size": 4 + "smt_size": 8 }, "bios": { "release_date": "08/10/2007", @@ -90,7 +90,7 @@ "supported_job_types": { "besteffort": true, "deploy": true, - "virtual": null + "virtual": "ivt" }, "type": "node", "uid": "granduc-9" diff --git a/generators/input/luxembourg-granduc.rb b/generators/input/luxembourg-granduc.rb index 6b576752a54..0e9d227cdd1 100644 --- a/generators/input/luxembourg-granduc.rb +++ b/generators/input/luxembourg-granduc.rb @@ -6,7 +6,7 @@ site :luxembourg do |site_uid| 22.times do |i| node "#{cluster_uid}-#{i+1}" do |node_uid| - supported_job_types({:deploy => true, :besteffort => true, :virtual => ivt}) + supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"}) architecture({ :smp_size => 2, :smt_size => 8, -- GitLab