ruby-dnn 0.5.12 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96c9ff5d01c5d85fc4aff092d5985db64e8848d8e0ce2da952afb28c49794d7c
-  data.tar.gz: 7860cf4b52fa8742fe01b42039a91b183efe6b0d50a41c14533e844d3c687c95
+  metadata.gz: '08a74d28175b0e881a1cb7b93d9d973ac601e60498f1422890214d6888f7671a'
+  data.tar.gz: ebde049f70c4e43b90daae6c3eea3bafbf2bd04d9a8556726da46e6cb75ed313
 SHA512:
-  metadata.gz: d5df63c654235145dcecc470b1510c2ad920c3fae83559888e79a30932cc0aea53cda0d11f6c4b732cece9a58dded024e5a9c8baf1f6df4433bb580dbd8f3139
-  data.tar.gz: a73018f21c4432062ff7cac5fc4317667d28ee78607e9cf80573c8dc8d884cf98314cfd8f7eb284e5d26d623129541c2e3b9b2b89bf477f543748b4c245767c0
+  metadata.gz: 46a59448402d63fc8e594259d8bb084e029595acd58a73c7f9558bfe949029f12a406cf9b996b41822a093a3c130e9b7a1249b3b9db61a4ae11611df5ff91264
+  data.tar.gz: 31fd9ff92eb43999f30162650677ac470bec417845ca2cc613cf282b4840e4b5f3d698724d05392ac631c19b2a705ff0034c303684a88998996be8214231779f

data/lib/dnn/core/activations.rb

@@ -1,8 +1,7 @@
 module DNN
   module Activations
-    Layer = Layers::Layer
 
-    class Sigmoid < Layer
+    class Sigmoid < Layers::Layer
       def forward(x)
         @out = 1 / (1 + Xumo::NMath.exp(-x))
       end
@@ -13,7 +12,7 @@ module DNN
     end
 
 
-    class Tanh < Layer
+    class Tanh < Layers::Layer
       def forward(x)
         @out = Xumo::NMath.tanh(x)
       end
@@ -24,7 +23,7 @@ module DNN
     end
     
     
-    class ReLU < Layer
+    class ReLU < Layers::Layer
       def forward(x)
         @x = x.clone
         x[x < 0] = 0
@@ -39,7 +38,7 @@ module DNN
     end
 
 
-    class LeakyReLU < Layer
+    class LeakyReLU < Layers::Layer
       attr_reader :alpha
 
       def initialize(alpha = 0.3)
@@ -64,7 +63,7 @@ module DNN
       end
 
       def to_hash
-        {name: self.class.name, alpha: alpha}
+        {class: self.class.name, alpha: alpha}
       end
     end
 

data/lib/dnn/core/initializers.rb

@@ -7,7 +7,7 @@ module DNN
       end
 
       def to_hash(merge_hash = nil)
-        hash = {name: self.class.name}
+        hash = {class: self.class.name}
         hash.merge!(merge_hash) if merge_hash
         hash
       end

data/lib/dnn/core/layers.rb

@@ -31,7 +31,7 @@ module DNN
 
       # Layer to a hash.
       def to_hash(merge_hash = nil)
-        hash = {name: self.class.name}
+        hash = {class: self.class.name}
         hash.merge!(merge_hash) if merge_hash
         hash
       end

data/lib/dnn/core/model.rb

@@ -22,7 +22,6 @@ module DNN
     def initialize
       @layers = []
       @optimizer = nil
-      @batch_size = nil
       @training = false
       @compiled = false
     end
@@ -103,13 +102,12 @@ module DNN
       unless compiled?
         raise DNN_Error.new("The model is not compiled.")
       end
-      @batch_size = batch_size
       num_train_data = x.shape[0]
       (1..epochs).each do |epoch|
         puts "【 epoch #{epoch}/#{epochs} 】" if verbose
-        (num_train_data.to_f / @batch_size).ceil.times do |index|
-          x_batch, y_batch = Util.get_minibatch(x, y, @batch_size)
-          loss = train_on_batch(x_batch, y_batch, @batch_size, &batch_proc)
+        (num_train_data.to_f / batch_size).ceil.times do |index|
+          x_batch, y_batch = Util.get_minibatch(x, y, batch_size)
+          loss = train_on_batch(x_batch, y_batch, &batch_proc)
           if loss.nan?
             puts "\nloss is nan" if verbose
             return
