From 505956dce5f7183e0fe42d32ddc20763fc6aa0d7 Mon Sep 17 00:00:00 2001 From: BERARD Benjamin <benjamin.berard@inria.fr> Date: Wed, 11 Dec 2019 19:33:01 +0100 Subject: [PATCH] [nancy][grue] Fix threads and ht on processor --- .../nancy/clusters/grue/nodes/grue-1.json | 24 +++++++++---------- .../nancy/clusters/grue/nodes/grue-2.json | 24 +++++++++---------- .../nancy/clusters/grue/nodes/grue-3.json | 24 +++++++++---------- .../nancy/clusters/grue/nodes/grue-4.json | 24 +++++++++---------- .../nancy/clusters/grue/nodes/grue-5.json | 24 +++++++++---------- .../nancy/clusters/grue/nodes/grue-1.yaml | 22 ++++++++--------- .../nancy/clusters/grue/nodes/grue-2.yaml | 22 ++++++++--------- .../nancy/clusters/grue/nodes/grue-3.yaml | 22 ++++++++--------- .../nancy/clusters/grue/nodes/grue-4.yaml | 22 ++++++++--------- .../nancy/clusters/grue/nodes/grue-5.yaml | 22 ++++++++--------- 10 files changed, 115 insertions(+), 115 deletions(-) diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json index ff0f728f91f..6494005f5d2 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json @@ -3,7 +3,7 @@ "cpu_core_numbering": "round-robin", "nb_cores": 32, "nb_procs": 2, - "nb_threads": 32, + "nb_threads": 64, "platform_type": "x86_64" }, "bios": { @@ -105,32 +105,32 @@ }, { "device": "eth1", - "driver": "igb", + "driver": "i40e", "enabled": false, - "firmware_version": "1.67, 0x80000fa8, 19.0.12", + "firmware_version": "7.10 0x8000519f 19.0.12", "interface": "Ethernet", "kavlan": false, - "mac": "e4:43:4b:a5:71:fc", + "mac": "e4:43:4b:a5:71:de", "management": false, - "model": "I350 Gigabit Network Connection", + "model": "Ethernet Controller X710 for 10GbE SFP+", "mountable": false, "mounted": false, - "name": "eno3", + "name": "eno2", "vendor": "Intel" }, { "device": "eth2", - "driver": "i40e", + "driver": "igb", "enabled": false, - "firmware_version": "7.10 0x8000519f 19.0.12", + "firmware_version": "1.67, 0x80000fa8, 19.0.12", "interface": "Ethernet", "kavlan": false, - "mac": "e4:43:4b:a5:71:de", + "mac": "e4:43:4b:a5:71:fc", "management": false, - "model": "Ethernet Controller X710 for 10GbE SFP+", + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "name": "eno2", + "name": "eno3", "vendor": "Intel" }, { @@ -164,7 +164,7 @@ "operating_system": { "cstate_driver": "acpi_idle", "cstate_governor": "menu", - "ht_enabled": false, + "ht_enabled": true, "pstate_driver": "acpi-cpufreq", "pstate_governor": "performance", "turboboost_enabled": true diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json index 938f4311f46..6fbd4175cf9 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json @@ -3,7 +3,7 @@ "cpu_core_numbering": "round-robin", "nb_cores": 32, "nb_procs": 2, - "nb_threads": 32, + "nb_threads": 64, "platform_type": "x86_64" }, "bios": { @@ -105,32 +105,32 @@ }, { "device": "eth1", - "driver": "igb", + "driver": "i40e", "enabled": false, - "firmware_version": "1.67, 0x80000fa8, 19.0.12", + "firmware_version": "7.10 0x8000519f 19.0.12", "interface": "Ethernet", "kavlan": false, - "mac": "e4:43:4b:a5:b1:30", + "mac": "e4:43:4b:a5:b1:12", "management": false, - "model": "I350 Gigabit Network Connection", + "model": "Ethernet Controller X710 for 10GbE SFP+", "mountable": false, "mounted": false, - "name": "eno3", + "name": "eno2", "vendor": "Intel" }, { "device": "eth2", - "driver": "i40e", + "driver": "igb", "enabled": false, - "firmware_version": "7.10 0x8000519f 19.0.12", + "firmware_version": "1.67, 0x80000fa8, 19.0.12", "interface": "Ethernet", "kavlan": false, - "mac": "e4:43:4b:a5:b1:12", + "mac": "e4:43:4b:a5:b1:30", "management": false, - "model": "Ethernet Controller X710 for 10GbE SFP+", + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "name": "eno2", + "name": "eno3", "vendor": "Intel" }, { @@ -164,7 +164,7 @@ "operating_system": { "cstate_driver": "acpi_idle", "cstate_governor": "menu", - "ht_enabled": false, + "ht_enabled": true, "pstate_driver": "acpi-cpufreq", "pstate_governor": "performance", "turboboost_enabled": true diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json index b9f3abd5e36..1f1876ec7e1 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json @@ -3,7 +3,7 @@ "cpu_core_numbering": "round-robin", "nb_cores": 32, "nb_procs": 2, - "nb_threads": 32, + "nb_threads": 64, "platform_type": "x86_64" }, "bios": { @@ -105,32 +105,32 @@ }, { "device": "eth1", - "driver": "igb", + "driver": "i40e", "enabled": false, - "firmware_version": "1.67, 0x80000fa8, 19.0.12", + "firmware_version": "7.10 0x8000519f 19.0.12", "interface": "Ethernet", "kavlan": false, - "mac": "e4:43:4b:a4:4a:1a", + "mac": "e4:43:4b:a4:49:fc", "management": false, - "model": "I350 Gigabit Network Connection", + "model": "Ethernet Controller X710 for 10GbE SFP+", "mountable": false, "mounted": false, - "name": "eno3", + "name": "eno2", "vendor": "Intel" }, { "device": "eth2", - "driver": "i40e", + "driver": "igb", "enabled": false, - "firmware_version": "7.10 0x8000519f 19.0.12", + "firmware_version": "1.67, 0x80000fa8, 19.0.12", "interface": "Ethernet", "kavlan": false, - "mac": "e4:43:4b:a4:49:fc", + "mac": "e4:43:4b:a4:4a:1a", "management": false, - "model": "Ethernet Controller X710 for 10GbE SFP+", + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "name": "eno2", + "name": "eno3", "vendor": "Intel" }, { @@ -164,7 +164,7 @@ "operating_system": { "cstate_driver": "acpi_idle", "cstate_governor": "menu", - "ht_enabled": false, + "ht_enabled": true, "pstate_driver": "acpi-cpufreq", "pstate_governor": "performance", "turboboost_enabled": true diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json index 5d5aa822021..a67913577ce 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json @@ -3,7 +3,7 @@ "cpu_core_numbering": "round-robin", "nb_cores": 32, "nb_procs": 2, - "nb_threads": 32, + "nb_threads": 64, "platform_type": "x86_64" }, "bios": { @@ -105,32 +105,32 @@ }, { "device": "eth1", - "driver": "igb", + "driver": "i40e", "enabled": false, - "firmware_version": "1.67, 0x80000fa8, 19.0.12", + "firmware_version": "7.10 0x8000519f 19.0.12", "interface": "Ethernet", "kavlan": false, - "mac": "e4:43:4b:a5:4f:d8", + "mac": "e4:43:4b:a5:4f:ba", "management": false, - "model": "I350 Gigabit Network Connection", + "model": "Ethernet Controller X710 for 10GbE SFP+", "mountable": false, "mounted": false, - "name": "eno3", + "name": "eno2", "vendor": "Intel" }, { "device": "eth2", - "driver": "i40e", + "driver": "igb", "enabled": false, - "firmware_version": "7.10 0x8000519f 19.0.12", + "firmware_version": "1.67, 0x80000fa8, 19.0.12", "interface": "Ethernet", "kavlan": false, - "mac": "e4:43:4b:a5:4f:ba", + "mac": "e4:43:4b:a5:4f:d8", "management": false, - "model": "Ethernet Controller X710 for 10GbE SFP+", + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "name": "eno2", + "name": "eno3", "vendor": "Intel" }, { @@ -164,7 +164,7 @@ "operating_system": { "cstate_driver": "acpi_idle", "cstate_governor": "menu", - "ht_enabled": false, + "ht_enabled": true, "pstate_driver": "acpi-cpufreq", "pstate_governor": "performance", "turboboost_enabled": true diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json index 379bfed7980..969d56e8f1e 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json @@ -3,7 +3,7 @@ "cpu_core_numbering": "round-robin", "nb_cores": 32, "nb_procs": 2, - "nb_threads": 32, + "nb_threads": 64, "platform_type": "x86_64" }, "bios": { @@ -105,32 +105,32 @@ }, { "device": "eth1", - "driver": "igb", + "driver": "i40e", "enabled": false, - "firmware_version": "1.67, 0x80000fa8, 19.0.12", + "firmware_version": "7.10 0x8000519f 19.0.12", "interface": "Ethernet", "kavlan": false, - "mac": "e4:43:4b:a4:03:0c", + "mac": "e4:43:4b:a4:02:ee", "management": false, - "model": "I350 Gigabit Network Connection", + "model": "Ethernet Controller X710 for 10GbE SFP+", "mountable": false, "mounted": false, - "name": "eno3", + "name": "eno2", "vendor": "Intel" }, { "device": "eth2", - "driver": "i40e", + "driver": "igb", "enabled": false, - "firmware_version": "7.10 0x8000519f 19.0.12", + "firmware_version": "1.67, 0x80000fa8, 19.0.12", "interface": "Ethernet", "kavlan": false, - "mac": "e4:43:4b:a4:02:ee", + "mac": "e4:43:4b:a4:03:0c", "management": false, - "model": "Ethernet Controller X710 for 10GbE SFP+", + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "name": "eno2", + "name": "eno3", "vendor": "Intel" }, { @@ -164,7 +164,7 @@ "operating_system": { "cstate_driver": "acpi_idle", "cstate_governor": "menu", - "ht_enabled": false, + "ht_enabled": true, "pstate_driver": "acpi-cpufreq", "pstate_governor": "performance", "turboboost_enabled": true diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml index 2fb8f1b1246..0437ee9116b 100644 --- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml +++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml @@ -5,7 +5,7 @@ grue-1: cpu_core_numbering: round-robin nb_cores: 32 nb_procs: 2 - nb_threads: 32 + nb_threads: 64 platform_type: x86_64 bios: release_date: '08/15/2019' @@ -68,15 +68,6 @@ grue-1: rate: 10000000000 vendor: Intel eth1: - driver: igb - firmware_version: 1.67, 0x80000fa8, 19.0.12 - interface: Ethernet - mac: e4:43:4b:a5:71:fc - management: false - model: I350 Gigabit Network Connection - name: eno3 - vendor: Intel - eth2: driver: i40e firmware_version: 7.10 0x8000519f 19.0.12 interface: Ethernet @@ -85,6 +76,15 @@ grue-1: model: Ethernet Controller X710 for 10GbE SFP+ name: eno2 vendor: Intel + eth2: + driver: igb + firmware_version: 1.67, 0x80000fa8, 19.0.12 + interface: Ethernet + mac: e4:43:4b:a5:71:fc + management: false + model: I350 Gigabit Network Connection + name: eno3 + vendor: Intel eth3: driver: igb firmware_version: 1.67, 0x80000fa8, 19.0.12 @@ -97,7 +97,7 @@ grue-1: operating_system: cstate_driver: acpi_idle cstate_governor: menu - ht_enabled: false + ht_enabled: true pstate_driver: acpi-cpufreq pstate_governor: performance turboboost_enabled: true diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml index fe85869b650..ef98c6b292c 100644 --- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml +++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml @@ -5,7 +5,7 @@ grue-2: cpu_core_numbering: round-robin nb_cores: 32 nb_procs: 2 - nb_threads: 32 + nb_threads: 64 platform_type: x86_64 bios: release_date: '08/15/2019' @@ -68,15 +68,6 @@ grue-2: rate: 10000000000 vendor: Intel eth1: - driver: igb - firmware_version: 1.67, 0x80000fa8, 19.0.12 - interface: Ethernet - mac: e4:43:4b:a5:b1:30 - management: false - model: I350 Gigabit Network Connection - name: eno3 - vendor: Intel - eth2: driver: i40e firmware_version: 7.10 0x8000519f 19.0.12 interface: Ethernet @@ -85,6 +76,15 @@ grue-2: model: Ethernet Controller X710 for 10GbE SFP+ name: eno2 vendor: Intel + eth2: + driver: igb + firmware_version: 1.67, 0x80000fa8, 19.0.12 + interface: Ethernet + mac: e4:43:4b:a5:b1:30 + management: false + model: I350 Gigabit Network Connection + name: eno3 + vendor: Intel eth3: driver: igb firmware_version: 1.67, 0x80000fa8, 19.0.12 @@ -97,7 +97,7 @@ grue-2: operating_system: cstate_driver: acpi_idle cstate_governor: menu - ht_enabled: false + ht_enabled: true pstate_driver: acpi-cpufreq pstate_governor: performance turboboost_enabled: true diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml index 958b078ae2f..61de32b4e26 100644 --- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml +++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml @@ -5,7 +5,7 @@ grue-3: cpu_core_numbering: round-robin nb_cores: 32 nb_procs: 2 - nb_threads: 32 + nb_threads: 64 platform_type: x86_64 bios: release_date: '08/15/2019' @@ -68,15 +68,6 @@ grue-3: rate: 10000000000 vendor: Intel eth1: - driver: igb - firmware_version: 1.67, 0x80000fa8, 19.0.12 - interface: Ethernet - mac: e4:43:4b:a4:4a:1a - management: false - model: I350 Gigabit Network Connection - name: eno3 - vendor: Intel - eth2: driver: i40e firmware_version: 7.10 0x8000519f 19.0.12 interface: Ethernet @@ -85,6 +76,15 @@ grue-3: model: Ethernet Controller X710 for 10GbE SFP+ name: eno2 vendor: Intel + eth2: + driver: igb + firmware_version: 1.67, 0x80000fa8, 19.0.12 + interface: Ethernet + mac: e4:43:4b:a4:4a:1a + management: false + model: I350 Gigabit Network Connection + name: eno3 + vendor: Intel eth3: driver: igb firmware_version: 1.67, 0x80000fa8, 19.0.12 @@ -97,7 +97,7 @@ grue-3: operating_system: cstate_driver: acpi_idle cstate_governor: menu - ht_enabled: false + ht_enabled: true pstate_driver: acpi-cpufreq pstate_governor: performance turboboost_enabled: true diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml index 61fee87eaf2..2855e0a375b 100644 --- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml +++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml @@ -5,7 +5,7 @@ grue-4: cpu_core_numbering: round-robin nb_cores: 32 nb_procs: 2 - nb_threads: 32 + nb_threads: 64 platform_type: x86_64 bios: release_date: '08/15/2019' @@ -68,15 +68,6 @@ grue-4: rate: 10000000000 vendor: Intel eth1: - driver: igb - firmware_version: 1.67, 0x80000fa8, 19.0.12 - interface: Ethernet - mac: e4:43:4b:a5:4f:d8 - management: false - model: I350 Gigabit Network Connection - name: eno3 - vendor: Intel - eth2: driver: i40e firmware_version: 7.10 0x8000519f 19.0.12 interface: Ethernet @@ -85,6 +76,15 @@ grue-4: model: Ethernet Controller X710 for 10GbE SFP+ name: eno2 vendor: Intel + eth2: + driver: igb + firmware_version: 1.67, 0x80000fa8, 19.0.12 + interface: Ethernet + mac: e4:43:4b:a5:4f:d8 + management: false + model: I350 Gigabit Network Connection + name: eno3 + vendor: Intel eth3: driver: igb firmware_version: 1.67, 0x80000fa8, 19.0.12 @@ -97,7 +97,7 @@ grue-4: operating_system: cstate_driver: acpi_idle cstate_governor: menu - ht_enabled: false + ht_enabled: true pstate_driver: acpi-cpufreq pstate_governor: performance turboboost_enabled: true diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml index a931d233efd..8f362a1b159 100644 --- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml +++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml @@ -5,7 +5,7 @@ grue-5: cpu_core_numbering: round-robin nb_cores: 32 nb_procs: 2 - nb_threads: 32 + nb_threads: 64 platform_type: x86_64 bios: release_date: '08/15/2019' @@ -68,15 +68,6 @@ grue-5: rate: 10000000000 vendor: Intel eth1: - driver: igb - firmware_version: 1.67, 0x80000fa8, 19.0.12 - interface: Ethernet - mac: e4:43:4b:a4:03:0c - management: false - model: I350 Gigabit Network Connection - name: eno3 - vendor: Intel - eth2: driver: i40e firmware_version: 7.10 0x8000519f 19.0.12 interface: Ethernet @@ -85,6 +76,15 @@ grue-5: model: Ethernet Controller X710 for 10GbE SFP+ name: eno2 vendor: Intel + eth2: + driver: igb + firmware_version: 1.67, 0x80000fa8, 19.0.12 + interface: Ethernet + mac: e4:43:4b:a4:03:0c + management: false + model: I350 Gigabit Network Connection + name: eno3 + vendor: Intel eth3: driver: igb firmware_version: 1.67, 0x80000fa8, 19.0.12 @@ -97,7 +97,7 @@ grue-5: operating_system: cstate_driver: acpi_idle cstate_governor: menu - ht_enabled: false + ht_enabled: true pstate_driver: acpi-cpufreq pstate_governor: performance turboboost_enabled: true -- GitLab