Skip to content

Batched prev spike time #565

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

Merged
neworderofjamie merged 3 commits into from
Feb 13, 2023
Merged

Batched prev spike time #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db659df
fixed bug where numNeurons wasn't included
neworderofjamie Feb 6, 2023
45ada30
speculative fix
neworderofjamie Feb 6, 2023
1063c0a
updated batch_prev_pre_spike_time_in_sim test to cover non-delayed
neworderofjamie Feb 6, 2023
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
22 changes: 14 additions & 8 deletions src/genn/genn/code_generator/backendSIMT.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,23 +368,29 @@ void BackendSIMT::genNeuronPrevSpikeTimeUpdateKernel(CodeStream &os, const Subst
os << "if(" << popSubs["id"] << " < group->spkCnt[" << ((batchSize == 1) ? "0" : "batch") << "])";
{
CodeStream::Scope b(os);
os << "group->prevST[group->spk[";
if(batchSize > 1) {
os << "batchOffset + ";
os << "group->prevST[";
if (batchSize == 1) {
os << "group->spk[" << popSubs["id"] << "]";
}
os << popSubs["id"] << "]] = " << popSubs["t"] << " - DT;" << std::endl;
else {
os << "batchOffset + group->spk[batchOffset + " << popSubs["id"] << "]";
}
os << "] = " << popSubs["t"] << " - DT;" << std::endl;
}
}
if(ng.getArchetype().isPrevSpikeEventTimeRequired()) {
// If there is a spike-like-event for this thread, set previous spike-like-event time to time of last timestep
os << "if(" << popSubs["id"] << " < group->spkCntEvnt[" << ((batchSize == 1) ? "0" : "batch") << "])";
{
CodeStream::Scope b(os);
os << "group->prevSET[group->spkEvnt[";
if(batchSize > 1) {
os << "batchOffset + ";
os << "group->prevSET[";
if (batchSize == 1) {
os << "group->spkEvnt[" << popSubs["id"] << "]";
}
else {
os << "batchOffset + group->spkEvnt[batchOffset + " << popSubs["id"] << "]";
}
os << popSubs["id"] << "]] = " << popSubs["t"] << " - DT;" << std::endl;
os << "] = " << popSubs["t"] << " - DT;" << std::endl;
}
}
}
Expand Down
8 changes: 3 additions & 5 deletions src/genn/genn/code_generator/groupMerged.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ NeuronPrevSpikeTimeUpdateGroupMerged::NeuronPrevSpikeTimeUpdateGroupMerged(size_
const std::vector<std::reference_wrapper<const NeuronGroupInternal>> &groups)
: GroupMerged<NeuronGroupInternal>(index, precision, groups)
{
addField("unsigned int", "numNeurons",
[](const NeuronGroupInternal &ng, size_t) { return std::to_string(ng.getNumNeurons()); });

if(getArchetype().isDelayRequired()) {
addPointerField("unsigned int", "spkQuePtr", backend.getScalarAddressPrefix() + "spkQuePtr");
}
Expand All @@ -87,11 +90,6 @@ NeuronPrevSpikeTimeUpdateGroupMerged::NeuronPrevSpikeTimeUpdateGroupMerged(size_
addPointerField("unsigned int", "spkEvnt", backend.getDeviceVarPrefix() + "glbSpkEvnt");
addPointerField(timePrecision, "prevSET", backend.getDeviceVarPrefix() + "prevSET");
}

if(getArchetype().isDelayRequired()) {
addField("unsigned int", "numNeurons",
[](const NeuronGroupInternal &ng, size_t) { return std::to_string(ng.getNumNeurons()); });
}
}

//----------------------------------------------------------------------------
Expand Down
11 changes: 9 additions & 2 deletions tests/features/batch_prev_pre_spike_time_in_sim/model.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,20 @@ void modelDefinition(ModelSpec &model)
model.setBatchSize(2);

model.addNeuronPopulation<PreNeuron>("pre", 10, {}, {});
model.addNeuronPopulation<PreNeuron>("preDelay", 10, {}, {});
model.addNeuronPopulation<PostNeuron>("post", 10, {}, {});
model.addNeuronPopulation<PostNeuron>("postDelay", 10, {}, {});

model.addSynapsePopulation<WeightUpdateModel, PostsynapticModels::DeltaCurr>(
"syn", SynapseMatrixType::SPARSE_INDIVIDUALG, 20, "pre", "post",
"syn", SynapseMatrixType::SPARSE_INDIVIDUALG, NO_DELAY, "pre", "post",
{}, WeightUpdateModel::VarValues(-std::numeric_limits<float>::max()),
{}, {},
initConnectivity<InitSparseConnectivitySnippet::OneToOne>({}));

model.addSynapsePopulation<WeightUpdateModel, PostsynapticModels::DeltaCurr>(
"synDelay", SynapseMatrixType::SPARSE_INDIVIDUALG, 20, "preDelay", "postDelay",
{}, WeightUpdateModel::VarValues(-std::numeric_limits<float>::max()),
{}, {},
initConnectivity<InitSparseConnectivitySnippet::OneToOne>({}));

model.setPrecision(GENN_FLOAT);
}
11 changes: 9 additions & 2 deletions tests/features/batch_prev_pre_spike_time_in_sim/test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,16 @@ class SimTest : public SimulationTest
// 2) PREVIOUS spike occurred (-)20 timesteps before
// 3) t is incremented one timestep at the end of StepGeNN
const float delayedLastSpikeTime = (scalar)i + 1.0f + (20.0f * std::floor((t - 22.0f - (scalar)i) / 20.0f));
// If, theoretically, spike would have arrived before delay it's impossible so time should be a very large negative number

// Check wsyn read from delayed population
if(delayedLastSpikeTime < 21.0f) {
ASSERT_LT(wsynDelay[i], -1.0E6);
}
else {
ASSERT_FLOAT_EQ(wsynDelay[i], delayedLastSpikeTime);
}
// Check wsyn read from non-delayed population
if(delayedLastSpikeTime < 1.0f) {
ASSERT_LT(wsyn[i], -1.0E6);
}
else {
Expand Down