Merge pull request #33 from cnrl/refactor

Refactor on Connections
cnrl · Jun 6, 2023 · 50144a6 · 50144a6
2 parents 4a4328f + 712a425
commit 50144a6
Show file tree

Hide file tree

Showing 32 changed files with 1,352 additions and 456 deletions.
diff --git a/Example/test/configs/l2_3.py b/Example/test/configs/l2_3.py
@@ -1,5 +1,5 @@
 from conex.behaviors.neurons.neuron_types.lif_neurons import AELIF, ELIF
-from conex.nn.Config.layer_config import LayerConfig
+from conex.nn.config.layer_config import LayerConfig
 from pymonntorch import *
 
 
@@ -20,7 +20,8 @@ class l2_3(LayerConfig):
     exc_neuron_type = AELIF
     exc_tau_trace = 2.7
     exc_fire = True
-    exc_dendrite_params = {"distal_provocativeness": 0.5}
+    exc_dendrite_structure_params = {"Apical_max_delay": 0}
+    exc_dendrite_computation_params = {"distal_provocativeness": 0.5}
 
     inh_size = (5, 20, 20)
     inh_neuron_params = {
@@ -35,7 +36,8 @@ class l2_3(LayerConfig):
     inh_neuron_type = ELIF
     inh_tau_trace = 2.7
     inh_fire = True
-    inh_dendrite_params = {"distal_provocativeness": 0.5}
+    inh_dendrite_structure_params = {"Apical_max_delay": 0}
+    inh_dendrite_computation_params = {"distal_provocativeness": 0.5}
 
     exc_exc_weight_init_params = {"mode": "uniform"}
     exc_exc_structure = "Simple"

diff --git a/Example/test/configs/l2_3_l5.py b/Example/test/configs/l2_3_l5.py
@@ -1,4 +1,4 @@
-from conex.nn.Config.connection_config import Layer2LayerConnectionConfig
+from conex.nn.config.connection_config import Layer2LayerConnectionConfig
 
 
 class l2_3_l5(Layer2LayerConnectionConfig):

diff --git a/Example/test/configs/l2_3_rep.py b/Example/test/configs/l2_3_rep.py
@@ -1,4 +1,4 @@
-from conex.nn.Config.connection_config import Layer2PopConnectionConfig
+from conex.nn.config.connection_config import Layer2PopConnectionConfig
 
 
 class l2_3_rep(Layer2PopConnectionConfig):

diff --git a/Example/test/configs/l4.py b/Example/test/configs/l4.py
@@ -1,5 +1,5 @@
 from conex.behaviors.neurons.neuron_types.lif_neurons import LIF, ELIF
-from conex.nn.Config.layer_config import LayerConfig
+from conex.nn.config.layer_config import LayerConfig
 from pymonntorch import *
 
 
@@ -15,7 +15,8 @@ class l4(LayerConfig):
     exc_neuron_type = LIF
     exc_tau_trace = 2.7
     exc_fire = True
-    exc_dendrite_params = {"distal_provocativeness": 0.5}
+    exc_dendrite_structure_params = {"Apical_max_delay": 0}
+    exc_dendrite_computation_params = {"distal_provocativeness": 0.5}
 
     inh_size = (4, 5, 5)
     inh_neuron_params = {
@@ -30,7 +31,8 @@ class l4(LayerConfig):
     inh_neuron_type = ELIF
     inh_tau_trace = 2.7
     inh_fire = True
-    inh_dendrite_params = {"distal_provocativeness": 0.5}
+    inh_dendrite_structure_params = {"Apical_max_delay": 0}
+    inh_dendrite_computation_params = {"distal_provocativeness": 0.5}
 
     exc_exc_weight_init_params = {"mode": "uniform"}
     exc_exc_structure = "Simple"

diff --git a/Example/test/configs/l4_l2_3.py b/Example/test/configs/l4_l2_3.py
@@ -1,4 +1,4 @@
-from conex.nn.Config.connection_config import Layer2LayerConnectionConfig
+from conex.nn.config.connection_config import Layer2LayerConnectionConfig
 
 
 class l4_l2_3(Layer2LayerConnectionConfig):

diff --git a/Example/test/configs/l5.py b/Example/test/configs/l5.py
@@ -1,5 +1,5 @@
 from conex.behaviors.neurons.neuron_types.lif_neurons import ELIF
-from conex.nn.Config.layer_config import LayerConfig
+from conex.nn.config.layer_config import LayerConfig
 from pymonntorch import *
 
 
@@ -17,7 +17,8 @@ class l5(LayerConfig):
     exc_neuron_type = ELIF
     exc_tau_trace = 2.7
     exc_fire = True
-    exc_dendrite_params = {"distal_provocativeness": 0.5}
+    exc_dendrite_structure_params = {"Apical_max_delay": 0}
+    exc_dendrite_computation_params = {"distal_provocativeness": 0.5}
 
     inh_size = (1, 5, 5)
     inh_neuron_params = {
@@ -32,7 +33,8 @@ class l5(LayerConfig):
     inh_neuron_type = ELIF
     inh_tau_trace = 2.7
     inh_fire = True
-    inh_dendrite_params = {"distal_provocativeness": 0.5}
+    inh_dendrite_structure_params = {"Apical_max_delay": 0}
+    inh_dendrite_computation_params = {"distal_provocativeness": 0.5}
 
     exc_exc_weight_init_params = {"mode": "uniform"}
     exc_exc_structure = "Simple"

diff --git a/Example/test/configs/l5_l2_3.py b/Example/test/configs/l5_l2_3.py
@@ -1,4 +1,4 @@
-from conex.nn.Config.connection_config import Layer2LayerConnectionConfig
+from conex.nn.config.connection_config import Layer2LayerConnectionConfig
 
 
 class l5_l2_3(Layer2LayerConnectionConfig):

diff --git a/Example/test/configs/save_load.py b/Example/test/configs/save_load.py
@@ -6,7 +6,7 @@
 from Example.test.configs.l4_l2_3 import *
 from Example.test.configs.l5_l2_3 import *
 
-from conex.nn.Config.base_config import BaseConfig
+from conex.nn.config.base_config import BaseConfig
 
 if __name__ == "__main__":
     config_type = "json"  # json

diff --git a/Example/test/configs/sens_l4.py b/Example/test/configs/sens_l4.py
@@ -1,4 +1,4 @@
-from conex.nn.Config.connection_config import Pop2LayerConnectionConfig
+from conex.nn.config.connection_config import Pop2LayerConnectionConfig
 
 
 class sens_l4(Pop2LayerConnectionConfig):