ruby-dnn 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23a157376f86b88dcedc8a7628d5f225f57ff4a6a0bd1cb9b4e54218dafd4c00
-  data.tar.gz: e088ca902c911d90ab41e51660cca8e94a96c2a8f1af409c70948ac4e4a47de1
+  metadata.gz: 530a8532898c2b8f934c257ff0d986407763fb3df432df8f6d061d31147b97d8
+  data.tar.gz: 333fb2f4e0cfd6c6aa78d3bea8f9159433acec613d8017218d24688ab1384d24
 SHA512:
-  metadata.gz: 231d208bb49b580307633948cfd79b40ffac5f6003c3065a74400d48620bc56e189492a1efc1151e3c026e4742e02a4d42de04bcd7586d754e6c872b76f9a75a
-  data.tar.gz: 5a999b80f80747f8da24ad5f41c13c27df2cdb2402a595a7c366fc49fb8c2ec586d2ce055c7f0183e726df28e99f5fbad0b580afc112e7176cbac09f77151246
+  metadata.gz: 9979622493c8056c75ea3c9a5561ffa6cb2a63147d7c230a43870125ae8a023d44ed9615b0fa48f169c29d19a3979d109570f46baf9122046be01080d10baf01
+  data.tar.gz: f9730237fcc631dab2109909508d73559dcbbcdad996578be7f1252776ab048cab0510b17e58a6662358dde6e8bd81356348c2576347b73aa8aaa0c0e4cd689b

data/API-Reference.ja.md

@@ -2,7 +2,7 @@
 ruby-dnnのAPIリファレンスです。このリファレンスでは、APIを利用するうえで必要となるクラスとメソッドしか記載していません。
 そのため、プログラムの詳細が必要な場合は、ソースコードを参照してください。
 
-最終更新バージョン:0.6.1
+最終更新バージョン:0.6.2
 
 # module DNN
 ruby-dnnの名前空間をなすモジュールです。
@@ -484,6 +484,10 @@ Numo::SFloat
 nilを設定することで、中間層のセルステートをリセットすることができます。
 
 
+# class GRU < RNN
+GRUレイヤーを扱うクラスです。
+
+
 # class Flatten
 N次元のデータを平坦化します。
 
@@ -572,6 +576,14 @@ Numo::SFloat y
 tanh関数のレイヤーです。
 
 
+# class Softsign < Layer
+softsign関数のレイヤーです。
+
+
+# class Softplus < Layer
+softplus関数のレイヤーです。
+
+
 # class ReLU < Layer
 ランプ関数のレイヤーです。
 

data/lib/dnn/core/activations.rb

@@ -68,6 +68,30 @@ module DNN
     end
 
 
+    class Softsign < Layers::Layer
+      def forward(x)
+        @x = x
+        x / (1 + x.abs)
+      end
+
+      def backward(dout)
+        dout * (1 / (1 + @x.abs)**2)
+      end
+    end
+
+
+    class Softplus < Layers::Layer
+      def forward(x)
+        @x = x
+        Xumo::NMath.log(1 + Xumo::NMath.exp(x))
+      end
+
+      def backward(dout)
+        dout * (1 / (1 + Xumo::NMath.exp(-@x)))
+      end
+    end
+
+
     class IdentityMSE < Layers::OutputLayer
       def forward(x)
         @out = x

data/lib/dnn/core/rnn_layers.rb

@@ -191,10 +191,10 @@ module DNN
         @in = @in_sigmoid.forward(a[true, (num_nodes * 2)...(num_nodes * 3)])
         @out = @out_sigmoid.forward(a[true, (num_nodes * 3)..-1])
 
-        @cell2 = @forget * cell + @g * @in
-        @tanh_cell2 = @tanh.forward(@cell2)
-        @h2 = @out * @tanh_cell2
-        [@h2, @cell2]
+        cell2 = @forget * cell + @g * @in
+        @tanh_cell2 = @tanh.forward(cell2)
+        h2 = @out * @tanh_cell2
+        [h2, cell2]
       end
 
       def backward(dh2, dcell2)
@@ -299,5 +299,129 @@ module DNN
       end
     end
 
