renormalize CaP vs. CaD factors automatically, update docs, keep CaPS…

…cale at 0.95 so results will be a bit diff -- renorm factor was 0.98 for CaBins=25, 0.96 for 10
emer · Jan 13, 2025 · b095ae1 · b095ae1
1 parent 5c0ad6f
commit b095ae1
Show file tree

Hide file tree

Showing 37 changed files with 65 additions and 61 deletions.
diff --git a/axon/learn-path.go b/axon/learn-path.go
diff --git a/axon/learn-path.goal b/axon/learn-path.goal
@@ -57,8 +57,8 @@ func (pt *PathParams) SynCa(ctx *Context, si, ri, di uint32, syCaP, syCaD *float
 		cp += sp * GlobalScalars[GvCaBinWts + GlobalScalarVars(i), 0]
 		cd += sp * GlobalScalars[cadSt + GlobalScalarVars(i), 0]
 	}
-	*syCaP = pt.Learn.DWt.CaPScale * pt.Learn.DWt.CaScale * cp
-	*syCaD = pt.Learn.DWt.CaScale * cd
+	*syCaP = pt.Learn.DWt.CaPScale * cp
+	*syCaD = cd
 }
 
 // DWtSynCortex computes the weight change (learning) at given synapse, using the

diff --git a/axon/learn.go b/axon/learn.go
diff --git a/axon/learn.goal b/axon/learn.goal
@@ -749,14 +749,13 @@ type DWtParams struct {
 	// there is temporal structure to be learned across these longer timescales.
 	Tau float32 `default:"1,2,4"`
 
-	// CaScale is a multiplier on the total synaptic calcium values, computed from products
-	// of the neuron-level [CaBins] values. If [Context.CaBinCycles] is lower than
-	// default of 25, then this value needs to be set higher, e.g., 2 for cycles = 10.
-	CaScale float32 `default:"1"`
-
 	// CaPScale is a separate multiplier for the CaP component of synaptic calcium, to
 	// allow separate weighting of potentiation (CaP) vs. depression (CaD) factors.
-	CaPScale float32 `default:"1"`
+	// An increased CaP level results in an overall potentiation bias, which acts
+	// like a hebbian learning factor. This can be bad for long-term synaptic stability
+	// and lead to the hog-unit problem, and the default of 0.95 is set to mitigate
+	// this hogging dynamic.
+	CaPScale float32 `default:"0.95,1"`
 
 	// SubMean is the amount of the mean [dWt] to subtract for updating the online
 	// learning [LWt] values, producing a zero-sum effect. 1.0 = full zero-sum dWt.
@@ -776,14 +775,13 @@ type DWtParams struct {
 	// Dt rate = 1 / tau
 	Dt float32 `display:"-" json:"-" xml:"-" edit:"-"`
 
-	pad float32
+	pad, pad1 float32
 }
 
 func (tp *DWtParams) Defaults() {
 	tp.Trace.SetBool(true)
 	tp.Tau = 1
-	tp.CaScale = 1
-	tp.CaPScale = 1
+	tp.CaPScale = 0.95
 	tp.SubMean = 0
 	tp.LearnThr = 0
 	tp.Update()

diff --git a/axon/shaders/ApplyExtsNeuron.wgsl b/axon/shaders/ApplyExtsNeuron.wgsl
@@ -822,12 +822,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/Beta1Neuron.wgsl b/axon/shaders/Beta1Neuron.wgsl
@@ -767,12 +767,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/Beta2Neuron.wgsl b/axon/shaders/Beta2Neuron.wgsl
@@ -767,12 +767,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/BetweenGi.wgsl b/axon/shaders/BetweenGi.wgsl
@@ -787,12 +787,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/CycleInc.wgsl b/axon/shaders/CycleInc.wgsl
@@ -763,12 +763,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/CycleNeuron.wgsl b/axon/shaders/CycleNeuron.wgsl
@@ -1669,12 +1669,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/CyclePost.wgsl b/axon/shaders/CyclePost.wgsl
@@ -905,12 +905,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/DWtFromDiSyn.wgsl b/axon/shaders/DWtFromDiSyn.wgsl
@@ -764,12 +764,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/DWtSubMeanNeuron.wgsl b/axon/shaders/DWtSubMeanNeuron.wgsl
@@ -799,12 +799,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/DWtSyn.wgsl b/axon/shaders/DWtSyn.wgsl
@@ -753,8 +753,8 @@ fn PathParams_SynCa(pt: PathParams, ctx: Context, si: u32,ri: u32,di: u32, syCaP
 		cp += sp * GlobalScalars[Index2D(TensorStrides[100], TensorStrides[101], u32(GvCaBinWts + GlobalScalarVars(i)), u32(0))];
 		cd += sp * GlobalScalars[Index2D(TensorStrides[100], TensorStrides[101], u32(cadSt + GlobalScalarVars(i)), u32(0))];
 	}
-	*syCaP = pt.Learn.DWt.CaPScale * pt.Learn.DWt.CaScale * cp;
-	*syCaD = pt.Learn.DWt.CaScale * cd;
+	*syCaP = pt.Learn.DWt.CaPScale * cp;
+	*syCaD = cd;
 }
 fn PathParams_DWtSynCortex(pt: PathParams, ctx: Context, syni: u32,si: u32,ri: u32,lpi: u32,pi: u32,di: u32, isTarget: bool) {
 	var syCaP: f32;
@@ -1066,12 +1066,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 fn DWtParams_TrFromCa(tp: DWtParams, tr: f32, ca: f32) -> f32 {
 	return tr + tp.Dt*(ca-tr);

diff --git a/axon/shaders/GPUTestWrite.wgsl b/axon/shaders/GPUTestWrite.wgsl
@@ -765,12 +765,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/GatherSpikes.wgsl b/axon/shaders/GatherSpikes.wgsl
@@ -868,12 +868,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/InitGBuffsPath.wgsl b/axon/shaders/InitGBuffsPath.wgsl
@@ -767,12 +767,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/LayerGi.wgsl b/axon/shaders/LayerGi.wgsl
@@ -860,12 +860,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/MinusPhaseNeuron.wgsl b/axon/shaders/MinusPhaseNeuron.wgsl
@@ -767,12 +767,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/MinusPhasePool.wgsl b/axon/shaders/MinusPhasePool.wgsl
@@ -785,12 +785,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/MinusPhasePost.wgsl b/axon/shaders/MinusPhasePost.wgsl
@@ -864,12 +864,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/NewStateLayer.wgsl b/axon/shaders/NewStateLayer.wgsl
@@ -816,12 +816,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/NewStateNeuron.wgsl b/axon/shaders/NewStateNeuron.wgsl
@@ -860,12 +860,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,

diff --git a/axon/shaders/PlusPhaseNeuron.wgsl b/axon/shaders/PlusPhaseNeuron.wgsl
@@ -865,12 +865,12 @@ struct LRateParams {
 struct DWtParams {
 	Trace: i32,
 	Tau: f32,
-	CaScale: f32,
 	CaPScale: f32,
 	SubMean: f32,
 	LearnThr: f32,
 	Dt: f32,
 	pad: f32,
+	pad1: f32,
 }
 struct HebbParams {
 	On: i32,