version 0.01

src/forward.jl

@@ -2,6 +2,7 @@ module forward
 
 # export
 
+using Flux, CUDA 
 using GeneralUtils
 using ..type, ..snnUtil
 
@@ -11,15 +12,15 @@ using ..type, ..snnUtil
     input (row, col, batch)
 """
 function (kfn::kfn_1)(input::AbstractArray)
+    
     kfn.timeStep .+= 1
-
+    
     #TODO time step forward
-    if kfn.learningStage == [1]
+    if view(kfn.learningStage, 1)[1] == 1
         # reset learning params
-        kfn.learningStage = [2]
+        # kfn.learningStage = [2]
     end
-
-    d1, d2, d3 = size(input)
+    
     # println(">>> input ", size(input))
     # println(">>> zit ", size(kfn.zit)) 
     # println(">>> lif_zit ", size(kfn.lif_zit)) 
@@ -29,10 +30,10 @@ function (kfn::kfn_1)(input::AbstractArray)
     # println(">>> lif_alpha ", size(kfn.lif_alpha))
     # println(">>> lif_vt0 ", size(kfn.lif_vt0))
     # println(">>> lif_vt0 sum ", sum(kfn.lif_vt0))
-
+    
     # pass input_data into input neuron.
     GeneralUtils.cartesianAssign!(kfn.zit, input)
-
+    
     lifForward( kfn.zit, 
                 kfn.lif_zit,
                 kfn.lif_wRec, 
@@ -47,7 +48,9 @@ function (kfn::kfn_1)(input::AbstractArray)
                 kfn.lif_refractoryCounter,
                 kfn.lif_refractoryDuration,
                 kfn.lif_gammaPd,
-                kfn.lif_firingCounter)
+                kfn.lif_firingCounter,
+                kfn.lif_arraySize,
+                kfn.lif_arrayProjection3DTo4D)
     
     alifForward( kfn.zit, 
                  kfn.alif_zit,
@@ -69,13 +72,16 @@ function (kfn::kfn_1)(input::AbstractArray)
                  kfn.alif_rho,
                  kfn.alif_gammaPd,
                  kfn.alif_firingCounter)
+    # error("DEBUG -> kfn forward")
+
+    
     
     # update activation matrix by concatenate (input, lif_zt1, alif_zt1) to form activation matrix
-    _zit = cat(reshape(input, (d1, d2, 1, d3)), 
-                reshape(kfn.lif_zt1, (d1, :, 1, d3)), 
-                reshape(kfn.alif_zt1, (d1, :, 1, d3)), dims=2)
-    kfn.zit .= reshape(_zit, (d1, :, d3))
-
+    _zit = cat(reshape(input, (size(input, 1), size(input, 2), 1, size(input, 3))), 
+                reshape(kfn.lif_zt1, (size(input, 1), :, 1, size(input, 3))), 
+                reshape(kfn.alif_zt1, (size(input, 1), :, 1, size(input, 3))), dims=2)
+    kfn.zit .= reshape(_zit, (size(input, 1), :, size(input, 3)))
+    
     # read out
     onForward( kfn.zit, 
                 kfn.on_zit,
@@ -93,7 +99,7 @@ function (kfn::kfn_1)(input::AbstractArray)
                 kfn.on_gammaPd,
                 kfn.on_firingCounter)
 
-    return reshape(kfn.on_zt1, (d1, :)),
+    return reshape(kfn.on_zt1, (size(input, 1), :)),
             kfn.zit
 end
 
@@ -111,11 +117,16 @@ function lifForward(kfn_zit,
                     refractoryCounter,
                     refractoryDuration,
                     gammaPd,
-                    firingCounter)
-    d1, d2, d3, d4 = size(wRec)
-    zit .= reshape(kfn_zit, (d1, d2, 1, d4)) .* ones(size(wRec)...)   # project zit into zit
+                    firingCounter,
+                    arraySize,
+                    arrayProjection3DTo4D)
     
-    for j in 1:d4, i in 1:d3    # compute along neurons axis of every batch
+    # project 3D kfn zit into 4D lif zit
+    zit .= reshape(kfn_zit, 
+                (view(arraySize, 1)[1], view(arraySize, 2)[1], 1, view(arraySize, 4)[1])) .* 
+                arrayProjection3DTo4D
+    # error("DEBUG -> lif forward")   #WORKING
+    for j in 1:size(wRec, 4), i in 1:size(wRec, 3)    # compute along neurons axis of every batch
         if view(refractoryCounter, :, :, i, j)[1] > 0     # refractory period is active
             view(refractoryCounter, :, :, i, j)[1] -= 1
             view(zt1, :, :, i, j)[1] = 0