testsuite::issue-521 - *_hpc connections return local id instead of g…

nestkernel/connection_manager.cpp

@@ -165,7 +165,7 @@ nest::ConnectionManager::get_synapse_status( index gid,
 
   DictionaryDatum dict( new Dictionary );
   validate_pointer( connections_[ tid ].get( gid ) )
-    ->get_synapse_status( syn_id, dict, p );
+    ->get_synapse_status( syn_id, dict, p, tid );
   ( *dict )[ names::source ] = gid;
   ( *dict )[ names::synapse_model ] = LiteralDatum(
     kernel().model_manager.get_synapse_prototype( syn_id ).get_name() );

nestkernel/connector_base.h

@@ -135,8 +135,10 @@ class ConnectorBase
 public:
   ConnectorBase();
 
-  virtual void
-  get_synapse_status( synindex syn_id, DictionaryDatum& d, port p ) const = 0;
+  virtual void get_synapse_status( synindex syn_id,
+    DictionaryDatum& d,
+    port p,
+    const thread tid ) const = 0;
   virtual void set_synapse_status( synindex syn_id,
     ConnectorModel& cm,
     const DictionaryDatum& d,
@@ -300,12 +302,17 @@ class Connector : public vector_like< ConnectionT >
   }
 
   void
-  get_synapse_status( synindex syn_id, DictionaryDatum& d, port p ) const
+  get_synapse_status( synindex syn_id,
+    DictionaryDatum& d,
+    port p,
+    const thread tid ) const
   {
     if ( syn_id == C_[ 0 ].get_syn_id() )
     {
       assert( p >= 0 && static_cast< size_t >( p ) < K );
       C_[ p ].get_status( d );
+      // set target gid here, where tid is available
+      def< long >( d, names::target, C_[ p ].get_target( tid )->get_gid() );
     }
   }
 
@@ -583,12 +590,17 @@ class Connector< 1, ConnectionT > : public vector_like< ConnectionT >
   }
 
   void
-  get_synapse_status( synindex syn_id, DictionaryDatum& d, port p ) const
+  get_synapse_status( synindex syn_id,
+    DictionaryDatum& d,
+    port p,
+    const thread tid ) const
   {
     if ( syn_id == C_[ 0 ].get_syn_id() )
     {
       assert( static_cast< size_t >( p ) == 0 );
       C_[ 0 ].get_status( d );
+      // set target gid here, where tid is available
+      def< long >( d, names::target, C_[ 0 ].get_target( tid )->get_gid() );
     }
   }
 
@@ -834,12 +846,17 @@ class Connector< K_CUTOFF, ConnectionT > : public vector_like< ConnectionT >
   }
 
   void
-  get_synapse_status( synindex syn_id, DictionaryDatum& d, port p ) const
+  get_synapse_status( synindex syn_id,
+    DictionaryDatum& d,
+    port p,
+    const thread tid ) const
   {
     if ( syn_id == C_[ 0 ].get_syn_id() )
     {
       assert( p >= 0 && static_cast< size_t >( p ) < C_.size() );
       C_[ p ].get_status( d );
+      // set target gid here, where tid is available
+      def< long >( d, names::target, C_[ p ].get_target( tid )->get_gid() );
     }
   }
 
@@ -1080,11 +1097,14 @@ class HetConnector : public std::vector< ConnectorBase* >, public ConnectorBase
   }
 
   void
-  get_synapse_status( synindex syn_id, DictionaryDatum& d, port p ) const
+  get_synapse_status( synindex syn_id,
+    DictionaryDatum& d,
+    port p,
+    const thread tid ) const
   {
     for ( size_t i = 0; i < size(); i++ )
     {
-      at( i )->get_synapse_status( syn_id, d, p );
+      at( i )->get_synapse_status( syn_id, d, p, tid );
     }
   }
 

testsuite/regressiontests/issue-521.sli

@@ -0,0 +1,77 @@
+/*
+ *  issue-521.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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+/* BeginDocumentation
+   Name: testsuite::issue-521 - *_hpc connections return local id instead of global id of target neuron
+
+   *_hpc connections should only return thread_local_target instead of target
+   to avoid confusion
+
+   FirstVersion: 04/2017
+   Author: Till Schumann
+ */
+
+(unittest) run
+/unittest using
+
+skip_if_not_threaded
+
+/test_targets
+{
+dup /threads Set
+ResetKernel
+0 << /local_num_threads threads >> SetStatus
+
+
+% create set of neurons
+/iaf_psc_alpha 20 Create
+
+% connect two neurons (prime number to increase variations of thread placement)
+5 13 /static_synapse Connect
+5 13 /static_synapse_hpc Connect
+
+% store info from target neuron for comparison 
+13 GetStatus /target_dict Set
+
+<< >> GetConnections 0 get GetStatus /conn_dict Set
+<< >> GetConnections 1 get GetStatus /conn_hpc_dict Set
+
+
+/* normal connection should contain global_id as target */
+conn_dict /target get target_dict /global_id get eq assert_or_die
+
+/* same for hpc connection */
+conn_hpc_dict /target get target_dict /global_id get eq assert_or_die
+
+
+} def
+
+
+/* test runs with different number of threads */
+1 test_targets
+2 test_targets
+4 test_targets 
+8 test_targets
+16 test_targets
+
+endusing