From eeb339d7296bc5478005acb9b093f4bba39ba4af Mon Sep 17 00:00:00 2001
From: Pierre Neyron <pierre.neyron@imag.fr>
Date: Mon, 16 Mar 2020 14:11:34 +0100
Subject: [PATCH] [pyxis] change the cpu_core_numbering scheme to
contiguous-including-threads
---
data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json | 2 +-
data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json | 2 +-
data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json | 2 +-
data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json | 2 +-
input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml | 2 +-
input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml | 2 +-
input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml | 2 +-
input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
index 83113a63e2b..8602c4b0b83 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
@@ -1,6 +1,6 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
+ "cpu_core_numbering": "contiguous-including-threads",
"nb_cores": 64,
"nb_procs": 2,
"nb_threads": 256,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
index 5981122737b..50cfcf39944 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
@@ -1,6 +1,6 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
+ "cpu_core_numbering": "contiguous-including-threads",
"nb_cores": 64,
"nb_procs": 2,
"nb_threads": 256,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
index 780202a73e9..463a26637f5 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
@@ -1,6 +1,6 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
+ "cpu_core_numbering": "contiguous-including-threads",
"nb_cores": 64,
"nb_procs": 2,
"nb_threads": 256,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
index 446368c2b24..a440dc33e99 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
@@ -1,6 +1,6 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
+ "cpu_core_numbering": "contiguous-including-threads",
"nb_cores": 64,
"nb_procs": 2,
"nb_threads": 256,
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
index 0cf67b25e6d..5052b6076e3 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
@@ -2,7 +2,7 @@
---
pyxis-1:
architecture:
- cpu_core_numbering: contiguous
+ cpu_core_numbering: contiguous-including-threads
nb_cores: 64
nb_procs: 2
nb_threads: 256
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
index 999bf36025f..52d85183e73 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
@@ -2,7 +2,7 @@
---
pyxis-2:
architecture:
- cpu_core_numbering: contiguous
+ cpu_core_numbering: contiguous-including-threads
nb_cores: 64
nb_procs: 2
nb_threads: 256
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
index 0c8a687d6d6..a5c95801acd 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
@@ -2,7 +2,7 @@
---
pyxis-3:
architecture:
- cpu_core_numbering: contiguous
+ cpu_core_numbering: contiguous-including-threads
nb_cores: 64
nb_procs: 2
nb_threads: 256
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
index daf5e391f88..8c1031957c1 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
@@ -2,7 +2,7 @@
---
pyxis-4:
architecture:
- cpu_core_numbering: contiguous
+ cpu_core_numbering: contiguous-including-threads
nb_cores: 64
nb_procs: 2
nb_threads: 256
--
GitLab