ruby-dnn 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7df0888afbde3ac66d5aaa66d7ef87f66edd58156945d4f1663552994e0d12f
-  data.tar.gz: 4c638c3f14f4cb0bea17ec31225c19aa2ca30b14a4e81c12bb8ee791137d3072
+  metadata.gz: 7042e521d632ba478fe494c644e5fa9c525f0dbc98ff168a39cafc0d7990db78
+  data.tar.gz: 624f38a50832523e0bbb42d7b392d7e77b0c926d6cd28258ba158ce50a4be56b
 SHA512:
-  metadata.gz: 4d3672bcb7f3763bd269d1adda133f4e90a8e1ab70f91bc5fb971eb18dfa346ebed16e1b88269fcb923d97fb2cdf131d680f74c487546ec0d121be8254a85e6f
-  data.tar.gz: 0f1f13a53ffb712ac97fea6cd9d06cb10d1076c032728cdc056f7e5489e8a97ac86e6000ce66a62858c1320441ac0b8562d3c47f44ec14eca0203995a80b48e5
+  metadata.gz: 6aa33554d27f1f1b126e4dc65a191d84f3e5f96648a0b14368fa456aa703214c60f568d37416b2d09478e6ea9f03dc819c61e18663f5c523dcdb3e47a20a9ae9
+  data.tar.gz: 12efc285e47702e6134518a13c582354329344b0e6a754f73e760794d1952b1d381848c534a4e0e571c26afc38ee98cb4e381b22040f26849bce4292aaf88997

data/API-Reference.ja.md

@@ -2,7 +2,7 @@
 ruby-dnnのAPIリファレンスです。このリファレンスでは、APIを利用するうえで必要となるクラスとメソッドしか記載していません。
 そのため、プログラムの詳細が必要な場合は、ソースコードを参照してください。
 
-最終更新バージョン:0.5.10
+最終更新バージョン:0.5.11
 
 # module DNN
 ruby-dnnの名前空間をなすモジュールです。
@@ -414,13 +414,16 @@ Float
 
 ## 【Instance methods】
 
-## def initialize(num_nodes, stateful: false, weight_initializer: nil, bias_initializer: nil, weight_decay: 0)
+## def initialize(num_nodes, stateful: false, return_sequences: true, weight_initializer: nil, bias_initializer: nil, weight_decay: 0)
 コンストラクタ。
 ### arguments
 * Integer num_nodes  
 レイヤーのノード数を設定します。
 * bool stateful
 trueを設定すると、一つ前に計算した中間層の値を使用して学習を行うことができます。
+* bool return_sequences
+trueを設定すると、時系列ネットワークの中間層全てを出力します。  
+falseを設定すると、時系列ネットワークの中間層の最後のみを出力します。
 * Layer activation
 リカレントニューラルネットワークにおいて、使用する活性化関数を設定します。
 nilを指定すると、Tanhが使用されます。

data/lib/dnn/core/activations.rb

@@ -15,12 +15,11 @@ module DNN
 
     class Tanh < Layer
       def forward(x)
-        @x = x
-        Xumo::NMath.tanh(x)
+        @out = Xumo::NMath.tanh(x)
       end
       
       def backward(dout)
-        dout * (1.0 / Xumo::NMath.cosh(@x)**2)
+        dout * (1 - @out**2)
       end
     end
     

data/lib/dnn/core/rnn_layers.rb

