Renable evt_index

arbor/backends/event.hpp

@@ -52,15 +52,15 @@ struct has_event_index<deliverable_event> : public std::true_type {};
 // Subset of event information required for mechanism delivery.
 struct deliverable_event_data {
     // cell_local_size_type mech_id;    // same as target_handle::mech_id
-    // cell_local_size_type mech_index; // same as target_handle::mech_index
+    cell_local_size_type mech_index; // same as target_handle::mech_index
     float weight;
     deliverable_event_data(cell_local_size_type id, cell_local_size_type idx, float w):
         // mech_id(id),
-        // mech_index(idx),
+        mech_index(idx),
         weight(w) {}
     ARB_SERDES_ENABLE(deliverable_event_data,
                       // mech_id,
-                      // mech_index,
+                      mech_index,
                       weight);
 };
 

arbor/backends/gpu/event_stream.hpp

@@ -2,10 +2,7 @@
 
 // Indexed collection of pop-only event queues --- CUDA back-end implementation.
 
-#include "backends/event_stream_base.hpp"
-#include "memory/memory.hpp"
 #include "util/partition.hpp"
-#include "util/range.hpp"
 #include "util/rangeutil.hpp"
 #include "util/transform.hpp"
 #include "threading/threading.hpp"

test/unit/test_fvm_lowered.cpp

@@ -697,8 +697,6 @@ TEST(fvm_lowered, point_ionic_current) {
 
     // Only one target, corresponding to our point process on soma.
     double ica_nA = 12.3;
-    deliverable_event ev = {0.04, target_handle{0, 0}, (float)ica_nA};
-
     std::vector<pse_vector> events{{{0, 0.04, (float)ica_nA}}};
     auto lanes = util::subrange_view(events, 0, events.size());