Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-Launcher
Commits
812dcc50
Commit
812dcc50
authored
Feb 09, 2022
by
Alejandro Homs Puron
Committed by
Alejandro Homs Puron
Mar 22, 2022
Browse files
[LIMA_LAUNCHER][LIMA2_TANGO] Add merged_executable option
* It is mandatory for single-process configurations
parent
df9be9c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
config/lima_launcher/lima2_tango/id00/simulator_ahoms0_legacy.json
View file @
812dcc50
...
...
@@ -8,7 +8,8 @@
"lima2_tango"
:
{
"plugin"
:
"simulator"
,
"processing"
:
"legacy"
,
"instance"
:
"simulator_ahoms0"
"instance"
:
"simulator_ahoms0"
,
"merged_executable"
:
true
},
"environment"
:
{
"*"
:
{
...
...
config/lima_launcher/lima2_tango/id00/simulator_sam_legacy.json
View file @
812dcc50
...
...
@@ -8,7 +8,8 @@
"lima2_tango"
:
{
"plugin"
:
"simulator"
,
"processing"
:
"legacy"
,
"instance"
:
"simulator_sam"
"instance"
:
"simulator_sam"
,
"merged_executable"
:
true
},
"environment"
:
{
"*"
:
{
...
...
scripts/lima_launcher
View file @
812dcc50
...
...
@@ -172,9 +172,12 @@ def lima2_get_executables(tango_config, args):
proc
=
tango_config
.
get
(
'processing'
,
''
)
if
not
proc
:
raise
ValueError
(
'Missing lima2_tango processing definition'
)
merged
=
f
'lima2_
{
plugin
}
_
{
proc
}
'
ctrl
=
f
'lima2_
{
plugin
}
_ctrl'
recv
=
f
'lima2_
{
plugin
}
_
{
proc
}
_recv'
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
)
...
...
@@ -199,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
=
''
...
...
@@ -213,8 +215,8 @@ def launch_lima2_tango(config, args):
return
f
.
format
(
**
execs
)
mpi_cmds
+=
[
get_recv_cmd
(
c
)
for
c
in
recvs_config
]
el
se
:
mpi_cmds
=
[
f
'-n 1 {{merged}}
{
instance
}
'
.
format
(
**
execs
)]
el
if
not
execs
[
'merged'
]
:
raise
ValueError
(
'Single-processr config requires merged_executable'
)
environ_config
=
config
.
get
(
'environment'
,
{})
with
Environment
(
environ_config
,
args
=
args
)
as
env
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment