deep_fsa working as before -- decay state was nuking spike bin values

emer · Dec 1, 2024 · 143998b · 143998b
1 parent f57a940
commit 143998b
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 37 deletions.
diff --git a/axon/act-layer.go b/axon/act-layer.go
diff --git a/axon/act-layer.goal b/axon/act-layer.goal
@@ -931,6 +931,9 @@ func (ly *LayerParams) NewStateNeuron(ctx *Context, ni, di uint32) {
 	ly.Acts.DecayState(ctx, ni, di, ly.Acts.Decay.Act, ly.Acts.Decay.Glong, ly.Acts.Decay.AHP)
 	// Note: synapse-level Ca decay happens in DWt
 	ly.Acts.KNaNewState(ctx, ni, di)
+	for i := range 8 {
+		Neurons[ni, di, SpkBin0+NeuronVars(i)] = 0.0
+	}
 }
 
 // Beta1Neuron does neuron level Beta1 updating.

diff --git a/axon/act.go b/axon/act.go
diff --git a/axon/act.goal b/axon/act.goal
@@ -892,9 +892,6 @@ func (ac *ActParams) DecayState(ctx *Context, ni, di uint32, decay, glong, ahp f
 	Neurons[ni, di, ISIAvg] = -1.0
 	Neurons[ni, di, ActInt] = ac.Init.Act
 	Neurons[ni, di, Spiked] = 0.0
-	for i := range 8 {
-		Neurons[ni, di, SpkBin0+NeuronVars(i)] = 0.0
-	}
 
 	if decay > 0 { // no-op for most, but not all..
 		Neurons[ni, di, Spike] = 0.0

diff --git a/axon/looper.go b/axon/looper.go
@@ -175,6 +175,9 @@ func (vu *NetViewUpdate) GoUpdate(counters string) {
 	if !vu.ShouldUpdate() {
 		return
 	}
+	if vu.IsCycleUpdating() && vu.View.Options.Raster.On { // no update for raster
+		return
+	}
 	vu.View.Record(counters, -1) // -1 = default incrementing raster
 	vu.View.GoUpdateView()
 }
@@ -274,23 +277,3 @@ func (vu *NetViewUpdate) RecordSyns() {
 	}
 	vu.View.RecordSyns()
 }
-
-// // LooperUpdatePlots adds plot update calls at each time level
-// func LooperUpdatePlots(ls *looper.Stacks, gui *egui.GUI) {
-// 	for _, st := range ls.Stacks {
-// 		for t, loop := range st.Loops {
-// 			curTime := t
-// 			if curTime == etime.Cycle {
-// 				loop.OnEnd.Add("GUI:UpdatePlot", func() {
-// 					cyc := loop.Counter.Cur
-// 					_ = cyc
-// 					// gui.GoUpdateCyclePlot(m, cyc) // todo:
-// 				})
-// 			} else {
-// 				loop.OnEnd.Add("GUI:UpdatePlot", func() {
-// 					// gui.GoUpdatePlot(m, curTime) // todo:
-// 				})
-// 			}
-// 		}
-// 	}
-// }
diff --git a/axon/shaders/MinusPhasePost.wgsl b/axon/shaders/MinusPhasePost.wgsl
@@ -295,9 +295,6 @@ fn ActParams_DecayState(ac: ptr<function,ActParams>, ctx: ptr<function,Context>,
 	Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(ISIAvg))] = -1.0;
 	Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(ActInt))] = (*ac).Init.Act;
 	Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Spiked))] = 0.0;
-	for (var i=0; i<8; i++) {
-		Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(SpkBin0 + NeuronVars(i)))] = 0.0;
-	}
 	if (decay > 0) { // no-op for most, but not all..
 		Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Spike))] = 0.0;
 		Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Act))] -= decay * (Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Act))] - (*ac).Init.Act);

diff --git a/axon/shaders/NewStateNeuron.wgsl b/axon/shaders/NewStateNeuron.wgsl
@@ -88,6 +88,9 @@ fn LayerParams_NewStateNeuron(ly: ptr<function,LayerParams>, ctx: ptr<function,C
 	Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(SpkMaxCa))] = 0.0;
 	ActParams_DecayState(&(*ly).Acts, ctx, ni, di, (*ly).Acts.Decay.Act, (*ly).Acts.Decay.Glong, (*ly).Acts.Decay.AHP);
 	ActParams_KNaNewState(&(*ly).Acts, ctx, ni, di);
+	for (var i=0; i<8; i++) {
+		Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(SpkBin0 + NeuronVars(i)))] = 0.0;
+	}
 }
 
 ///////////// import: "act-net.go"
@@ -276,9 +279,6 @@ fn ActParams_DecayState(ac: ptr<function,ActParams>, ctx: ptr<function,Context>,
 	Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(ISIAvg))] = -1.0;
 	Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(ActInt))] = (*ac).Init.Act;
 	Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Spiked))] = 0.0;
-	for (var i=0; i<8; i++) {
-		Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(SpkBin0 + NeuronVars(i)))] = 0.0;
-	}
 	if (decay > 0) { // no-op for most, but not all..
 		Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Spike))] = 0.0;
 		Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Act))] -= decay * (Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Act))] - (*ac).Init.Act);

diff --git a/axon/shaders/PlusPhasePost.wgsl b/axon/shaders/PlusPhasePost.wgsl
@@ -343,9 +343,6 @@ fn ActParams_DecayState(ac: ptr<function,ActParams>, ctx: ptr<function,Context>,
 	Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(ISIAvg))] = -1.0;
 	Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(ActInt))] = (*ac).Init.Act;
 	Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Spiked))] = 0.0;
-	for (var i=0; i<8; i++) {
-		Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(SpkBin0 + NeuronVars(i)))] = 0.0;
-	}
 	if (decay > 0) { // no-op for most, but not all..
 		Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Spike))] = 0.0;
 		Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Act))] -= decay * (Neurons[IndexF323D(Neurons[0], Neurons[1], Neurons[2], u32(ni),u32(di),u32(Act))] - (*ac).Init.Act);

diff --git a/examples/deep_fsa/typegen.go b/examples/deep_fsa/typegen.go
diff --git a/examples/ra25/typegen.go b/examples/ra25/typegen.go