From 4618fddb2a427c705eea0f02fc2e5e5dee32dd83 Mon Sep 17 00:00:00 2001 From: David Kappel Date: Mon, 10 Apr 2017 15:30:38 +0200 Subject: [PATCH 01/11] applied patch for issue 696 --- nestkernel/connection_manager.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/nestkernel/connection_manager.cpp b/nestkernel/connection_manager.cpp index 2e29751f12..a296e77115 100644 --- a/nestkernel/connection_manager.cpp +++ b/nestkernel/connection_manager.cpp @@ -391,6 +391,13 @@ nest::ConnectionManager::connect( index sgid, } else if ( target->local_receiver() ) // target is a normal device { + if ( target->one_node_per_process() ) + { + // music proxy connection or similar device with one node per process. + connect_( *source, *target, sgid, target_thread, syn, d, w ); + return; + } + // make sure source is on this MPI rank if ( source->is_proxy() ) { @@ -453,12 +460,19 @@ nest::ConnectionManager::connect( index sgid, } else if ( target->local_receiver() ) // target is a normal device { + if ( target->one_node_per_process() ) + { + // music proxy connection or similar device with one node per process. + connect_( *source, *target, sgid, target_thread, syn, params, d, w ); + return; + } + // make sure source is on this MPI rank if ( source->is_proxy() ) { return; } - + // make sure connections are only created on the thread of the device if ( ( source->get_thread() != target_thread ) && ( source->has_proxies() ) ) @@ -521,6 +535,13 @@ nest::ConnectionManager::connect( index sgid, } else if ( target->local_receiver() ) // target is a normal device { + if ( target->one_node_per_process() ) + { + // music proxy connection or similar device with one node per process. + connect_( *source, *target, sgid, target_thread, syn, params ); + return true; + } + // make sure source is on this MPI rank if ( source->is_proxy() ) { From 71c755dc04d276c530c408330fad08efce30758e Mon Sep 17 00:00:00 2001 From: Michael Hoff Date: Mon, 10 Apr 2017 15:42:56 +0200 Subject: [PATCH 02/11] Add regression test for issue 696. --- ...t_out_proxy_multithreading_issue-696.music | 32 +++++++++ ...proxy_multithreading_issue-696_receiver.py | 47 ++++++++++++++ ..._proxy_multithreading_issue-696_sender.sli | 65 +++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music create mode 100755 testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py create mode 100644 testsuite/musictests/test_event_out_proxy_multithreading_issue-696_sender.sli diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music new file mode 100644 index 0000000000..fb703b14d7 --- /dev/null +++ b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music @@ -0,0 +1,32 @@ +/* + * test_event_out_proxy_multithreading_issue-696.music + * + * This file is part of NEST. + * + * Copyright (C) 2004 The NEST Initiative + * + * NEST is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * NEST is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NEST. If not, see . + * + */ + +[sender] + binary=nest + np=1 + args=test_event_out_proxy_multithreading_issue-696_sender.sli + +[receiver] + binary=./test_event_out_proxy_multithreading_issue-696_receiver.py + np=1 + +sender.out -> receiver.in [11] diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py new file mode 100755 index 0000000000..e98a3a7e78 --- /dev/null +++ b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py @@ -0,0 +1,47 @@ +#! /usr/bin/env python + +# +# test_event_out_proxy_multithreading_issue-696_receiver.py +# +# This file is part of NEST. +# +# Copyright (C) 2004 The NEST Initiative +# +# NEST is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# NEST is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with NEST. If not, see . +# + +import music +import itertools +import numpy as np + +setup = music.Setup() + +proxy = setup.publishEventInput('in') +assert proxy.isConnected() + +spike_buffers = [[] for _ in range(proxy.width())] + +def collect_spike(time, _, index): + print("Received spike from neuron {}: {}".format(index, time)) + spike_buffers[index].append(time) + +proxy.map(collect_spike, music.Index.GLOBAL, size=proxy.width(), base=0) + +for time in itertools.takewhile(lambda t: t < 1.0, setup.runtime(0.01)): + pass + +for spike_buffer in spike_buffers: + expected_times = [ (t + 0.1) * 1e-3 for t in [0.1, 0.2, 0.3] ] + assert np.isclose(spike_buffer, expected_times).all(), "{} vs {}".format(spike_buffer, expected_times) + diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_sender.sli b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_sender.sli new file mode 100644 index 0000000000..3f724bff96 --- /dev/null +++ b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_sender.sli @@ -0,0 +1,65 @@ +/* + * test_event_out_proxy_multithreading_issue-696_sender.sli + * + * This file is part of NEST. + * + * Copyright (C) 2004 The NEST Initiative + * + * NEST is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * NEST is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NEST. If not, see . + * + */ + +(unittest) run +/unittest using + +statusdict/have_music :: not { exit_test_gracefully } if + +M_ERROR setverbosity + +10 /N_THREADS Set +11 /N_NEURONS Set + +0 << /local_num_threads N_THREADS /resolution 0.1 >> SetStatus + +/subnet Create /SNG Set +SNG ChangeSubnet +/spike_generator N_NEURONS Create pop +0 ChangeSubnet +SNG GetGlobalNodes /generators Set + +/subnet Create /PNG Set +PNG ChangeSubnet +/parrot_neuron N_NEURONS Create pop +0 ChangeSubnet +PNG GetGlobalNodes /neurons Set +generators +{ + /i Set /sg Set + sg << /spike_times [0.1 0.2 0.3] >> SetStatus + sg neurons i get << /delay 0.1 >> Connect +} +forallindexed + +/music_event_out_proxy Create /meop Set +meop << /port_name (out) >> SetStatus + +neurons +{ + /channel Set + /n Set + n meop << /music_channel channel >> Connect +} +forallindexed + +1 Simulate From 875cdbb9e353724302b58c663becec979b047ff4 Mon Sep 17 00:00:00 2001 From: David Kappel Date: Tue, 11 Apr 2017 09:07:45 +0200 Subject: [PATCH 03/11] placed is_proxy() before one_node_per_process() test as suggested by heplesser --- nestkernel/connection_manager.cpp | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/nestkernel/connection_manager.cpp b/nestkernel/connection_manager.cpp index a296e77115..1b3e167a7b 100644 --- a/nestkernel/connection_manager.cpp +++ b/nestkernel/connection_manager.cpp @@ -391,16 +391,16 @@ nest::ConnectionManager::connect( index sgid, } else if ( target->local_receiver() ) // target is a normal device { - if ( target->one_node_per_process() ) + // make sure source is on this MPI rank + if ( source->is_proxy() ) { - // music proxy connection or similar device with one node per process. - connect_( *source, *target, sgid, target_thread, syn, d, w ); return; } - // make sure source is on this MPI rank - if ( source->is_proxy() ) + if ( target->one_node_per_process() ) { + // music proxy connection or similar device with one node per process. + connect_( *source, *target, sgid, target_thread, syn, d, w ); return; } @@ -460,19 +460,19 @@ nest::ConnectionManager::connect( index sgid, } else if ( target->local_receiver() ) // target is a normal device { - if ( target->one_node_per_process() ) + // make sure source is on this MPI rank + if ( source->is_proxy() ) { - // music proxy connection or similar device with one node per process. - connect_( *source, *target, sgid, target_thread, syn, params, d, w ); return; } - // make sure source is on this MPI rank - if ( source->is_proxy() ) + if ( target->one_node_per_process() ) { + // music proxy connection or similar device with one node per process. + connect_( *source, *target, sgid, target_thread, syn, params, d, w ); return; } - + // make sure connections are only created on the thread of the device if ( ( source->get_thread() != target_thread ) && ( source->has_proxies() ) ) @@ -535,6 +535,12 @@ nest::ConnectionManager::connect( index sgid, } else if ( target->local_receiver() ) // target is a normal device { + // make sure source is on this MPI rank + if ( source->is_proxy() ) + { + return false; + } + if ( target->one_node_per_process() ) { // music proxy connection or similar device with one node per process. @@ -542,12 +548,6 @@ nest::ConnectionManager::connect( index sgid, return true; } - // make sure source is on this MPI rank - if ( source->is_proxy() ) - { - return false; - } - // make sure connections are only created on the thread of the device if ( ( source->get_thread() != target_thread ) && ( source->has_proxies() ) ) From e22e868438cbf239154318f6ca5001ff1be7fa18 Mon Sep 17 00:00:00 2001 From: David Kappel Date: Tue, 11 Apr 2017 09:24:03 +0200 Subject: [PATCH 04/11] fix to issue #696 --- nestkernel/connection_manager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nestkernel/connection_manager.cpp b/nestkernel/connection_manager.cpp index 1b3e167a7b..d8a8fbe365 100644 --- a/nestkernel/connection_manager.cpp +++ b/nestkernel/connection_manager.cpp @@ -399,7 +399,7 @@ nest::ConnectionManager::connect( index sgid, if ( target->one_node_per_process() ) { - // music proxy connection or similar device with one node per process. + // connection to music proxy or similar device with one node per process. connect_( *source, *target, sgid, target_thread, syn, d, w ); return; } @@ -468,7 +468,7 @@ nest::ConnectionManager::connect( index sgid, if ( target->one_node_per_process() ) { - // music proxy connection or similar device with one node per process. + // connection to music proxy or similar device with one node per process. connect_( *source, *target, sgid, target_thread, syn, params, d, w ); return; } @@ -543,7 +543,7 @@ nest::ConnectionManager::connect( index sgid, if ( target->one_node_per_process() ) { - // music proxy connection or similar device with one node per process. + // connection to music proxy or similar device with one node per process. connect_( *source, *target, sgid, target_thread, syn, params ); return true; } From 86746eacd56e56c9a6792042acf8ff05fa8a70e9 Mon Sep 17 00:00:00 2001 From: David Kappel Date: Wed, 12 Apr 2017 14:34:48 +0200 Subject: [PATCH 05/11] fixed code formatting --- ...st_event_out_proxy_multithreading_issue-696_receiver.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py index e98a3a7e78..8143fdd250 100755 --- a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py +++ b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py @@ -32,6 +32,7 @@ spike_buffers = [[] for _ in range(proxy.width())] + def collect_spike(time, _, index): print("Received spike from neuron {}: {}".format(index, time)) spike_buffers[index].append(time) @@ -42,6 +43,6 @@ def collect_spike(time, _, index): pass for spike_buffer in spike_buffers: - expected_times = [ (t + 0.1) * 1e-3 for t in [0.1, 0.2, 0.3] ] - assert np.isclose(spike_buffer, expected_times).all(), "{} vs {}".format(spike_buffer, expected_times) - + expected_times = [(t + 0.1) * 1e-3 for t in [0.1, 0.2, 0.3]] + msg = "{} vs {}".format(spike_buffer, expected_times) + assert np.isclose(spike_buffer, expected_times).all(), msg From ae7290992b9834db6146bd4207f3ef38ceb474e3 Mon Sep 17 00:00:00 2001 From: David Kappel Date: Wed, 12 Apr 2017 15:01:29 +0200 Subject: [PATCH 06/11] fixed copyright header --- ...proxy_multithreading_issue-696_receiver.py | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py index 8143fdd250..2b2f5d214e 100755 --- a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py +++ b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py @@ -1,25 +1,24 @@ -#! /usr/bin/env python - -# -# test_event_out_proxy_multithreading_issue-696_receiver.py +#!/usr/bin/env python +# -*- coding: utf-8 -*- # -# This file is part of NEST. +# test_event_out_proxy_multithreading_issue-696_receiver.py # -# Copyright (C) 2004 The NEST Initiative +# This file is part of NEST. # -# NEST is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. +# Copyright (C) 2004 The NEST Initiative # -# NEST is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# NEST is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. # -# You should have received a copy of the GNU General Public License -# along with NEST. If not, see . +# NEST is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # +# You should have received a copy of the GNU General Public License +# along with NEST. If not, see . import music import itertools From 0f7ef9f43726375c5ad3f6d5ba756218b3a7df67 Mon Sep 17 00:00:00 2001 From: Michael Hoff Date: Tue, 18 Apr 2017 17:53:39 +0200 Subject: [PATCH 07/11] Simplify path. --- .../test_event_out_proxy_multithreading_issue-696.music | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music index fb703b14d7..aebdc3b062 100644 --- a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music +++ b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music @@ -26,7 +26,7 @@ args=test_event_out_proxy_multithreading_issue-696_sender.sli [receiver] - binary=./test_event_out_proxy_multithreading_issue-696_receiver.py + binary=test_event_out_proxy_multithreading_issue-696_receiver.py np=1 sender.out -> receiver.in [11] From 37491409ac5357a008b37a5e441aa3bf0c74796a Mon Sep 17 00:00:00 2001 From: Michael Hoff Date: Wed, 19 Apr 2017 15:10:07 +0200 Subject: [PATCH 08/11] Make receiver sli-based. --- ...t_out_proxy_multithreading_issue-696.music | 3 +- ...proxy_multithreading_issue-696_receiver.py | 47 ---------------- ...roxy_multithreading_issue-696_receiver.sli | 53 +++++++++++++++++++ 3 files changed, 55 insertions(+), 48 deletions(-) delete mode 100755 testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py create mode 100644 testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music index aebdc3b062..ca02d90618 100644 --- a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music +++ b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music @@ -26,7 +26,8 @@ args=test_event_out_proxy_multithreading_issue-696_sender.sli [receiver] - binary=test_event_out_proxy_multithreading_issue-696_receiver.py + binary=nest + args=test_event_out_proxy_multithreading_issue-696_receiver.sli np=1 sender.out -> receiver.in [11] diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py deleted file mode 100755 index 2b2f5d214e..0000000000 --- a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -# test_event_out_proxy_multithreading_issue-696_receiver.py -# -# This file is part of NEST. -# -# Copyright (C) 2004 The NEST Initiative -# -# NEST is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# NEST is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with NEST. If not, see . - -import music -import itertools -import numpy as np - -setup = music.Setup() - -proxy = setup.publishEventInput('in') -assert proxy.isConnected() - -spike_buffers = [[] for _ in range(proxy.width())] - - -def collect_spike(time, _, index): - print("Received spike from neuron {}: {}".format(index, time)) - spike_buffers[index].append(time) - -proxy.map(collect_spike, music.Index.GLOBAL, size=proxy.width(), base=0) - -for time in itertools.takewhile(lambda t: t < 1.0, setup.runtime(0.01)): - pass - -for spike_buffer in spike_buffers: - expected_times = [(t + 0.1) * 1e-3 for t in [0.1, 0.2, 0.3]] - msg = "{} vs {}".format(spike_buffer, expected_times) - assert np.isclose(spike_buffer, expected_times).all(), msg diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli new file mode 100644 index 0000000000..fb01dad0db --- /dev/null +++ b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli @@ -0,0 +1,53 @@ +/* + * test_event_out_proxy_multithreading_issue-696_sender.sli + * + * This file is part of NEST. + * + * Copyright (C) 2004 The NEST Initiative + * + * NEST is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * NEST is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NEST. If not, see . + * + */ + +(unittest) run +/unittest using + +statusdict/have_music :: not { exit_test_gracefully } if + +M_ERROR setverbosity + +11 /N_NEURONS Set + +/subnet Create /NG Set +NG ChangeSubnet +/iaf_neuron N_NEURONS Create pop +0 ChangeSubnet +NG GetGlobalNodes /neurons Set + +/subnet Create /INP Set +INP ChangeSubnet +/music_event_in_proxy N_NEURONS Create pop +0 ChangeSubnet +INP GetGlobalNodes /inputs Set + +inputs +{ + /channel Set + /n Set + n << /port_name (in) /music_channel channel >> SetStatus + n neurons channel get << /weight 750.0 >> Connect +} +forallindexed + +1 Simulate From 36af3a07e66397bb7453d3d414b22b40177b8076 Mon Sep 17 00:00:00 2001 From: Michael Hoff Date: Wed, 19 Apr 2017 15:15:57 +0200 Subject: [PATCH 09/11] Typo. --- .../test_event_out_proxy_multithreading_issue-696_receiver.sli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli index fb01dad0db..50b601969e 100644 --- a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli +++ b/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli @@ -1,5 +1,5 @@ /* - * test_event_out_proxy_multithreading_issue-696_sender.sli + * test_event_out_proxy_multithreading_issue-696_receiver.sli * * This file is part of NEST. * From 6a9a2abdc2bfc7858e3cc3bea3879130127856d8 Mon Sep 17 00:00:00 2001 From: Michael Hoff Date: Wed, 19 Apr 2017 15:32:48 +0200 Subject: [PATCH 10/11] Shorten file names. --- ...g_issue-696.music => test_event_proxies_issue-696.music} | 6 +++--- ...ceiver.sli => test_event_proxies_issue-696_receiver.sli} | 2 +- ...6_sender.sli => test_event_proxies_issue-696_sender.sli} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename testsuite/musictests/{test_event_out_proxy_multithreading_issue-696.music => test_event_proxies_issue-696.music} (81%) rename testsuite/musictests/{test_event_out_proxy_multithreading_issue-696_receiver.sli => test_event_proxies_issue-696_receiver.sli} (95%) rename testsuite/musictests/{test_event_out_proxy_multithreading_issue-696_sender.sli => test_event_proxies_issue-696_sender.sli} (96%) diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music b/testsuite/musictests/test_event_proxies_issue-696.music similarity index 81% rename from testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music rename to testsuite/musictests/test_event_proxies_issue-696.music index ca02d90618..4a25a521a9 100644 --- a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696.music +++ b/testsuite/musictests/test_event_proxies_issue-696.music @@ -1,5 +1,5 @@ /* - * test_event_out_proxy_multithreading_issue-696.music + * test_event_proxies_issue-696.music * * This file is part of NEST. * @@ -23,11 +23,11 @@ [sender] binary=nest np=1 - args=test_event_out_proxy_multithreading_issue-696_sender.sli + args=test_event_proxies_issue-696_sender.sli [receiver] binary=nest - args=test_event_out_proxy_multithreading_issue-696_receiver.sli np=1 + args=test_event_proxies_issue-696_receiver.sli sender.out -> receiver.in [11] diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli b/testsuite/musictests/test_event_proxies_issue-696_receiver.sli similarity index 95% rename from testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli rename to testsuite/musictests/test_event_proxies_issue-696_receiver.sli index 50b601969e..955b62070f 100644 --- a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_receiver.sli +++ b/testsuite/musictests/test_event_proxies_issue-696_receiver.sli @@ -1,5 +1,5 @@ /* - * test_event_out_proxy_multithreading_issue-696_receiver.sli + * test_event_proxies_issue-696_receiver.sli * * This file is part of NEST. * diff --git a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_sender.sli b/testsuite/musictests/test_event_proxies_issue-696_sender.sli similarity index 96% rename from testsuite/musictests/test_event_out_proxy_multithreading_issue-696_sender.sli rename to testsuite/musictests/test_event_proxies_issue-696_sender.sli index 3f724bff96..f97268d233 100644 --- a/testsuite/musictests/test_event_out_proxy_multithreading_issue-696_sender.sli +++ b/testsuite/musictests/test_event_proxies_issue-696_sender.sli @@ -1,5 +1,5 @@ /* - * test_event_out_proxy_multithreading_issue-696_sender.sli + * test_event_proxies_issue-696_sender.sli * * This file is part of NEST. * From b39ee03e41f14326b58b14948e4cde864752bc1b Mon Sep 17 00:00:00 2001 From: Michael Hoff Date: Thu, 20 Apr 2017 12:08:05 +0200 Subject: [PATCH 11/11] Use non-deprecated neuron model. --- testsuite/musictests/test_event_proxies_issue-696_receiver.sli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/musictests/test_event_proxies_issue-696_receiver.sli b/testsuite/musictests/test_event_proxies_issue-696_receiver.sli index 955b62070f..44b9990f6f 100644 --- a/testsuite/musictests/test_event_proxies_issue-696_receiver.sli +++ b/testsuite/musictests/test_event_proxies_issue-696_receiver.sli @@ -31,7 +31,7 @@ M_ERROR setverbosity /subnet Create /NG Set NG ChangeSubnet -/iaf_neuron N_NEURONS Create pop +/iaf_psc_alpha N_NEURONS Create pop 0 ChangeSubnet NG GetGlobalNodes /neurons Set