Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix volume_transmitter naming after upstream change #935

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Fix volume_transmitter naming after upstream change #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions doc/tutorials/stdp_dopa_synapse/stdp_dopa_synapse.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@
" nest.Connect(vt_parrot, vt, syn_spec={\"synapse_model\": \"static_synapse\",\n",
" \"weight\": 1.,\n",
" \"delay\": 1.}) # delay is ignored!\n",
" vt_gid = vt.get(\"global_id\")\n",
"\n",
" # set up custom synapse models\n",
" wr = nest.Create('weight_recorder')\n",
Expand All @@ -302,7 +301,7 @@
" \"w\": 1.,\n",
" \"delay\": delay,\n",
" \"receptor_type\": 0,\n",
" \"vt\": vt_gid,\n",
" \"volume_transmitter\": vt,\n",
" \"tau_tr_pre\": 10.,\n",
" })\n",
"\n",
Expand Down Expand Up @@ -595,8 +594,6 @@
" \"weight\": 1.,\n",
" \"delay\": 1.})\n",
"\n",
"vt_gid = vt.get(\"global_id\")\n",
"\n",
"# multimeters\n",
"mms = [nest.Create(\"multimeter\", params= {\"record_from\": [\"V_m\"]}) for _ in range(n_neurons)]\n",
"\n",
Expand All @@ -607,7 +604,7 @@
" \"w\": initial_weight,\n",
" \"d\": delay,\n",
" \"receptor_type\": 0,\n",
" \"vt\": vt_gid,\n",
" \"volume_transmitter\": vt,\n",
" \"tau_n\": tau_n,\n",
" \"tau_c\": tau_c,\n",
" })\n",
Expand Down Expand Up @@ -1141,13 +1138,11 @@
"nest.Connect(vt_parrot, vt, syn_spec={\"synapse_model\": \"static_synapse\",\n",
" \"weight\": 1.,\n",
" \"delay\": 1.}) # delay is ignored\n",
"vt_gid = vt.get(\"global_id\")\n",
"\n",
"# set up custom synapse models\n",
"wr = nest.Create(\"weight_recorder\")\n",
"nest.CopyModel(synapse_model_name, \"excitatory\",\n",
" {\"weight_recorder\": wr, \"w\": J_ex, \"d\": delay, \"receptor_type\": 0,\n",
" \"vt\": vt_gid, \"A_plus\": learning_rate * 1., \"A_minus\": learning_rate * 1.5,\n",
" \"volume_transmitter\": vt, \"A_plus\": learning_rate * 1., \"A_minus\": learning_rate * 1.5,\n",
" \"tau_n\": tau_n,\n",
" \"tau_c\": tau_c})\n",
"\n",
Expand Down
8 changes: 4 additions & 4 deletions pynestml/codegeneration/resources_nest/point_neuron/common/SynapseHeader.h.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,18 @@ public:
{%- endfilter %}

{%- if vt_ports is defined and vt_ports|length > 0 %}
long vtnode_id;
if ( updateValue< long >( d, names::vt, vtnode_id ) )
NodeCollectionDatum vt_datum;
if ( updateValue< NodeCollectionDatum >( d, names::volume_transmitter, vt_datum ) )
{
{%- if not (nest_version.startswith("v2") or nest_version.startswith("v3.0") or nest_version.startswith("v3.1") or nest_version.startswith("v3.2") or nest_version.startswith("v3.3") or nest_version.startswith("v3.4")) %}
const size_t tid = kernel().vp_manager.get_thread_id();
{%- else %}
const thread tid = kernel().vp_manager.get_thread_id();
{%- endif %}
{%- if nest_version.startswith("v2") %}
Node* vt = kernel().node_manager.get_node( vtnode_id, tid );
Node* vt = kernel().node_manager.get_node( ( *vt_datum )[ 0 ], tid );
{%- else %}
Node* vt = kernel().node_manager.get_node_or_proxy( vtnode_id, tid );
Node* vt = kernel().node_manager.get_node_or_proxy( ( *vt_datum )[ 0 ], tid );
{%- endif %}
vt_ = dynamic_cast< volume_transmitter* >( vt );
if ( vt_ == nullptr )
Expand Down
5 changes: 2 additions & 3 deletions tests/nest_tests/stdp_neuromod_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,16 @@ def run_synapse_test(self, neuron_model_name,
nest.Connect(vt_parrot, vt, syn_spec={"synapse_model": "static_synapse",
"weight": 1.,
"delay": 1.}) # delay is ignored?!
vt_gid = vt.get("global_id")

# set up custom synapse models
wr = nest.Create("weight_recorder")
wr_ref = nest.Create('weight_recorder')
nest.CopyModel(synapse_model_name, "stdp_nestml_rec",
{"weight_recorder": wr[0], "w": 1., "d": delay, "receptor_type": 0,
"vt": vt_gid})
"volume_transmitter": vt})
nest.CopyModel(ref_synapse_model_name, "stdp_ref_rec",
{"weight_recorder": wr_ref[0], "weight": 1., "delay": delay, "receptor_type": 0,
"vt": vt_gid})
"volume_transmitter": vt})

# create parrot neurons and connect spike_generators
if sim_mdl:
Expand Down
Loading