sinabs 3.1.1.dev1__py3-none-any.whl → 3.1.3__py3-none-any.whl

sinabs/backend/dynapcnn/chips/dynapcnn.py

@@ -101,7 +101,7 @@ class DynapcnnConfigBuilder(ConfigBuilder):
         dimensions["input_shape"]["feature_count"] = channel_count
 
         # dimensions["output_feature_count"] already done in conv2d_to_dict
-        (f, h, w) = layer.get_neuron_shape()
+        f, h, w = layer.get_neuron_shape()
         dimensions["output_shape"]["size"] = {}
         dimensions["output_shape"]["feature_count"] = f
         dimensions["output_shape"]["size"]["x"] = w
@@ -121,7 +121,7 @@ class DynapcnnConfigBuilder(ConfigBuilder):
         config_dict["dimensions"] = dimensions
         # Update parameters from convolution
         if layer.conv_layer.bias is not None:
-            (weights, biases) = layer.conv_layer.parameters()
+            weights, biases = layer.conv_layer.parameters()
         else:
             (weights,) = layer.conv_layer.parameters()
             biases = torch.zeros(layer.conv_layer.out_channels)

sinabs/backend/dynapcnn/dynapcnn_visualizer.py

@@ -418,7 +418,9 @@ class DynapcnnVisualizer:
                 + " should contain value `dvs`. "
             )
 
