Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
BrainSimulation
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Neurorobotics Platform
BrainSimulation
Commits
c413f3d3
Commit
c413f3d3
authored
8 years ago
by
Axel von Arnim
Committed by
BBP code review
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge "[NRRPLT-3951] Add timeout argument for CLELauncher."
parents
edbe60c5
b59a5679
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hbp_nrp_music_interface/hbp_nrp_music_interface/launch/MUSICLauncher.py
+4
-1
4 additions, 1 deletion
...interface/hbp_nrp_music_interface/launch/MUSICLauncher.py
hbp_nrp_music_xml/hbp_nrp_music_xml/pynn/xml_factory.py
+2
-0
2 additions, 0 deletions
hbp_nrp_music_xml/hbp_nrp_music_xml/pynn/xml_factory.py
with
6 additions
and
1 deletion
hbp_nrp_music_interface/hbp_nrp_music_interface/launch/MUSICLauncher.py
+
4
−
1
View file @
c413f3d3
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
hbp_nrp_music_xml/hbp_nrp_music_xml/pynn/xml_factory.py
+
2
−
0
View file @
c413f3d3
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
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!
Save comment
Cancel
Please
register
or
sign in
to comment