STDP case for busyring benchmark

arbor/version.cpp

@@ -1,5 +1,6 @@
 #include <arbor/version.hpp>
 #include <arbor/export.hpp>
+#include <string>
 
 namespace arb {
 ARB_ARBOR_API const char* source_id = ARB_SOURCE_ID;

example/busyring/complex-n=1024-stdp=off-depth=0.json

@@ -0,0 +1,28 @@
+{
+    "name": "without-stdp",
+    "num-cells": 1024,
+    "synapses": 1001,
+    "min-delay": 5,
+    "duration": 200,
+    "ring-size": 4,
+    "event-weight": 0.2,
+    "record": false,
+    "spikes": false,
+    "dt": 0.025,
+    "depth": 0,
+    "complex": true,
+    "stdp": false,
+    "branch-probs": [
+        1,
+        0.5
+    ],
+    "compartments": [
+        20,
+        2
+    ],
+    "lengths": [
+        200,
+        20
+    ],
+    "cpu-group-size": 1
+}

example/busyring/complex-n=1024-stdp=off-depth=10.json

@@ -0,0 +1,28 @@
+{
+    "name": "without-stdp",
+    "num-cells": 1024,
+    "synapses": 1001,
+    "min-delay": 5,
+    "duration": 200,
+    "ring-size": 4,
+    "event-weight": 0.2,
+    "record": false,
+    "spikes": false,
+    "dt": 0.025,
+    "depth": 10,
+    "complex": true,
+    "stdp": false,
+    "branch-probs": [
+        1,
+        0.5
+    ],
+    "compartments": [
+        20,
+        2
+    ],
+    "lengths": [
+        200,
+        20
+    ],
+    "cpu-group-size": 1
+}

example/busyring/complex-n=1024-stdp=off-depth=2.json

@@ -0,0 +1,28 @@
+{
+    "name": "without-stdp",
+    "num-cells": 1024,
+    "synapses": 1001,
+    "min-delay": 5,
+    "duration": 200,
+    "ring-size": 4,
+    "event-weight": 0.2,
+    "record": false,
+    "spikes": false,
+    "dt": 0.025,
+    "depth": 2,
+    "complex": true,
+    "stdp": false,
+    "branch-probs": [
+        1,
+        0.5
+    ],
+    "compartments": [
+        20,
+        2
+    ],
+    "lengths": [
+        200,
+        20
+    ],
+    "cpu-group-size": 1
+}

example/busyring/complex-n=1024-stdp=on-depth=0.json

@@ -0,0 +1,28 @@
+{
+    "name": "with-stdp",
+    "num-cells": 1024,
+    "synapses": 1001,
+    "min-delay": 5,
+    "duration": 200,
+    "ring-size": 4,
+    "event-weight": 0.2,
+    "record": false,
+    "spikes": false,
+    "dt": 0.025,
+    "depth": 0,
+    "complex": true,
+    "stdp": true,
+    "branch-probs": [
+        1,
+        0.5
+    ],
+    "compartments": [
+        20,
+        2
+    ],
+    "lengths": [
+        200,
+        20
+    ],
+    "cpu-group-size": 1
+}

example/busyring/complex-n=1024-stdp=on-depth=10.json

@@ -0,0 +1,28 @@
+{
+    "name": "with-stdp",
+    "num-cells": 1024,
+    "synapses": 1001,
+    "min-delay": 5,
+    "duration": 200,
+    "ring-size": 4,
+    "event-weight": 0.2,
+    "record": false,
+    "spikes": false,
+    "dt": 0.025,
+    "depth": 10,
+    "complex": true,
+    "stdp": true,
+    "branch-probs": [
+        1,
+        0.5
+    ],
+    "compartments": [
+        20,
+        2
+    ],
+    "lengths": [
+        200,
+        20
+    ],
+    "cpu-group-size": 1
+}

example/busyring/complex-n=1024-stdp=on-depth=2.json

@@ -0,0 +1,28 @@
+{
+    "name": "with-stdp",
+    "num-cells": 1024,
+    "synapses": 1001,
+    "min-delay": 5,
+    "duration": 200,
+    "ring-size": 4,
+    "event-weight": 0.2,
+    "record": false,
+    "spikes": false,
+    "dt": 0.025,
+    "depth": 2,
+    "complex": true,
+    "stdp": true,
+    "branch-probs": [
+        1,
+        0.5
+    ],
+    "compartments": [
+        20,
+        2
+    ],
+    "lengths": [
+        200,
+        20
+    ],
+    "cpu-group-size": 1
+}

example/busyring/parameters.hpp

@@ -12,7 +12,8 @@ struct cell_parameters {
 
     // Use complex cell or generic cell
     bool complex_cell = false;
-
+    // Use STDP synapse
+    bool stdp = false;
     //  Maximum number of levels in the cell (not including the soma)
     unsigned max_depth = 5;
 
@@ -23,7 +24,7 @@ struct cell_parameters {
     std::array<unsigned,2> compartments = {20, 2};  //  Compartment count on a branch.
     std::array<double,2> lengths = {200, 20};       //  Length of branch in μm.
 
-    // The number of synapses per cell.
+    // The number of additional, random synapses per cell.
     unsigned synapses = 1;
 };
 
@@ -56,6 +57,7 @@ read_options(int argc, char** argv) {
 
     ring_params params;
     if (argc<2) {
+        std::cerr << "Using defaults\n";
         return params;
     }
     if (argc>3) {
@@ -89,6 +91,7 @@ read_options(int argc, char** argv) {
     param_from_json(params.cell.compartments, "compartments", json);
     param_from_json(params.cell.lengths, "lengths", json);
     param_from_json(params.cell.synapses, "synapses", json);
+    param_from_json(params.cell.stdp, "stdp", json);
     param_from_json(params.bind_threads, "bind-threads", json);
     param_from_json(params.hint.cpu_group_size, "cpu-group-size", json);
     param_from_json(params.hint.gpu_group_size, "gpu-group-size", json);