Merge remote-tracking branch 'upstream/main' into ei_network_tutorial

src/lava/magma/compiler/var_model.py

@@ -39,10 +39,16 @@ class LoihiAddress:
 
 @dataclass
 class LoihiNeuronAddress(LoihiAddress):
-    # Which Neuron Group on the core neuron belongs to
+    # To which Neuron Group on the core a neuron belongs
     neuron_group_id: int
 
 
+@dataclass
+class LoihiSynapseAddress(LoihiAddress):
+    # To which SynEntry on the core a synapse belongs
+    syn_entry_id: int
+
+
 @dataclass
 class AbstractVarModel(ABC):
     var: InitVar[Var] = None
@@ -117,6 +123,11 @@ class LoihiNeuronVarModel(LoihiVarModel):
     pass
 
 
+@dataclass
+class LoihiSynapseVarModel(LoihiVarModel):
+    pass
+
+
 @dataclass
 class CVarModel(LoihiVarModel):
     pass

src/lava/magma/runtime/runtime.py

@@ -11,7 +11,7 @@
 
 import numpy as np
 from lava.magma.compiler.channels.pypychannel import CspRecvPort, CspSendPort
-from lava.magma.compiler.var_model import AbstractVarModel
+from lava.magma.compiler.var_model import AbstractVarModel, LoihiSynapseVarModel
 from lava.magma.core.process.message_interface_enum import ActorType
 from lava.magma.runtime.message_infrastructure.factory import \
     MessageInfrastructureFactory
@@ -425,7 +425,8 @@ def set_var(self, var_id: int, value: np.ndarray, idx: np.ndarray = None):
                 buffer = buffer[idx]
             buffer_shape: ty.Tuple[int, ...] = buffer.shape
             num_items: int = np.prod(buffer_shape).item()
-            buffer = buffer.reshape((1, num_items))
+            reshape_order = 'F' if isinstance(ev, LoihiSynapseVarModel) else 'C'
+            buffer = buffer.reshape((1, num_items), order=reshape_order)
 
             # 3. Send [NUM_ITEMS, DATA1, DATA2, ...]
             data_port: CspSendPort = self.runtime_to_service[runtime_srv_id]
@@ -476,7 +477,8 @@ def get_var(self, var_id: int, idx: np.ndarray = None) -> np.ndarray:
                 buffer[0, i] = data_port.recv()[0]
 
             # 3. Reshape result and return
-            buffer = buffer.reshape(ev.shape)
+            reshape_order = 'F' if isinstance(ev, LoihiSynapseVarModel) else 'C'
+            buffer = buffer.reshape(ev.shape, order=reshape_order)
             if idx:
                 return buffer[idx]
             else:

src/lava/proc/scif/process.py

@@ -4,7 +4,6 @@
 
 import typing as ty
 from numpy import typing as npty
-
 import numpy as np
 
 from lava.magma.core.process.process import AbstractProcess

tests/lava/proc/scif/test_models.py

@@ -29,7 +29,7 @@
 
 
 class TestCspScifModels(unittest.TestCase):
-    """Tests for sigma delta neuron"""
+    """Tests for CspScif neuron"""
 
     def run_test(
         self,