made revisions to components/clean-up; added back in deprecators

Author: Alexander Ororbia

ngclearn/components/__init__.py

@@ -55,9 +55,6 @@
 from .synapses.modulated.MSTDPETSynapse import MSTDPETSynapse
 from .synapses.modulated.REINFORCESynapse import REINFORCESynapse
 
-## point to monitors
-from .monitor import Monitor
-
 ## point to patched component types
 from .synapses.patched.patchedSynapse import PatchedSynapse
 from .synapses.patched.staticPatchedSynapse import StaticPatchedSynapse

ngclearn/components/input_encoders/latencyCell.py

@@ -143,7 +143,6 @@ class LatencyCell(JaxComponent):
         batch_size: batch size dimension of this cell (Default: 1)
     """
 
-    # Define Functions
     def __init__(
         self, name: str, n_units: int, tau: float = 1., threshold: float = 0.01,
         first_spike_time: float = 0., linearize: bool = False,
@@ -261,4 +260,4 @@ def help(cls): ## component help function
         X = LatencyCell("X", 9)
     print(X)
     print(X.calc_spike_times.compiled.code)
-    print(X.advance_state.compiled.code)
+    print(X.advance_state.compiled.code)

ngclearn/components/input_encoders/phasorCell.py

@@ -31,7 +31,6 @@ class PhasorCell(JaxComponent):
         batch_size: batch size dimension of this cell (Default: 1)
     """
 
-    # Define Functions
     def __init__(
             self, name, n_units, target_freq=63.75, batch_size=1, disable_phasor=False, **kwargs):
         super().__init__(name, **kwargs)

ngclearn/components/jaxComponent.py

@@ -70,4 +70,5 @@ def __repr__(self):
             else:
                 line = "None"
             lines += f"  {f'({c})'.ljust(maxlen)}{line}\n"
-        return lines
+        return lines
+

ngclearn/components/neurons/graded/laplacianErrorCell.py

@@ -37,7 +37,6 @@ class LaplacianErrorCell(JaxComponent): ## Rate-coded/real-valued error unit/cel
             to a constant/fixed `scale`
     """
 
-    # Define Functions
     def __init__(self, name, n_units, batch_size=1, scale=1., shape=None, **kwargs):
         super().__init__(name, **kwargs)
 

ngclearn/components/neurons/graded/rateCell.py

@@ -160,7 +160,6 @@ class RateCell(JaxComponent): ## Rate-coded/real-valued cell
         resist_scale: a scaling factor applied to incoming pressure `j` (default: 1)
     """
 
-    # Define Functions
     def __init__(
             self, name, n_units, tau_m, prior=("gaussian", 0.), act_fx="identity", output_scale=1., threshold=("none", 0.),
             integration_type="euler", batch_size=1, resist_scale=1., shape=None, is_stateful=True, **kwargs):

ngclearn/components/neurons/spiking/IFCell.py

@@ -86,7 +86,7 @@ class IFCell(JaxComponent): ## integrate-and-fire cell
             the value of `v_rest` (default: True)
     """
 
-    #@deprecate_args(thr_jitter=None)
+    @deprecate_args(thr_jitter=None)
     def __init__(
             self, name, n_units, tau_m, resist_m=1., thr=-52., v_rest=-65., v_reset=-60., refract_time=0.,
             integration_type="euler", surrogate_type="straight_through", lower_clamp_voltage=True, **kwargs

ngclearn/components/neurons/spiking/RAFCell.py

@@ -97,7 +97,7 @@ class RAFCell(JaxComponent):
                 at an increase in computational cost (and simulation time)
     """
 
-    #@deprecate_args(resist_m="resist_v", tau_m="tau_v", b="dampen_factor")
+    @deprecate_args(resist_m="resist_v", tau_m="tau_v", b="dampen_factor")
     def __init__(
             self, name, n_units, tau_v=1., tau_w=1., thr=1., omega=10., dampen_factor=-1., v_reset=0., w_reset=0.,
             v0=0., w0=0., resist_v=1., integration_type="euler", batch_size=1, **kwargs

ngclearn/components/neurons/spiking/WTASCell.py

@@ -50,7 +50,7 @@ class WTASCell(JaxComponent): ## winner-take-all spiking cell
         thr_jitter: scale of uniform jitter to add to initialization of thresholds
     """
 
-    #@deprecate_args(thr_base="thrBase")
+    @deprecate_args(thrBase="thr_base")
     def __init__(
             self, name, n_units, tau_m, resist_m=1., thr_base=0.4, thr_gain=0.002, refract_time=0., thr_jitter=0.05,
             **kwargs

ngclearn/components/neurons/spiking/adExCell.py

@@ -94,7 +94,7 @@ class AdExCell(JaxComponent): ## adaptive exponential integrate-and-fire cell
                 at an increase in computational cost (and simulation time)
     """
 
-    #@deprecate_args(v_thr="thr")
+    @deprecate_args(v_thr="thr")
     def __init__(
             self, name, n_units, tau_m=15., resist_m=1., tau_w=400., v_sharpness=2., intrinsic_mem_thr=-55., thr=5.,
             v_rest=-72., v_reset=-75., a=0.1, b=0.75, v0=-70., w0=0., integration_type="euler", batch_size=1, **kwargs