ruby-dnn 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a3a2ea891bd75d6d2d3b97bc8e850c220c4118d87a1e7fcd47e1f9dd6943a08
-  data.tar.gz: 002d15961430e42b06b1b180718170b4e7e8f10b99b6569c312a550dc486a0e9
+  metadata.gz: '040681c989e47e7c183f46ff921285db8c5fd541112f1922b07262c27383d96a'
+  data.tar.gz: 84a1130bed58297aac0414c3eb5842aec3635e4f8aeae826fd1f7d7fbdecdc97
 SHA512:
-  metadata.gz: ed91236978caff9d0def15edae2d743d03bb5e11b2546a8fec4f5d7cd3653af4b3f98d8fdf5cc2d93b10273dbebe84cca0f3b3fc7347afb846e489646dae51c2
-  data.tar.gz: e44ec8438481761ca2ba28ca6b6839abe4c97025a1985eb1be717bb85b9c44d11e71355a68370db1305412e67a3bcf5094c00fa05303f2ba2f33d5df5c324d87
+  metadata.gz: 39c4c5b6f2557ae9bb39d67d248c33488f20aba8ec665221d744b9f1ee1f10f310e88e38689a53202536d58cc19ccf1b5cb2579bd50589888d6fd0318b451628
+  data.tar.gz: 7d2f2311a1123b5bc34fac29b0f7ee73b5638121ef1771a385be9a129a1fea49a3b0385ccb98fa2f7f0985e26cc681b167a20ff31b5926e15c16cc8c640b3ce9

data/lib/dnn/core/rnn_layers.rb

@@ -1,6 +1,32 @@
 module DNN
   module Layers
 
+    class SimpleRNN_Dense
+      def initialize(params, grads, activation)
+        @params = params
+        @grads = grads
+        @activation = activation
+      end
+
+      def forward(x, h)
+        @x = x
+        @h = h
+        h2 = x.dot(@params[:weight]) + h.dot(@params[:weight2]) + @params[:bias]
+        @activation.forward(h2)
+      end
+
+      def backward(dh2)
+        dh2 = @activation.backward(dh2)
+        @grads[:weight] += @x.transpose.dot(dh2)
+        @grads[:weight2] += @h.transpose.dot(dh2)
+        @grads[:bias] += dh2.sum(0)
+        dx = dh2.dot(@params[:weight].transpose)
+        dh = dh2.dot(@params[:weight2].transpose)
+        [dx, dh]
+      end
+    end
+
+
     class SimpleRNN < HasParamLayer
       include Initializers
       include Activations
@@ -31,37 +57,34 @@ module DNN
         @weight_initializer = (weight_initializer || RandomNormal.new)
         @bias_initializer = (bias_initializer || Zeros.new)
         @weight_decay = weight_decay
+        @layers = []
         @h = nil
       end
 
       def forward(xs)
-        @xs = xs
-        @hs = SFloat.zeros(xs.shape[0], *shape)
+        @xs_shape = xs.shape
+        hs = SFloat.zeros(xs.shape[0], *shape)
         h = (@stateful && @h) ? @h : SFloat.zeros(xs.shape[0], @num_nodes)
         xs.shape[1].times do |t|
           x = xs[true, t, false]
-          h = x.dot(@params[:weight]) + h.dot(@params[:weight2]) + @params[:bias]
-          h = @activation.forward(h)
-          @hs[true, t, false] = h
+          h = @layers[t].forward(x, h)
+          hs[true, t, false] = h
         end
         @h = h
-        @hs
+        hs
       end
 
-      def backward(douts)
+      def backward(dh2s)
         @grads[:weight] = SFloat.zeros(*@params[:weight].shape)
         @grads[:weight2] = SFloat.zeros(*@params[:weight2].shape)
-        dxs = SFloat.zeros(@xs.shape)
-        (0...douts.shape[1]).to_a.reverse.each do |t|
-          dout = douts[true, t, false]
-          x = @xs[true, t, false]
-          h = @hs[true, t, false]
-          dout = @activation.backward(dout)
-          @grads[:weight] += x.transpose.dot(dout)
-          @grads[:weight2] += h.transpose.dot(dout)
-          dxs[true, t, false] = dout.dot(@params[:weight].transpose)
+        @grads[:bias] = SFloat.zeros(*@params[:bias].shape)
+        dxs = SFloat.zeros(@xs_shape)
+        dh = 0
+        (0...dh2s.shape[1]).to_a.reverse.each do |t|
+          dh2 = dh2s[true, t, false]
+          dx, dh = @layers[t].backward(dh2 + dh)
+          dxs[true, t, false] = dx
         end
-        @grads[:bias] = douts.sum(0).sum(0)
         dxs
       end
 
@@ -97,6 +120,9 @@ module DNN
         @weight_initializer.init_param(self, :weight)
         @weight_initializer.init_param(self, :weight2)
         @bias_initializer.init_param(self, :bias)
+        @time_length.times do |t|
+          @layers << SimpleRNN_Dense.new(@params, @grads, @activation.clone)
+        end
       end
     end
 

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray