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

Author: Alexander Ororbia

ngclearn/__init__.py

@@ -36,6 +36,7 @@
 from ngcsimlib.compartment import Compartment
 from ngcsimlib.resolver import resolver
 from ngcsimlib import utils as sim_utils
+from ngcsimlib.compilers.process import Process, transition
 
 
 from ngcsimlib import configure, preload_modules

ngclearn/components/base_monitor.py

@@ -1,10 +1,10 @@
 import json
 
-from ngclearn import Component, Compartment
+from ngclearn import Component, Compartment, transition
 from ngclearn import numpy as np
-#from ngcsimlib.utils import add_component_resolver, add_resolver_meta, \
 from ngcsimlib.utils import get_current_path
 from ngcsimlib.logger import warn, critical
+
 import matplotlib.pyplot as plt
 
 
@@ -44,9 +44,8 @@ class Base_Monitor(Component):
     """
     auto_resolve = False
 
-
     @staticmethod
-    def build_advance(compartments):
+    def _record_internal(compartments):
         """
         A method to build the method to advance the stored values.
 
@@ -61,8 +60,9 @@ def build_advance(compartments):
             "monitor found in ngclearn.components or "
             "ngclearn.components.lava (If using lava)")
 
+    @transition(None, True)
     @staticmethod
-    def build_reset(component):
+    def reset(component):
         """
         A method to build the method to reset the stored values.
         Args:
@@ -87,15 +87,16 @@ def _reset(**kwargs):
         # pure func, output compartments, args, params, input compartments
         return _reset, output_compartments, [], [], output_compartments
 
+    @transition(None, True)
     @staticmethod
-    def build_advance_state(component):
+    def record(component):
         output_compartments = []
         compartments = []
         for comp in component.compartments:
             output_compartments.append(comp.split("/")[-1] + "*store")
             compartments.append(comp.split("/")[-1])
 
-        _advance = component.build_advance(compartments)
+        _advance = component._record_internal(compartments)
 
         return _advance, output_compartments, [], [], compartments + output_compartments
 
@@ -124,8 +125,15 @@ def watch(self, compartment, window_length):
         """
         cs, end = self._add_path(compartment.path)
 
-        dtype = compartment.value.dtype
-        shape = compartment.value.shape
+        if hasattr(compartment.value, "dtype"):
+            dtype = compartment.value.dtype
+        else:
+            dtype = type(compartment.value)
+
+        if hasattr(compartment.value, "shape"):
+            shape = compartment.value.shape
+        else:
+            shape = (1,)
         new_comp = Compartment(np.zeros(shape, dtype=dtype))
         new_comp_store = Compartment(np.zeros((window_length, *shape), dtype=dtype))
 

ngclearn/components/monitor.py

@@ -1,16 +1,16 @@
 from ngclearn.components.base_monitor import Base_Monitor
+from ngclearn import transition
 
 class Monitor(Base_Monitor):
     """
     A jax implementation of `Base_Monitor`. Designed to be used with all
     non-lava ngclearn components
     """
-    auto_resolve = False
 
     @staticmethod
-    def build_advance(compartments):
+    def _record_internal(compartments):
         @staticmethod
-        def _advance(**kwargs):
+        def _record(**kwargs):
             return_vals = []
             for comp in compartments:
                 new_val = kwargs[comp]
@@ -19,12 +19,4 @@ def _advance(**kwargs):
                 current_store = current_store.at[-1].set(new_val)
                 return_vals.append(current_store)
             return return_vals if len(compartments) > 1 else return_vals[0]
-        return _advance
-
-    @staticmethod
-    def build_advance_state(component):
-        return super().build_advance_state(component)
-
-    @staticmethod
-    def build_reset(component):
-        return super().build_reset(component)
+        return _record