-        last_layer = dynapcnn_network.chip_layers_ordering[-1]
+        last_layer = dynapcnn_network.layer2core_map[
+            dynapcnn_network.exit_layer_ids[-1]
+        ]
 
         if not config.cnn_layers[last_layer].monitor_enable:
             raise ValueError(
@@ -453,7 +455,7 @@ class DynapcnnVisualizer:
 
         # Streamer graph
         # Dvs node
-        (_, dvs_member_filter, _, streamer_node) = self.streamer_graph.sequential(
+        _, dvs_member_filter, _, streamer_node = self.streamer_graph.sequential(
             [
                 dynapcnn_network.samna_device.get_model_source_node(),
                 samna.graph.JitMemberSelect(),
@@ -524,7 +526,7 @@ class DynapcnnVisualizer:
         ## Readout node
         if "r" in self.gui_type:
             if self.readout_node == "JitMajorityReadout":
-                (_, majority_readout_node, _) = self.streamer_graph.sequential(
+                _, majority_readout_node, _ = self.streamer_graph.sequential(
                     [
                         spike_collection_node,
                         samna.graph.JitMajorityReadout(samna.ui.Event),
@@ -542,7 +544,7 @@ class DynapcnnVisualizer:
                     self.readout_default_threshold_high
                 )
             else:
-                (_, majority_readout_node, _) = self.streamer_graph.sequential(
+                _, majority_readout_node, _ = self.streamer_graph.sequential(
                     [
                         spike_collection_node,
                         self.readout_node,
@@ -568,7 +570,9 @@ class DynapcnnVisualizer:
             dynapcnn_network (DynapcnnNetwork): DynapcnnNetwork object
 
         """
-        last_layer = dynapcnn_network.chip_layers_ordering[-1]
+        last_layer = dynapcnn_network.layer2core_map[
+            dynapcnn_network.exit_layer_ids[-1]
+        ]
         config = dynapcnn_network.samna_config
         model_output_feature_count = config.cnn_layers[
             last_layer

sinabs/backend/dynapcnn/io.py

@@ -133,8 +133,11 @@ def get_device_map() -> Dict:
     # Group by device_type_name
     device_groups = groupby(devices, lambda x: x.device_type_name)
     # Switch keys from samna's device_type_name to device_type names
+    # -- guarantee is a supported device
     device_groups = {
-        device_type_map[k]: sort_devices(list(v)) for k, v in device_groups
+        device_type_map[k]: sort_devices(list(v))
+        for k, v in device_groups
+        if k in device_type_map
     }
     # Flat map
     for dev_type, dev_list in device_groups.items():

sinabs/backend/dynapcnn/nir_graph_extractor.py

@@ -504,7 +504,7 @@ class GraphExtractor:
             A handler to the newly added `DVSLayer` instance.
         """
 
-        (features, height, width) = dvs_input_shape
+        features, height, width = dvs_input_shape
         if features > 2:
             raise ValueError(
                 f"A DVSLayer istance can have a max feature dimension of 2 but {features} was given."
@@ -578,7 +578,7 @@ class GraphExtractor:
                 f"A DVSLayer node exists and there are {nb_entries} entry nodes in the graph: the DVSLayer should be the only entry node."
             )
 
-        (features, _, _) = dvs_input_shape
+        features, _, _ = dvs_input_shape
 
         if features > 2:
             raise ValueError(
@@ -752,7 +752,7 @@ class GraphExtractor:
                 # different input sources to a core to have the same output shapes.
                 if any(inp.shape != inputs[0].shape for inp in inputs):
                     raise ValueError(
-                        f"Layer `sinabs.layers.merge.Merge` (node {node}) requires input tensors with the same shape"
+                        f"Layer `sinabs.layers.merge.Merge` (node {node}) requires input tensors with the same shape."
                     )
 
                 # forward input through the node.
@@ -828,6 +828,7 @@ class GraphExtractor:
         if len(sources) == 0:
             return -1
         if len(sources) > 1:
+            # return -1 #TODO: why throw a runtime error when the documentation explicitly say -1 in case of more than one input node?
             raise RuntimeError(f"Node {node} has more than 1 input")
         return sources.pop()
 

sinabs/layers/pool2d.py

@@ -80,7 +80,7 @@ class SpikingMaxPooling2dLayer(nn.Module):
         Returns:
             (channelsOut, height_out, width_out)
         """
-        (channels, height, width) = input_shape
+        channels, height, width = input_shape
 
         height_out = conv_output_size(
             height + sum(self.padding[2:]), self.pool_size[0], self.strides[0]

sinabs/nir.py

@@ -46,8 +46,8 @@ def _import_sinabs_module(
             groups=node.groups,
             bias=True,
         )
-        conv.weight.data = torch.tensor(node.weight).float()
-        conv.bias.data = torch.tensor(node.bias).float()
+        conv.weight.data = node.weight.detach().clone().to(float)
+        conv.bias.data = node.bias.detach().clone().to(float)
         return conv
 
     elif isinstance(node, nir.Conv2d):
@@ -184,6 +184,7 @@ def _extract_sinabs_module(module: torch.nn.Module) -> Optional[nir.NIRNode]:
             return nir.Affine(module.weight.detach(), module.bias.detach())
     elif isinstance(module, torch.nn.Conv1d):
         return nir.Conv1d(
+            input_shape=None,
             weight=module.weight.detach(),
             stride=module.stride,
             padding=module.padding,
@@ -191,7 +192,7 @@ def _extract_sinabs_module(module: torch.nn.Module) -> Optional[nir.NIRNode]:
             groups=module.groups,
             bias=(
                 module.bias.detach()
-                if module.bias
+                if isinstance(module.bias, torch.Tensor)
                 else torch.zeros((module.weight.shape[0]))
             ),
         )

{sinabs-3.1.1.dev1.dist-info → sinabs-3.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sinabs
-Version: 3.1.1.dev1
+Version: 3.1.3
 Summary: SynSense Spiking Neural Network simulator for deep neural networks (DNNs).
 Author: SynSense (formerly AiCTX)
 Author-email: support@synsense.ai
@@ -87,7 +87,7 @@ Sinabs is published under Apache v2.0. See the LICENSE file for details.
 
 Contributing to Sinabs
 ------------------------
-Checkout the [contributing](https://sinabs.readthedocs.io/en/develop/about/contributing.html) page for more info.
+Checkout the [contributing](https://sinabs.readthedocs.io/develop/about/contributing.html) page for more info.
 
 
 Citation

{sinabs-3.1.1.dev1.dist-info → sinabs-3.1.3.dist-info}/RECORD

@@ -4,7 +4,7 @@ sinabs/conversion.py,sha256=wEACb-IMrsNcjoNvGjoaQSINHYs66j0XOeQSmk7nhTM,2011
 sinabs/from_torch.py,sha256=_jVoGP3aQcdCUIc39ujxhCQmbIDlDtzLHz6VY3zmX-k,5777
 sinabs/hooks.py,sha256=u6bzKXodhUHDLi_ZaUNbD8hogRX7RD4QoRouSUaKEzY,15962
 sinabs/network.py,sha256=Zn7fQ0WTU_7vgBwfVloGINrXivZTNIBsmUGLWAbX81A,9542
-sinabs/nir.py,sha256=r72RZ2WNuhnHvQ2MaSJ04J-Bes1mAdzoU9LKbJupZzE,8695
+sinabs/nir.py,sha256=LUUlWbV2jXJPWby5SoHFl0_c5tMVaQlsw-U_s-WjecY,8761
 sinabs/synopcounter.py,sha256=VFefA5ix0JqCr2DPf8hNB19Y0Pe8tTvSrCuspFKa4Ic,12779
 sinabs/utils.py,sha256=1ctTxNT2ONYVK5d99VhZvXwxaOG4pD2lZ_PGRPPO6bQ,12114
 sinabs/validate_memory_speck.py,sha256=WKzB3o76sddUx9griloLQ6-ijDBPqFFXshdp9AjEiAM,5002
@@ -24,19 +24,19 @@ sinabs/backend/dynapcnn/dvs_layer.py,sha256=b9OryaOv5X5ZOxGOEZhabHZf3jZoykDuB295
 sinabs/backend/dynapcnn/dynapcnn_layer.py,sha256=Pf-Qhl24LwKyu-7sJXDRYQ_3DN_7Z3MQyj3lNsGKTaE,8917
 sinabs/backend/dynapcnn/dynapcnn_layer_utils.py,sha256=9aPk9YuAgbfI_Xworfy-SbJDQSRVFksqaLU3ZaCmS74,13153
 sinabs/backend/dynapcnn/dynapcnn_network.py,sha256=klYI82qV1IqhDyD_OkOs5G3F-FysTtJJRgQbFEpDrfg,34721
-sinabs/backend/dynapcnn/dynapcnn_visualizer.py,sha256=MRewU6519dAtAMxf-JlFBrlynJTZeLiDfB0d85-mMFQ,24262
+sinabs/backend/dynapcnn/dynapcnn_visualizer.py,sha256=OKpeVpt6OIZm7sg_N3Lww0KyqegQCFVP0iKqwXPbtYY,24354
 sinabs/backend/dynapcnn/dynapcnnnetwork_module.py,sha256=aHLTAe59h_r0rZ0bHeSuIDG811MFP6_tOtyxiZIVVfA,14487
 sinabs/backend/dynapcnn/exceptions.py,sha256=MHvsM8a5c5ukHkH59OVYU0AeivVeNgdn9Tgqb07WOtU,3523
 sinabs/backend/dynapcnn/flipdims.py,sha256=I0I1nakrF0ngWBh-2SHHg7OkCOxotqukwHOQ45GWyCs,860
-sinabs/backend/dynapcnn/io.py,sha256=8m86xm0BcLUc8AGLaA30FyY5OXFu0NrpOaPk4zLCfJU,9918
+sinabs/backend/dynapcnn/io.py,sha256=-XtP801uVragUlBf-6PjR5UHY6B0fcy1pUg0M6QlQKo,9999
 sinabs/backend/dynapcnn/mapping.py,sha256=sI0GKh2FkyciYFJuuCLCcitOzlEjfEEEbSG_OiJXICw,8683
-sinabs/backend/dynapcnn/nir_graph_extractor.py,sha256=1PbQzDokxW_0mzG_tdMSS1toHczW-2lnKGMUkdmCug8,37724
+sinabs/backend/dynapcnn/nir_graph_extractor.py,sha256=8_KEKzVdLTwZGN5rVqaRWH2-BK9PlTQUgCbPgcs-9_Q,37856
 sinabs/backend/dynapcnn/sinabs_edges_handler.py,sha256=pEfGUXwhQy7cnmofK5MCulSVFqMBDPRRoQVM5MTf3Qk,41085
 sinabs/backend/dynapcnn/specksim.py,sha256=UKh_lH_yHIZaYEONWsAOChrD-vBdSawBxRBeDHlSv84,17138
 sinabs/backend/dynapcnn/utils.py,sha256=QD5dKTgQmGLjP8fIz_vlXFpSem8Z-q-9zTebqd9xJzc,10036
 sinabs/backend/dynapcnn/weight_rescaling_methods.py,sha256=iftnMHZtAsPZ3wHDPPCR3VgTKjCsjNlZAIQwezWwyns,2051
 sinabs/backend/dynapcnn/chips/__init__.py,sha256=zJQ7f7bp_cF0US1pZ8ga4-3Bo32T0GB9gD2RN3uKlsM,130
-sinabs/backend/dynapcnn/chips/dynapcnn.py,sha256=oTfrBJ7ZxIaG2pNd59j3dk03QQvJWKjws6GImOX5W_0,15240
+sinabs/backend/dynapcnn/chips/dynapcnn.py,sha256=lIFHL9pCXbaOD3Leu04b7PjuwwN_LXDiFx7p-fkS7r8,15236
 sinabs/backend/dynapcnn/chips/speck2e.py,sha256=rq6RvS-FGE5aOtTXmvkKTmIJlwGxZz4vBFQ-nV3HLCo,879
 sinabs/backend/dynapcnn/chips/speck2f.py,sha256=bWGTFtUZzeZ7peZcgO1VQG_8YGyhiTQUKUE_X9jnC5E,877
 sinabs/layers/__init__.py,sha256=lRQtECdsYJzSWKppGcg_9oCHNRwjYprgmIDbJ21Kec0,584
@@ -48,7 +48,7 @@ sinabs/layers/iaf.py,sha256=S58p29fBE0wQdFEelZq2Qmb1m7rkLnYMyCpDVql2ASY,8001
 sinabs/layers/lif.py,sha256=V41sarXbFjGcd8RhX8NZIFHPr57-8zXssW7_kKJuicU,15293
 sinabs/layers/merge.py,sha256=oVtQXdtcXRivTlwDXTEbW1Ii-GTMkg3detp0-uCTcK0,985
 sinabs/layers/neuromorphic_relu.py,sha256=z8opQf38EJAWLpR2_k8d3MT8gxYA-s8aE8Jl9J7n4Lk,1545
-sinabs/layers/pool2d.py,sha256=NaV3KmjwV1lRTFLxo8BKt6hhRxAGwSFmSxmOPt6Ng_k,3553
+sinabs/layers/pool2d.py,sha256=9crByasYe6hJdjLkywymCT2rDKVGSw3g0xIjAwZQlz4,3551
 sinabs/layers/quantize.py,sha256=X9wKlA4nk8-_DS7WBiPHubHZQMb4OsSE0OkeFemxNCM,499
 sinabs/layers/reshape.py,sha256=mIbRoYsx3qAFK5MJtWL6wvof4KR8fKIpyIdbLv3ozPM,3347
 sinabs/layers/stateful_layer.py,sha256=5p5C6hySXor58lbUdQtmT9WfA5hrNcxzdriOH9Ct5f0,6685
@@ -56,10 +56,10 @@ sinabs/layers/to_spike.py,sha256=ORkEGuHucWCqB3P1Ia8XJsPtpDAugCTSo7Bwr3xVpzE,329
 sinabs/layers/functional/__init__.py,sha256=v0c7DHizKg8jfelmFYeMMg9vDafKvzoenakc4SPpj84,91
 sinabs/layers/functional/alif.py,sha256=ycJ7rlcBAd-lq5GCDZrcNPeV-7fztt3uy43XhBtTKHI,4599
 sinabs/layers/functional/lif.py,sha256=QRjiWDCBaJFk4J7RRMgktMaLCyN6xEXAKvC9Bu_PICU,4259
-sinabs-3.1.1.dev1.dist-info/licenses/AUTHORS,sha256=rSozYAiy4aFshSqHdw7bV-CyqtIyWhcPo26R5JR6-MY,1847
-sinabs-3.1.1.dev1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-sinabs-3.1.1.dev1.dist-info/METADATA,sha256=TBK76i04bGarg88j-cJoYoakH9PFUqHTKJV5Vrx3KYk,3918
-sinabs-3.1.1.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sinabs-3.1.1.dev1.dist-info/pbr.json,sha256=DsGf0oO1zpKuMU-ZkpK0AxRzUJVUeBhbXdrMY2BeHvs,47
-sinabs-3.1.1.dev1.dist-info/top_level.txt,sha256=QOXGzf0ZeDjRnJ9OgAjkk6h5jrh66cwrwvtPJTyfDk8,7
-sinabs-3.1.1.dev1.dist-info/RECORD,,
+sinabs-3.1.3.dist-info/licenses/AUTHORS,sha256=rSozYAiy4aFshSqHdw7bV-CyqtIyWhcPo26R5JR6-MY,1847
+sinabs-3.1.3.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+sinabs-3.1.3.dist-info/METADATA,sha256=G65LwqVuathl4uuyGz4JpD1S8CXFqHKcq8-MsftZdSQ,3910
+sinabs-3.1.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+sinabs-3.1.3.dist-info/pbr.json,sha256=OEWdbkD4Q8LvbGlpU0R5QyaFrHAjL8tC1RIlE9qpspc,47
+sinabs-3.1.3.dist-info/top_level.txt,sha256=QOXGzf0ZeDjRnJ9OgAjkk6h5jrh66cwrwvtPJTyfDk8,7
+sinabs-3.1.3.dist-info/RECORD,,

{sinabs-3.1.1.dev1.dist-info → sinabs-3.1.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

sinabs-3.1.3.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "d84078e", "is_release": false}

sinabs-3.1.1.dev1.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "dbf7eee", "is_release": false}