@@ -130,7 +128,7 @@ module DNN
           print log if verbose
         end
         if verbose && test
-          acc = accurate(test[0], test[1], batch_size,&batch_proc)
+          acc = accurate(test[0], test[1], batch_size, &batch_proc)
           print "  accurate: #{acc}"
         end
         puts "" if verbose
@@ -138,8 +136,7 @@ module DNN
       end
     end
   
-    def train_on_batch(x, y, batch_size, &batch_proc)
-      @batch_size = batch_size
+    def train_on_batch(x, y, &batch_proc)
       x, y = batch_proc.call(x, y) if batch_proc
       forward(x, true)
       loss = @layers[-1].loss(y)
@@ -148,27 +145,21 @@ module DNN
       loss
     end
   
-    def accurate(x, y, batch_size = nil, &batch_proc)
-      unless batch_size
-        if @batch_size
-          batch_size = @batch_size >= x.shape[0] ? @batch_size : x.shape[0]
-        else
-          batch_size = 1
-        end
-      end
+    def accurate(x, y, batch_size = 1, &batch_proc)
+      batch_size = batch_size >= x.shape[0] ? batch_size : x.shape[0]
       correct = 0
-      (x.shape[0].to_f / @batch_size).ceil.times do |i|
-        x_batch = Xumo::SFloat.zeros(@batch_size, *x.shape[1..-1])
-        y_batch = Xumo::SFloat.zeros(@batch_size, *y.shape[1..-1])
-        @batch_size.times do |j|
-          k = i * @batch_size + j
+      (x.shape[0].to_f / batch_size).ceil.times do |i|
+        x_batch = Xumo::SFloat.zeros(batch_size, *x.shape[1..-1])
+        y_batch = Xumo::SFloat.zeros(batch_size, *y.shape[1..-1])
+        batch_size.times do |j|
+          k = i * batch_size + j
           break if k >= x.shape[0]
           x_batch[j, false] = x[k, false]
           y_batch[j, false] = y[k, false]
         end
         x_batch, y_batch = batch_proc.call(x_batch, y_batch) if batch_proc
         out = forward(x_batch, false)
-        @batch_size.times do |j|
+        batch_size.times do |j|
           if @layers[-1].shape == [1]
             correct += 1 if out[j, 0].round == y_batch[j, 0].round
           else

data/lib/dnn/core/optimizers.rb

@@ -13,7 +13,7 @@ module DNN
       def update(layer) end
 
       def to_hash(merge_hash = nil)
-        hash = {name: self.class.name, learning_rate: @learning_rate}
+        hash = {class: self.class.name, learning_rate: @learning_rate}
         hash.merge!(merge_hash) if merge_hash
         hash
       end

data/lib/dnn/core/rnn_layers.rb

@@ -6,6 +6,7 @@ module DNN
       include Initializers
       include Activations
 
+      attr_accessor :h
       attr_reader :num_nodes
       attr_reader :stateful
       attr_reader :weight_decay
@@ -29,7 +30,7 @@ module DNN
 
       def to_hash(merge_hash = nil)
         hash = {
-          name: self.class.name,
+          class: self.class.name,
           num_nodes: @num_nodes,
           stateful: @stateful,
           return_sequences: @return_sequences,
@@ -48,7 +49,7 @@ module DNN
 
       def ridge
         if @weight_decay > 0
-          0.5 * (@weight_decay * (@params[:weight]**2).sum + @weight_decay * (@params[:weight]**2).sum)
+          0.5 * (@weight_decay * ((@params[:weight]**2).sum + (@params[:weight2]**2).sum))
         else
           0
         end
@@ -219,6 +220,8 @@ module DNN
 
 
     class LSTM < RNN
+      attr_accessor :cell
+
       def self.load_hash(hash)
         self.new(hash[:num_nodes],
                  stateful: hash[:stateful],
@@ -235,6 +238,7 @@ module DNN
                      bias_initializer: nil,
                      weight_decay: 0)
         super
+        @cell = nil
       end
 
       def forward(xs)

data/lib/dnn/core/util.rb

@@ -24,7 +24,7 @@ module DNN
 
     # Convert hash to an object.
     def self.load_hash(hash)
-      dnn_class = DNN.const_get(hash[:name])
+      dnn_class = DNN.const_get(hash[:class])
       if dnn_class.respond_to?(:load_hash)
         return dnn_class.load_hash(hash)
       end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.5.12"
+  VERSION = "0.6.0"
 end

metadata

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