@@ -38,6 +38,7 @@ module DNN
       def self.load_hash(hash)
         self.new(hash[:num_nodes],
                  stateful: hash[:stateful],
+                 return_sequences: hash[:return_sequences],
                  activation: Util.load_hash(hash[:activation]),
                  weight_initializer: Util.load_hash(hash[:weight_initializer]),
                  bias_initializer: Util.load_hash(hash[:bias_initializer]),
@@ -46,6 +47,7 @@ module DNN
 
       def initialize(num_nodes,
                      stateful: false,
+                     return_sequences: true,
                      activation: nil,
                      weight_initializer: nil,
                      bias_initializer: nil,
@@ -53,6 +55,7 @@ module DNN
         super()
         @num_nodes = num_nodes
         @stateful = stateful
+        @return_sequences = return_sequences
         @activation = (activation || Tanh.new)
         @weight_initializer = (weight_initializer || RandomNormal.new)
         @bias_initializer = (bias_initializer || Zeros.new)
@@ -63,7 +66,7 @@ module DNN
 
       def forward(xs)
         @xs_shape = xs.shape
-        hs = Xumo::SFloat.zeros(xs.shape[0], *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]
@@ -71,13 +74,18 @@ module DNN
           hs[true, t, false] = h
         end
         @h = h
-        hs
+        @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|
@@ -89,7 +97,7 @@ module DNN
       end
 
       def shape
-        [@time_length, @num_nodes]
+        @return_sequences ? [@time_length, @num_nodes] : [@num_nodes]
       end
 
       def ridge
@@ -103,6 +111,7 @@ module DNN
       def to_hash
         super({num_nodes: @num_nodes,
                stateful: @stateful,
+               return_sequences: @return_sequences,
                activation: @activation.to_hash,
                weight_initializer: @weight_initializer.to_hash,
                bias_initializer: @bias_initializer.to_hash,
@@ -112,7 +121,7 @@ module DNN
       private
     
       def init_params
-        @time_length = prev_layer.shape[0] 
+        @time_length = prev_layer.shape[0]
         num_prev_nodes = prev_layer.shape[1]
         @params[:weight] = Xumo::SFloat.new(num_prev_nodes, @num_nodes)
         @params[:weight2] = Xumo::SFloat.new(@num_nodes, @num_nodes)
@@ -128,8 +137,6 @@ module DNN
 
 
     class LSTM_Dense
-      include Xumo
-
       def initialize(params, grads)
         @params = params
         @grads = grads
@@ -148,8 +155,8 @@ module DNN
         a = x.dot(@params[:weight]) + h.dot(@params[:weight2]) + @params[:bias]
 
         @forget = @forget_sigmoid.forward(a[true, 0...num_nodes])
-        @g = @g_tanh.forward(a[(num_nodes * 2)...(num_nodes * 3)])
-        @in = @in_sigmoid.forward(a[true, num_nodes...(num_nodes * 2)])
+        @g = @g_tanh.forward(a[true, num_nodes...(num_nodes * 2)])
+        @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
@@ -192,6 +199,7 @@ module DNN
       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])
@@ -199,12 +207,14 @@ module DNN
 
       def initialize(num_nodes,
                      stateful: false,
+                     return_sequences: true,
                      weight_initializer: nil,
                      bias_initializer: nil,
                      weight_decay: 0)
         super()
         @num_nodes = num_nodes
         @stateful = stateful
+        @return_sequences = return_sequences
         @weight_initializer = (weight_initializer || RandomNormal.new)
         @bias_initializer = (bias_initializer || Zeros.new)
         @weight_decay = weight_decay
@@ -215,7 +225,7 @@ module DNN
 
       def forward(xs)
         @xs_shape = xs.shape
-        hs = Xumo::SFloat.zeros(xs.shape[0], *shape)
+        hs = Xumo::SFloat.zeros(xs.shape[0], @time_length, @num_nodes)
         h = nil
         cell = nil
         if @stateful
@@ -231,13 +241,18 @@ module DNN
         end
         @h = h
         @cell = cell
-        hs
+        @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
         dcell = 0
@@ -250,7 +265,7 @@ module DNN
       end
 
       def shape
-        [@time_length, @num_nodes]
+        @return_sequences ? [@time_length, @num_nodes] : [@num_nodes]
       end
 
       def ridge
@@ -264,6 +279,7 @@ module DNN
       def to_hash
         super({num_nodes: @num_nodes,
                stateful: @stateful,
+               return_sequences: @return_sequences,
                weight_initializer: @weight_initializer.to_hash,
                bias_initializer: @bias_initializer.to_hash,
                weight_decay: @weight_decay})

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.5.10"
+  VERSION = "0.5.11"
 end

metadata

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