cleanup of components, added leaky-noise-cell, minor edits

Author: Alexander Ororbia

ngclearn/__init__.py

@@ -32,6 +32,7 @@
 from ngcsimlib.context import Context, ContextObjectTypes
 from ngcsimlib import Component
 from ngcsimlib.compartment import Compartment
+from ngcsimlib.parser import compilable
 
 from ngcsimlib import logger
 

ngclearn/components/__init__.py

@@ -2,6 +2,7 @@
 
 ## point to rate-coded cell component types
 from .neurons.graded.rateCell import RateCell
+from .neurons.graded.leakyNoiseCell import LeakyNoiseCell
 from .neurons.graded.gaussianErrorCell import GaussianErrorCell
 from .neurons.graded.laplacianErrorCell import LaplacianErrorCell
 from .neurons.graded.bernoulliErrorCell import BernoulliErrorCell

ngclearn/components/input_encoders/bernoulliCell.py

@@ -1,7 +1,7 @@
 from ngclearn.components.jaxComponent import JaxComponent
 from jax import numpy as jnp, random
-from ngcsimlib.compartment import Compartment
-from ngcsimlib.parser import compilable
+from ngclearn import compilable #from ngcsimlib.parser import compilable
+from ngclearn import Compartment #from ngcsimlib.compartment import Compartment
 import jax
 from typing import Union
 

ngclearn/components/input_encoders/latencyCell.py

@@ -6,8 +6,8 @@
 
 from ngclearn.utils.model_utils import clamp_min, clamp_max
 
-from ngcsimlib.compartment import Compartment
-from ngcsimlib.parser import compilable
+from ngclearn import compilable #from ngcsimlib.parser import compilable
+from ngclearn import Compartment #from ngcsimlib.compartment import Compartment
 
 @partial(jit, static_argnums=[5])
 def _calc_spike_times_linear(data, tau, thr, first_spk_t, num_steps=1.,

ngclearn/components/input_encoders/phasorCell.py

@@ -4,8 +4,8 @@
 from typing import Union
 
 from ngcsimlib.logger import info, warn
-from ngcsimlib.compartment import Compartment
-from ngcsimlib.parser import compilable
+from ngclearn import compilable #from ngcsimlib.parser import compilable
+from ngclearn import Compartment #from ngcsimlib.compartment import Compartment
 
 class PhasorCell(JaxComponent):
     """

ngclearn/components/input_encoders/poissonCell.py

@@ -4,8 +4,8 @@
 from typing import Union
 
 from ngcsimlib import deprecate_args
-from ngcsimlib.parser import compilable
-from ngcsimlib.compartment import Compartment
+from ngclearn import compilable #from ngcsimlib.parser import compilable
+from ngclearn import Compartment #from ngcsimlib.compartment import Compartment
 
 class PoissonCell(JaxComponent):
     """

ngclearn/components/neurons/__init__.py

@@ -1,5 +1,6 @@
 ## point to rate-coded cell componet types
 from .graded.rateCell import RateCell
+from .graded.leakyNoiseCell import LeakyNoiseCell
 from .graded.gaussianErrorCell import GaussianErrorCell
 from .graded.laplacianErrorCell import LaplacianErrorCell
 from .graded.bernoulliErrorCell import BernoulliErrorCell

ngclearn/components/neurons/graded/__init__.py

@@ -1,5 +1,6 @@
-## point to rate-coded cell componet types
+## point to rate-coded cell component types
 from .rateCell import RateCell
+from .leakyNoiseCell import LeakyNoiseCell
 from .gaussianErrorCell import GaussianErrorCell
 from .laplacianErrorCell import LaplacianErrorCell
 from .bernoulliErrorCell import BernoulliErrorCell

ngclearn/components/neurons/graded/bernoulliErrorCell.py

@@ -2,12 +2,10 @@
 
 from ngclearn.components.jaxComponent import JaxComponent
 from jax import numpy as jnp, jit
-from ngclearn.utils import tensorstats
 from ngclearn.utils.model_utils import sigmoid, d_sigmoid
 
-from ngcsimlib.logger import info
-from ngcsimlib.compartment import Compartment
-from ngcsimlib.parser import compilable
+from ngclearn import compilable #from ngcsimlib.parser import compilable
+from ngclearn import Compartment #from ngcsimlib.compartment import Compartment
 
 class BernoulliErrorCell(JaxComponent): ## Rate-coded/real-valued error unit/cell
     """

ngclearn/components/neurons/graded/gaussianErrorCell.py

@@ -2,11 +2,8 @@
 
 from ngclearn.components.jaxComponent import JaxComponent
 from jax import numpy as jnp, jit
-from ngclearn.utils import tensorstats
-
-from ngcsimlib.logger import info
-from ngcsimlib.compartment import Compartment
-from ngcsimlib.parser import compilable
+from ngclearn import compilable #from ngcsimlib.parser import compilable
+from ngclearn import Compartment #from ngcsimlib.compartment import Compartment
 
 class GaussianErrorCell(JaxComponent): ## Rate-coded/real-valued error unit/cell
     """