dwt building

emer · Nov 2, 2024 · a7a3dc6 · a7a3dc6
1 parent c80c92b
commit a7a3dc6
Show file tree

Hide file tree

Showing 12 changed files with 347 additions and 420 deletions.
diff --git a/axon/gpu_wgsl/gpu_dwt.wgsl → axon/gpu_wgsl/done/gpu_dwt.wgsl b/axon/gpu_wgsl/gpu_dwt.wgsl → axon/gpu_wgsl/done/gpu_dwt.wgsl
diff --git a/axon/gpu_wgsl/gpu_dwtfmdi.wgsl → axon/gpu_wgsl/done/gpu_dwtfmdi.wgsl b/axon/gpu_wgsl/gpu_dwtfmdi.wgsl → axon/gpu_wgsl/done/gpu_dwtfmdi.wgsl
diff --git a/axon/layer-cpu.go b/axon/layer-cpu.go
diff --git a/axon/layer-cpu.goal b/axon/layer-cpu.goal
@@ -350,38 +350,6 @@ func (ly *Layer) PhaseDiffFromActs(ctx *Context) {
 //////////////////////////////////////////////////////////////////////////////////////
 //  Learning
 
-// DWt computes the weight change (learning), based on
-// synaptically integrated spiking, computed at the Theta cycle interval.
-// This is the trace version for hidden units, and uses syn CaP - CaD for targets.
-func (ly *Layer) DWt(ctx *Context, si uint32) {
-	for _, pj := range ly.SendPaths {
-		if pj.Off {
-			continue
-		}
-		pj.DWt(ctx, si)
-	}
-}
-
-// DWtSubMean computes subtractive normalization of the DWts
-func (ly *Layer) DWtSubMean(ctx *Context, ri uint32) {
-	for _, pj := range ly.RecvPaths {
-		if pj.Off {
-			continue
-		}
-		pj.DWtSubMean(ctx, ri)
-	}
-}
-
-// WtFromDWt updates weight values from delta weight changes
-func (ly *Layer) WtFromDWt(ctx *Context, si uint32) {
-	for _, pj := range ly.SendPaths {
-		if pj.Off {
-			continue
-		}
-		pj.WtFromDWt(ctx, si)
-	}
-}
-
 // DTrgSubMean subtracts the mean from DTrgAvg values
 // Called by TrgAvgFromD
 func (ly *Layer) DTrgSubMean(ctx *Context) {

diff --git a/axon/learn.go b/axon/learn.go
diff --git a/axon/learn.goal b/axon/learn.goal
@@ -673,8 +673,7 @@ func (tp *TraceParams) Update() {
 // TrFromCa returns updated trace factor as function of a
 // synaptic calcium update factor and current trace
 func (tp *TraceParams) TrFromCa(tr float32, ca float32) float32 {
-	tr += tp.Dt * (ca - tr)
-	return tr
+	return tr + tp.Dt*(ca-tr)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////