ruby-dnn 0.8.8 → 0.9.0

data/lib/dnn/core/rnn_layers.rb

@@ -60,6 +60,10 @@ module DNN
         dxs
       end
 
+      def output_shape
+        @return_sequences ? [@time_length, @num_nodes] : [@num_nodes]
+      end
+
       def to_hash(merge_hash = nil)
         hash = {
           num_nodes: @num_nodes,
@@ -94,7 +98,7 @@ module DNN
         end
       end
 
-      def dlasso
+      def d_lasso
         if @l1_lambda > 0
           dlasso = Xumo::SFloat.ones(*@weight.data.shape)
           dlasso[@weight.data < 0] = -1
@@ -105,7 +109,7 @@ module DNN
         end
       end
 
-      def dridge
+      def d_ridge
         if @l2_lambda > 0
           @weight.grad += l2_lambda * @weight.data
           @weight2.grad += l2_lambda * @weight2.data
@@ -115,7 +119,7 @@ module DNN
       private
 
       def init_params
-        @time_length = prev_layer.shape[0]
+        @time_length = @input_shape[0]
       end
     end
 
@@ -154,9 +158,9 @@ module DNN
         simple_rnn = 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]),
+                              activation: Utils.load_hash(hash[:activation]),
+                              weight_initializer: Utils.load_hash(hash[:weight_initializer]),
+                              bias_initializer: Utils.load_hash(hash[:bias_initializer]),
                               l1_lambda: hash[:l1_lambda],
                               l2_lambda: hash[:l2_lambda])
         simple_rnn
@@ -188,7 +192,7 @@ module DNN
     
       def init_params
         super()
-        num_prev_nodes = prev_layer.shape[1]
+        num_prev_nodes = @input_shape[1]
         @weight.data = Xumo::SFloat.new(num_prev_nodes, @num_nodes)
         @weight2.data = Xumo::SFloat.new(@num_nodes, @num_nodes)
         @bias.data = Xumo::SFloat.new(@num_nodes)
@@ -259,8 +263,8 @@ module DNN
         lstm = 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_initializer: Utils.load_hash(hash[:weight_initializer]),
+                        bias_initializer: Utils.load_hash(hash[:bias_initializer]),
                         l1_lambda: hash[:l1_lambda],
                         l2_lambda: hash[:l2_lambda])
         lstm
@@ -327,7 +331,7 @@ module DNN
     
       def init_params
         super()
-        num_prev_nodes = prev_layer.shape[1]
+        num_prev_nodes = @input_shape[1]
         @weight.data = Xumo::SFloat.new(num_prev_nodes, @num_nodes * 4)
         @weight2.data = Xumo::SFloat.new(@num_nodes, @num_nodes * 4)
         @bias.data = Xumo::SFloat.new(@num_nodes * 4)
@@ -402,8 +406,8 @@ module DNN
         gru = 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_initializer: Utils.load_hash(hash[:weight_initializer]),
+                       bias_initializer: Utils.load_hash(hash[:bias_initializer]),
                        l1_lambda: hash[:l1_lambda],
                        l2_lambda: hash[:l2_lambda])
         gru
@@ -423,7 +427,7 @@ module DNN
     
       def init_params
         super()
-        num_prev_nodes = prev_layer.shape[1]
+        num_prev_nodes = @input_shape[1]
         @weight.data = Xumo::SFloat.new(num_prev_nodes, @num_nodes * 3)
         @weight2.data = Xumo::SFloat.new(@num_nodes, @num_nodes * 3)
         @bias.data = Xumo::SFloat.new(@num_nodes * 3)

data/lib/dnn/core/{util.rb → utils.rb}

@@ -1,11 +1,7 @@
 module DNN
   # This module provides utility functions.
-  module Util
-    # Create a mini batch for "batch_size".
-    def self.get_minibatch(x, y, batch_size)
-      indexes = (0...x.shape[0]).to_a.sample(batch_size)
-      [x[indexes, false], y[indexes, false]]
-    end
+  module Utils
+    NMath = Xumo::NMath
 
     # Categorize labels into "num_classes" classes.
     def self.to_categorical(y, num_classes, narray_type = nil)
@@ -25,5 +21,13 @@ module DNN
       end
       dnn_class.new
     end
+
+    def self.sigmoid(x)
+      1 / (1 + NMath.exp(-x))
+    end
+
+    def self.softmax(x)
+      NMath.exp(x) / NMath.exp(x).sum(1).reshape(x.shape[0], 1)
+    end
   end
 end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.8.8"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.0
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -112,14 +112,16 @@ files:
 - lib/dnn.rb
 - lib/dnn/core/activations.rb
 - lib/dnn/core/cnn_layers.rb
+- lib/dnn/core/dataset.rb
 - lib/dnn/core/error.rb
 - lib/dnn/core/initializers.rb
 - lib/dnn/core/layers.rb
+- lib/dnn/core/losses.rb
 - lib/dnn/core/model.rb
 - lib/dnn/core/optimizers.rb
 - lib/dnn/core/param.rb
 - lib/dnn/core/rnn_layers.rb
-- lib/dnn/core/util.rb
+- lib/dnn/core/utils.rb
 - lib/dnn/lib/cifar10.rb
 - lib/dnn/lib/downloader.rb
 - lib/dnn/lib/image.rb