Skip to content
GitLab
Commit 92e11e00 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron
Browse files

Merge branch 'fix/adapt-to-core' into 'master' 

Fix/adapt to core

See merge request !1
parents b8d34861 257d3100
Hide whitespace changes
Inline Side-by-side
config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_lima1.json → config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_legacy.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_id29.json → config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x1_smx.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_lima1.json → config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_legacy.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_id29.json → config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_rr_x2_smx.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_lima1.json → config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_legacy.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_id29.json → config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x1_smx.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_lima1.json → config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_legacy.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_id29.json → config/lima_launcher/lima2_tango/id00/jungfrau_4m_01_lid29p9jfrau1_x2_smx.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_lima1.json → config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_legacy.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_id29.json → config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_rr_x1_smx.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_legacy.json 0 → 100644
View file @ 92e11e00
{
"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]}}}]}
]
}
}
}
}
}
config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_lima1.json → config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29p9jfrau1_x1_smx.json
View file @ 92e11e00
{
"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": [
......
config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29pwr9_x1_legacy.json 0 → 100644
View file @ 92e11e00
{
"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]}}}]}
]
}
}
}
}
}
config/lima_launcher/lima2_tango/id00/jungfrau_500k_307_lid29pwr9_x1_smx.json 0 → 100644
View file @ 92e11e00
{
"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]}}}]}
]
}
}
}
}
}
config/lima_launcher/lima2_tango/id00/simulator_ahoms0.json → config/lima_launcher/lima2_tango/id00/simulator_ahoms0_legacy.json
View file @ 92e11e00
{
"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": {
"*": {
......
config/lima_launcher/lima2_tango/id00/simulator_ahoms1.json → config/lima_launcher/lima2_tango/id00/simulator_ahoms1_legacy.json
View file @ 92e11e00
{
"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": [
{
......
config/lima_launcher/lima2_tango/id00/simulator_sam_legacy.json 0 → 100644
View file @ 92e11e00
{
"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"
}
}
}
}
}
scripts/lima_launcher
View file @ 92e11e00
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment