Skip to content
Snippets Groups Projects
Commit c413f3d3 authored by Axel von Arnim's avatar Axel von Arnim Committed by BBP code review
Browse files

Merge "[NRRPLT-3951] Add timeout argument for CLELauncher."

parents edbe60c5 b59a5679
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,7 @@ class MUSICLauncher(object):
requested brain processes.
"""
def __init__(self, exd_file, bibi_file, env_file, exp_path, server_host, sim_id):
def __init__(self, exd_file, bibi_file, env_file, exp_path, server_host, sim_id, timeout):
"""
Store all experiment configuration parameters so that they can be propagated
to the remote hosts.
......@@ -31,6 +31,7 @@ class MUSICLauncher(object):
:param exp_path Absolute path to the base dir of the experiment files.
:param server_host Target Gazebo/brain process host (e.g. local or lugano)
:param sim_id The id of the simulation/experiment to be launched.
:param timeout The default simulation timeout (time initially allocated).
"""
self._exd_file = exd_file
......@@ -39,6 +40,7 @@ class MUSICLauncher(object):
self._exp_path = exp_path
self._server_host = server_host
self._sim_id = sim_id
self._timeout = timeout
self.cle_server = None
self._config = None
......@@ -68,6 +70,7 @@ class MUSICLauncher(object):
'--experiment-path={}'.format(self._exp_path),
'--gzserver-host={}'.format(self._server_host),
'--sim-id={}'.format(self._sim_id),
'--timeout={}'.format(str(self._timeout).replace(' ', '_')),
'--music'],
1)
self._config.add_application('BRAIN', brain_launcher,
......
......@@ -173,6 +173,8 @@ class XmlFactory(object):
population_slice = create_selector(xml_synapse)
connection_rule = xml_synapse.type
synaptic_target = self._get_synaptic_target_population(xml_synapse)
if hasattr(synaptic_target, 'mask'): # prevent duplicate slicing
population_slice = None
self.connector_factory.create_and_connect_synapse(proxy,
port_name,
connection_rule,
......
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