Merge branch 'major_release_update' of github.com:NACLab/ngc-learn into major_release_update

Author: rxng8

ngclearn/components/synapses/modulated/MSTDPETSynapse.py

@@ -94,19 +94,28 @@ def __init__(
     def evolve(
             dt, w_bound, w_eps, preTrace_target, mu, Aplus, Aminus, tau_elg, elg_decay, preSpike, postSpike, preTrace,
             postTrace, weights, dWeights, eta, modulator, eligibility
-    ):        
+    ):  
+        '''
+        dW_dt = TraceSTDPSynapse._compute_update( ## use Hebbian/STDP rule to obtain a non-modulated update
+            dt, w_bound, preTrace_target, mu, Aplus, Aminus, preSpike, postSpike, preTrace, postTrace, weights
+        )
+        dWeights = dW_dt ## can think of this as eligibility at time t
+        '''
+
         if tau_elg > 0.: ## perform dynamics of M-STDP-ET
             eligibility = eligibility * jnp.exp(-dt / tau_elg) * elg_decay + dWeights/tau_elg
         else: ## otherwise, just do M-STDP
             eligibility = dWeights ## dynamics of M-STDP had no eligibility tracing
         ## do a gradient ascent update/shift
         weights = weights + eligibility * modulator * eta  ## do modulated update
+        #'''
         dW_dt = TraceSTDPSynapse._compute_update( ## use Hebbian/STDP rule to obtain a non-modulated update
             dt, w_bound, preTrace_target, mu, Aplus, Aminus, preSpike, postSpike, preTrace, postTrace, weights
         )
         dWeights = dW_dt ## can think of this as eligibility at time t
-
-        #w_eps = 0. # 0.01
+        #'''
+    
+        #w_eps = 0.01
         weights = jnp.clip(weights, w_eps, w_bound - w_eps)  # jnp.abs(w_bound))
 
         return weights, dWeights, eligibility

tests/components/synapses/modulated/test_MSTDPETSynapse.py

@@ -83,4 +83,4 @@ def test_MSTDPETSynapse1():
     #print(a.weights.value)
     assert_array_equal(a.weights.value, jnp.array([[0.75]]))
 
-test_MSTDPETSynapse1()
+#test_MSTDPETSynapse1()