Merge pull request #2665 from JanVogelsang/master

Set sender node id info with correct target lcid
nest · Jul 18, 2023 · b9514cc · b9514cc
2 parents 0982694 + 34c2727
commit b9514cc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/nestkernel/connector_base.h b/nestkernel/connector_base.h
@@ -388,28 +388,31 @@ class Connector : public ConnectorBase
     typename ConnectionT::CommonPropertiesType const& cp =
       static_cast< GenericConnectorModel< ConnectionT >* >( cm[ syn_id_ ] )->get_common_properties();
 
-    size_t lcid_offset = 0;
+    size_t current_lcid = lcid;
 
     while ( true )
     {
-      ConnectionT& conn = C_[ lcid + lcid_offset ];
+      ConnectionT& conn = C_[ current_lcid ];
       const bool is_disabled = conn.is_disabled();
       const bool source_has_more_targets = conn.source_has_more_targets();
 
-      e.set_port( lcid + lcid_offset );
+      e.set_port( current_lcid );
       if ( not is_disabled )
       {
+        // non-local sender -> receiver retrieves ID of sender Node from SourceTable based on tid, syn_id, lcid
+        // only if needed, as this is computationally costly
+        e.set_sender_node_id_info( tid, syn_id_, current_lcid );
         conn.send( e, tid, cp );
-        send_weight_event( tid, lcid + lcid_offset, e, cp );
+        send_weight_event( tid, current_lcid, e, cp );
       }
       if ( not source_has_more_targets )
       {
         break;
       }
-      ++lcid_offset;
+      ++current_lcid;
     }
 
-    return 1 + lcid_offset; // event was delivered to at least one target
+    return 1 + current_lcid - lcid; // event was delivered to at least one target
   }
 
   // Implemented in connector_base_impl.h

diff --git a/nestkernel/event_delivery_manager.cpp b/nestkernel/event_delivery_manager.cpp
@@ -603,13 +603,7 @@ EventDeliveryManager::deliver_events_( const size_t tid, const std::vector< Spik
       {
         if ( spike_data.get_tid() == tid )
         {
-          const size_t syn_id = spike_data.get_syn_id();
-          const size_t lcid = spike_data.get_lcid();
-
-          // non-local sender -> receiver retrieves ID of sender Node from SourceTable based on tid, syn_id, lcid
-          // only if needed, as this is computationally costly
-          se.set_sender_node_id_info( tid, syn_id, lcid );
-          kernel().connection_manager.send( tid, syn_id, lcid, cm, se );
+          kernel().connection_manager.send( tid, spike_data.get_syn_id(), spike_data.get_lcid(), cm, se );
         }
       }
       else
@@ -624,12 +618,7 @@ EventDeliveryManager::deliver_events_( const size_t tid, const std::vector< Spik
         {
           if ( it->get_tid() == tid )
           {
-            const size_t lcid = it->get_lcid();
-
-            // non-local sender -> receiver retrieves ID of sender Node from SourceTable based on tid, syn_id, lcid
-            // only if needed, as this is computationally costly
-            se.set_sender_node_id_info( tid, syn_id, lcid );
-            kernel().connection_manager.send( tid, syn_id, lcid, cm, se );
+            kernel().connection_manager.send( tid, syn_id, it->get_lcid(), cm, se );
           }
         }
       }