diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_lima1.json b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_legacy.json similarity index 96% rename from config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_lima1.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_legacy.json index dfdb01016364950946a385c0cd1bafcc727a9dea..7b68a9c4fad6cfba5c247f440d444c8934d4be4a 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_lima1.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_legacy.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x1_lima1", + "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x1_legacy", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x1_lima1", + "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x1_legacy", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "lima1", + "processing": "legacy", "instance": "jungfrau_4m_01_lid29p9jfrau1_rr_x1", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_id29.json b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_smx.json similarity index 96% rename from config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_id29.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_smx.json index 485c8e5c4d1d6477c413e505df7a9d3f366d565f..c6c76eddded8f9a1ab0e83a5a0ebd3e815973279 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_id29.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_smx.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x1_id29", + "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x1_smx", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x1_id29", + "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x1_smx", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "id29", + "processing": "smx", "instance": "jungfrau_4m_01_lid29p9jfrau1_rr_x1", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_lima1.json b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_legacy.json similarity index 96% rename from config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_lima1.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_legacy.json index 68ca2fd8436d1f6d377423a276547e3b22e0626a..9a322b7bfb7e4f952ebb3818f652950b9ebb79ff 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_lima1.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_legacy.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x2_lima1", + "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x2_legacy", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x2_lima1", + "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x2_legacy", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "lima1", + "processing": "legacy", "instance": "jungfrau_4m_01_lid29p9jfrau1_rr_x2", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_id29.json b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_smx.json similarity index 96% rename from config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_id29.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_smx.json index 393710157718223abc5488e66bab5d4bf49a38ab..ba72b385ea6a5e1c3732b69e6634743d4e8d4d22 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_id29.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_smx.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x2_id29", + "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x2_smx", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x2_id29", + "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_rr_x2_smx", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "id29", + "processing": "smx", "instance": "jungfrau_4m_01_lid29p9jfrau1_rr_x2", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_lima1.json b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_legacy.json similarity index 96% rename from config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_lima1.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_legacy.json index a2856dda5b619fa8be07b4609163e4bf8122b7fe..3893623be9e75cbcfa472b69557e06bf7c2b561e 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_lima1.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_legacy.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_x1_lima1", + "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_x1_legacy", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_x1_lima1", + "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_x1_legacy", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "lima1", + "processing": "legacy", "instance": "jungfrau_4m_01_lid29p9jfrau1_x1", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_id29.json b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_smx.json similarity index 96% rename from config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_id29.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_smx.json index 4b5ae78b27064c2b17deb6f061efaba8077740a5..6a01b724bbc9ceb2925d10c1a887b2dd47816eff 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_id29.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_smx.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_x1_id29", + "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_x1_smx", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_x1_id29", + "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_x1_smx", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "id29", + "processing": "smx", "instance": "jungfrau_4m_01_lid29p9jfrau1_x1", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_lima1.json b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_legacy.json similarity index 96% rename from config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_lima1.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_legacy.json index 4da31122c514cf4c40942cc90d987577c7a0f09c..ceb80f3f335138e1b9fda5d935c290d18edf9c0b 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_lima1.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_legacy.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_x2_lima1", + "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_x2_legacy", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_x2_lima1", + "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_x2_legacy", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "lima1", + "processing": "legacy", "instance": "jungfrau_4m_01_lid29p9jfrau1_x2", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_id29.json b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_smx.json similarity index 96% rename from config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_id29.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_smx.json index 06aae94bf73e023c992093af0911408ecc339626..8e5e0c912af147b2a52fbfb59ff1dfd287f93278 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_id29.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_smx.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_x2_id29", + "server": "lima2_jungfrau_4m_01_lid29p9jfrau1_x2_smx", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_x2_id29", + "device": "id00/limalauncher/lima2_jungfrau_4m_01_lid29p9jfrau1_x2_smx", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "id29", + "processing": "smx", "instance": "jungfrau_4m_01_lid29p9jfrau1_x2", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_lima1.json b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_legacy.json similarity index 95% rename from config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_lima1.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_legacy.json index d263f4614f2d80ea283bd1047fb4252dac0a87a0..7e89626862092540e70b3638346f75d35f808de6 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_lima1.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_legacy.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_500k_307_lid29p9jfrau1_rr_x1_lima1", + "server": "lima2_jungfrau_500k_307_lid29p9jfrau1_rr_x1_legacy", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_500k_307_lid29p9jfrau1_rr_x1_lima1", + "device": "id00/limalauncher/lima2_jungfrau_500k_307_lid29p9jfrau1_rr_x1_legacy", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "lima1", + "processing": "legacy", "instance": "jungfrau_500k_307_lid29p9jfrau1_rr_x1", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_id29.json b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_smx.json similarity index 95% rename from config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_id29.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_smx.json index b49b291b627da898bd40eab3a5e39befbbcdf99c..70699426510b3ad6deca2e1d184acff0a18f1559 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_id29.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_smx.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_500k_307_lid29p9jfrau1_rr_x1_id29", + "server": "lima2_jungfrau_500k_307_lid29p9jfrau1_rr_x1_smx", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_500k_307_lid29p9jfrau1_rr_x1_id29", + "device": "id00/limalauncher/lima2_jungfrau_500k_307_lid29p9jfrau1_rr_x1_smx", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "id29", + "processing": "smx", "instance": "jungfrau_500k_307_lid29p9jfrau1_rr_x1", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_legacy.json b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_legacy.json new file mode 100644 index 0000000000000000000000000000000000000000..5e1a103afa8e0341c48e7d00cf3b9f5bb6c4de9f --- /dev/null +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_legacy.json @@ -0,0 +1,55 @@ +{ + "executable": "lima_launcher", + "server": "lima2_jungfrau_500k_307_lid29p9jfrau1_x1_legacy", + "class": "LimaLauncher", + "device": "id00/limalauncher/lima2_jungfrau_500k_307_lid29p9jfrau1_x1_legacy", + "config": { + "application": "lima2_tango", + "lima2_tango": { + "plugin": "psi", + "processing": "legacy", + "instance": "jungfrau_500k_307_lid29p9jfrau1_x1", + "control": {"host_name": "lid29p9jfrau1"}, + "receivers": [ + { + "host_name": "lid29p9jfrau1", + "nb_receivers": 1, + "numactl": {"node": 0} + } + ] + }, + "environment": { + "lid29p9jfrau1": { + "conda": { + "base": "/home/ahoms/conda/miniconda", + "environment": "jungfrau_lima2" + }, + "ld_preload": "/home/ahoms/p9/power-gzip/lib/libnxz.so", + "cpu_affinity": { + "lima": {"ranges": [[ 4, 30], [ 36, 62], [ 68, 94], [100, 126]]}, + "other": {"cpus": [ 30, 62, 31, 95]}, + "net_dev": [ + {"devs": ["enP5p1s0f0", "enP5p1s0f1", + "enP48p1s0f1", + "mlx100c0p1","mlx100c1p1"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 63]}, + "proc": {"cpus": [127]}}}]}, + {"devs": ["enP48p1s0f0"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 94]}, + "proc": {"cpus": [126]}}}]}, + {"devs": ["mlx100c0p0"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 0, 32]}, + "proc": {"cpus": [ 1, 33]}}}]}, + {"devs": ["mlx100c1p0"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 64, 96]}, + "proc": {"cpus": [ 65, 97]}}}]} + ] + } + } + } + } +} diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_lima1.json b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_smx.json similarity index 95% rename from config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_lima1.json rename to config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_smx.json index 33d24336f26e88f310bdbbbb05691212371967bb..b3ef193c1c632ae9a5ae6b2f852f9e0b466d99b9 100644 --- a/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_lima1.json +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_smx.json @@ -1,13 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_jungfrau_500k_307_lid29p9jfrau1_x1_lima1", + "server": "lima2_jungfrau_500k_307_lid29p9jfrau1_x1_smx", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_jungfrau_500k_307_lid29p9jfrau1_x1_lima1", + "device": "id00/limalauncher/lima2_jungfrau_500k_307_lid29p9jfrau1_x1_smx", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "psi", - "processing": "lima1", + "processing": "smx", "instance": "jungfrau_500k_307_lid29p9jfrau1_x1", "control": {"host_name": "lid29p9jfrau1"}, "receivers": [ diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29pwr9_x1_legacy.json b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29pwr9_x1_legacy.json new file mode 100644 index 0000000000000000000000000000000000000000..e76ca23ade4ffe55d67d496051a452dfbc83f710 --- /dev/null +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29pwr9_x1_legacy.json @@ -0,0 +1,55 @@ +{ + "executable": "lima_launcher", + "server": "lima2_jungfrau_500k_307_lid29pwr9_x1_legacy", + "class": "LimaLauncher", + "device": "id00/limalauncher/lima2_jungfrau_500k_307_lid29pwr9_x1_legacy", + "config": { + "application": "lima2_tango", + "lima2_tango": { + "plugin": "psi", + "processing": "legacy", + "instance": "jungfrau_500k_307_lid29pwr9_x1", + "control": {"host_name": "lid29pwr9"}, + "receivers": [ + { + "host_name": "lid29pwr9", + "nb_receivers": 1, + "numactl": {"node": 0} + } + ] + }, + "environment": { + "lid29pwr9": { + "conda": { + "base": "/home/ahoms/conda/miniconda", + "environment": "lima2" + }, + "ld_preload": "/home/ahoms/p9/power-gzip/lib/libnxz.so", + "cpu_affinity": { + "lima": {"ranges": [[ 4, 30], [ 36, 62], [ 68, 94], [100, 126]]}, + "other": {"cpus": [ 30, 62, 31, 95]}, + "net_dev": [ + {"devs": ["enP5p1s0f0", "enP5p1s0f1", + "enP48p1s0f1", + "mlx100c0p1","mlx100c1p1"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 63]}, + "proc": {"cpus": [127]}}}]}, + {"devs": ["enP48p1s0f0"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 94]}, + "proc": {"cpus": [126]}}}]}, + {"devs": ["mlx100c0p0"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 0, 32]}, + "proc": {"cpus": [ 1, 33]}}}]}, + {"devs": ["mlx100c1p0"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 64, 96]}, + "proc": {"cpus": [ 65, 97]}}}]} + ] + } + } + } + } +} diff --git a/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29pwr9_x1_smx.json b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29pwr9_x1_smx.json new file mode 100644 index 0000000000000000000000000000000000000000..e113390f3e410074cd5a42a7c596a4eba89dd802 --- /dev/null +++ b/config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29pwr9_x1_smx.json @@ -0,0 +1,55 @@ +{ + "executable": "lima_launcher", + "server": "lima2_jungfrau_500k_307_lid29pwr9_x1_smx", + "class": "LimaLauncher", + "device": "id00/limalauncher/lima2_jungfrau_500k_307_lid29pwr9_x1_smx", + "config": { + "application": "lima2_tango", + "lima2_tango": { + "plugin": "psi", + "processing": "smx", + "instance": "jungfrau_500k_307_lid29pwr9_x1", + "control": {"host_name": "lid29pwr9"}, + "receivers": [ + { + "host_name": "lid29pwr9", + "nb_receivers": 1, + "numactl": {"node": 0} + } + ] + }, + "environment": { + "lid29pwr9": { + "conda": { + "base": "/home/ahoms/conda/miniconda", + "environment": "lima2" + }, + "ld_preload": "/home/ahoms/p9/power-gzip/lib/libnxz.so", + "cpu_affinity": { + "lima": {"ranges": [[ 4, 30], [ 36, 62], [ 68, 94], [100, 126]]}, + "other": {"cpus": [ 30, 62, 31, 95]}, + "net_dev": [ + {"devs": ["enP5p1s0f0", "enP5p1s0f1", + "enP48p1s0f1", + "mlx100c0p1","mlx100c1p1"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 63]}, + "proc": {"cpus": [127]}}}]}, + {"devs": ["enP48p1s0f0"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 94]}, + "proc": {"cpus": [126]}}}]}, + {"devs": ["mlx100c0p0"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 0, 32]}, + "proc": {"cpus": [ 1, 33]}}}]}, + {"devs": ["mlx100c1p0"], + "affinity": [{"queue": -1, + "affinity": {"irq": {"cpus": [ 64, 96]}, + "proc": {"cpus": [ 65, 97]}}}]} + ] + } + } + } + } +} diff --git a/config/lima_launcher/lima2_tango/id00/simulator_ahoms0.json b/config/lima_launcher/lima2_tango/id00/simulator_ahoms0_legacy.json similarity index 64% rename from config/lima_launcher/lima2_tango/id00/simulator_ahoms0.json rename to config/lima_launcher/lima2_tango/id00/simulator_ahoms0_legacy.json index cd82972884806747657e5cbf938c8a66363c7786..5978a02b51f95b3bfd79c82d45e92cb68d23cc36 100644 --- a/config/lima_launcher/lima2_tango/id00/simulator_ahoms0.json +++ b/config/lima_launcher/lima2_tango/id00/simulator_ahoms0_legacy.json @@ -1,13 +1,15 @@ { "executable": "lima_launcher", - "server": "lima2_simulator_ahoms0", + "server": "lima2_simulator_ahoms0_legacy", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_simulator_ahoms0", + "device": "id00/limalauncher/lima2_simulator_ahoms0_legacy", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "simulator", - "instance": "simulator_ahoms0" + "processing": "legacy", + "instance": "simulator_ahoms0", + "merged_executable": true }, "environment": { "*": { diff --git a/config/lima_launcher/lima2_tango/id00/simulator_ahoms1.json b/config/lima_launcher/lima2_tango/id00/simulator_ahoms1_legacy.json similarity index 79% rename from config/lima_launcher/lima2_tango/id00/simulator_ahoms1.json rename to config/lima_launcher/lima2_tango/id00/simulator_ahoms1_legacy.json index c6796e3b9a12f820cc224f0967d9b5c7eb0bd6e6..d371334cce3b47f895e3d2116aff8714f073f010 100644 --- a/config/lima_launcher/lima2_tango/id00/simulator_ahoms1.json +++ b/config/lima_launcher/lima2_tango/id00/simulator_ahoms1_legacy.json @@ -1,12 +1,13 @@ { "executable": "lima_launcher", - "server": "lima2_simulator_ahoms1", + "server": "lima2_simulator_ahoms1_legacy", "class": "LimaLauncher", - "device": "id00/limalauncher/lima2_simulator_ahoms1", + "device": "id00/limalauncher/lima2_simulator_ahoms1_legacy", "config": { "application": "lima2_tango", "lima2_tango": { "plugin": "simulator", + "processing": "legacy", "instance": "simulator_ahoms1", "receivers": [ { diff --git a/config/lima_launcher/lima2_tango/id00/simulator_sam_legacy.json b/config/lima_launcher/lima2_tango/id00/simulator_sam_legacy.json new file mode 100644 index 0000000000000000000000000000000000000000..2d873fa21497c79591332dec5c853b64de8d2a0f --- /dev/null +++ b/config/lima_launcher/lima2_tango/id00/simulator_sam_legacy.json @@ -0,0 +1,23 @@ +{ + "executable": "lima_launcher", + "server": "lima2_simulator_sam_legacy", + "class": "LimaLauncher", + "device": "id00/limalauncher/lima2_simulator_sam_legacy", + "config": { + "application": "lima2_tango", + "lima2_tango": { + "plugin": "simulator", + "processing": "legacy", + "instance": "simulator_sam", + "merged_executable": true + }, + "environment": { + "*": { + "conda": { + "base": "/nobackup/lid29pwr9/debionne/miniconda3", + "environment": "lima2" + } + } + } + } +} diff --git a/scripts/lima_launcher b/scripts/lima_launcher index 5dd241d202d368eec9042c09b716c598f5b55282..b1d6df927c5e81d608379bb4f98f27a09845b4d8 100755 --- a/scripts/lima_launcher +++ b/scripts/lima_launcher @@ -170,14 +170,14 @@ def lima2_get_executables(tango_config, args): if not plugin: raise ValueError('Missing lima2_tango plugin definition') proc = tango_config.get('processing', '') - merged = f'lima2_{plugin}' - ctrl = f'lima2_{plugin}_ctrl' - recv = f'lima2_{plugin}_recv_{proc}' - proc_invariant_recv_plugins = ['simulator'] - if plugin in proc_invariant_recv_plugins: - recv = f'lima2_{plugin}_recv' - elif not proc: + if not proc: raise ValueError('Missing lima2_tango processing definition') + merged = tango_config.get('merged_executable', False) + if merged: + ctrl = recv = f'lima2_{plugin}_{proc}' + else: + ctrl = f'lima2_{plugin}_ctrl' + recv = f'lima2_{plugin}_{proc}_recv' return dict(merged=merged, ctrl=ctrl, recv=recv) @@ -202,9 +202,8 @@ def launch_lima2_tango(config, args): if remote_control or remote_recvs: raise ValueError('Remote servers not supported yet') + mpi_cmds = [f'-n 1 {{ctrl}} {instance}'.format(**execs)] if nb_recvs > 0: - mpi_cmds = [f'-n 1 {{ctrl}} {instance}'.format(**execs)] - def get_recv_cmd(recv_config): nb_recvs = recv_config.get('nb_receivers', 1) numa_cmd = '' @@ -216,8 +215,8 @@ def launch_lima2_tango(config, args): return f.format(**execs) mpi_cmds += [get_recv_cmd(c) for c in recvs_config] - else: - mpi_cmds = [f'-n 1 {{merged}} {instance}'.format(**execs)] + elif not execs['merged']: + raise ValueError('Single-processr config requires merged_executable') environ_config = config.get('environment', {}) with Environment(environ_config, args=args) as env: @@ -257,7 +256,7 @@ def main(): json_config = get_tango_json_config(server, args.tango_personal_name) else: mandatory = 'json_config', 'json_config_file', 'tango_personal_name' - print(f'Error: must specify one optiom among {mandatory}\n') + print(f'Error: must specify one option among {mandatory}\n') parser.print_help() exit(1)