+
+    class GRU_Dense
+      def initialize(params, grads)
+        @params = params
+        @grads = grads
+        @update_sigmoid = Sigmoid.new
+        @reset_sigmoid = Sigmoid.new
+        @tanh = Tanh.new
+      end
+
+      def forward(x, h)
+        @x = x
+        @h = h
+        num_nodes = h.shape[1]
+        @weight_a = @params[:weight][true, 0...(num_nodes * 2)]
+        @weight2_a = @params[:weight2][true, 0...(num_nodes * 2)]
+        bias_a = @params[:bias][0...(num_nodes * 2)]
+        a = x.dot(@weight_a) + h.dot(@weight2_a) + bias_a
+        @update = @update_sigmoid.forward(a[true, 0...num_nodes])
+        @reset = @reset_sigmoid.forward(a[true, num_nodes..-1])
+
+        @weight_h = @params[:weight][true, (num_nodes * 2)..-1]
+        @weight2_h = @params[:weight2][true, (num_nodes * 2)..-1]
+        bias_h = @params[:bias][(num_nodes * 2)..-1]
+        @tanh_h = @tanh.forward(x.dot(@weight_h) + (h * @reset).dot(@weight2_h) + bias_h)
+        h2 = (1 - @update) * h + @update * @tanh_h
+        h2
+      end
+
+      def backward(dh2)
+        dtanh_h = @tanh.backward(dh2 * @update)
+        dh = dh2 * (1 - @update)
+
+        dweight_h = @x.transpose.dot(dtanh_h)
+        dx = dtanh_h.dot(@weight_h.transpose)
+        dweight2_h = (@h * @reset).transpose.dot(dtanh_h)
+        dh += dtanh_h.dot(@weight2_h.transpose) * @reset
+        dbias_h = dtanh_h.sum(0)
+
+        dreset = @reset_sigmoid.backward(dtanh_h.dot(@weight2_h.transpose) * @h)
+        dupdate = @update_sigmoid.backward(dh2 * @tanh_h - dh2 * @h)
+        da = Xumo::SFloat.hstack([dupdate, dreset])
+        dweight_a = @x.transpose.dot(da)
+        dx += da.dot(@weight_a.transpose)
+        dweight2_a = @h.transpose.dot(da)
+        dh += da.dot(@weight2_a.transpose)
+        dbias_a = da.sum(0)
+
+        @grads[:weight] += Xumo::SFloat.hstack([dweight_a, dweight_h])
+        @grads[:weight2] += Xumo::SFloat.hstack([dweight2_a, dweight2_h])
+        @grads[:bias] += Xumo::SFloat.hstack([dbias_a, dbias_h])
+        [dx, dh]
+      end
+    end
+
+
+    class GRU < RNN
+      def self.load_hash(hash)
+        self.new(hash[:num_nodes],
+                 stateful: hash[:stateful],
+                 return_sequences: hash[:return_sequences],
+                 weight_initializer: Util.load_hash(hash[:weight_initializer]),
+                 bias_initializer: Util.load_hash(hash[:bias_initializer]),
+                 weight_decay: hash[:weight_decay])
+      end
+
+      def initialize(num_nodes,
+                     stateful: false,
+                     return_sequences: true,
+                     weight_initializer: nil,
+                     bias_initializer: nil,
+                     weight_decay: 0)
+        super
+      end
+
+      def forward(xs)
+        @xs_shape = xs.shape
+        hs = Xumo::SFloat.zeros(xs.shape[0], @time_length, @num_nodes)
+        h = (@stateful && @h) ? @h : Xumo::SFloat.zeros(xs.shape[0], @num_nodes)
+        xs.shape[1].times do |t|
+          x = xs[true, t, false]
+          h = @layers[t].forward(x, h)
+          hs[true, t, false] = h
+        end
+        @h = h
+        @return_sequences ? hs : h
+      end
+
+      def backward(dh2s)
+        @grads[:weight] = Xumo::SFloat.zeros(*@params[:weight].shape)
+        @grads[:weight2] = Xumo::SFloat.zeros(*@params[:weight2].shape)
+        @grads[:bias] = Xumo::SFloat.zeros(*@params[:bias].shape)
+        unless @return_sequences
+          dh = dh2s
+          dh2s = Xumo::SFloat.zeros(dh.shape[0], @time_length, dh.shape[1])
+          dh2s[true, -1, false] = dh
+        end
+        dxs = Xumo::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
+        dxs
+      end
+
+      private
+    
+      def init_params
+        super()
+        num_prev_nodes = prev_layer.shape[1]
+        @params[:weight] = Xumo::SFloat.new(num_prev_nodes, @num_nodes * 3)
+        @params[:weight2] = Xumo::SFloat.new(@num_nodes, @num_nodes * 3)
+        @params[:bias] = Xumo::SFloat.new(@num_nodes * 3)
+        @weight_initializer.init_param(self, :weight)
+        @weight_initializer.init_param(self, :weight2)
+        @bias_initializer.init_param(self, :bias)
+        @time_length.times do |t|
+          @layers << GRU_Dense.new(@params, @grads)
+        end
+      end
+    end
+
   end
 end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

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