ruby-dnn 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e35a9f970e0b936026f31c819d3a6763f6362706e14c74a98771895e809835cf
-  data.tar.gz: ea8918fc438cfcda9dba644871c56d12659137a949ab74351b6bea6ba69e2318
+  metadata.gz: cf955bc9993a8c9495b144659cedc0cc97c1bde3bc1521be2453847d9d3afd91
+  data.tar.gz: b64395b3976619575ded55fd7ab508d09a8f0cde0dd0ab8a7d611dd7ae76f169
 SHA512:
-  metadata.gz: 7fcf64d42d502e9cfef831ba8a4e8c3afc2bade2632c42fb20a180baec494fecf026e087bfbf758f32f331243bac217ee1ab05e178ae1c12a7172c0c0ef96681
-  data.tar.gz: a5064e28bec910a3f344af5777ca0a2da2495fd82a8f6a7cf1f33c8422d3e09459a636d90862a7db875cf2cb1b498926b7b1c5959b3e24c0cc12394a5de0f3dc
+  metadata.gz: 8dca44e876a1403b8b02e94936ce46f98a7dfa14a47874976c88fad12544f447481959cec6d563c6af6cfe9fa643f37a18c016b39e1da955f915f18027580f11
+  data.tar.gz: ad647ff01b6f9d9afe9a7dde002e68dce80dc1de57570d160e684f2a54fc635c9a0f6661fc563adbbe8196bd517f7c86f546302b185bac557209773f8d832da0

data/lib/dnn/core/initializers.rb

@@ -52,7 +52,7 @@ module DNN
         self.new(hash[:min], hash[:max])
       end
 
-      def initialize(min = -0.25, max = 0.25)
+      def initialize(min = -0.05, max = 0.05)
         @min = min
         @max = max
       end

data/lib/dnn/core/model.rb

@@ -151,6 +151,7 @@ module DNN
     end
   
     def train_on_batch(x, y, &batch_proc)
+      input_data_shape_check(x, y)
       x, y = batch_proc.call(x, y) if batch_proc
       forward(x, true)
       loss_value = loss(y)
@@ -160,6 +161,7 @@ module DNN
     end
   
     def accurate(x, y, batch_size = 1, &batch_proc)
+      input_data_shape_check(x, y)
       batch_size = batch_size >= x.shape[0] ? x.shape[0] : batch_size
       correct = 0
       (x.shape[0].to_f / batch_size).ceil.times do |i|
@@ -185,6 +187,7 @@ module DNN
     end
   
     def predict(x)
+      input_data_shape_check(x)
       forward(x, false)
     end
 
@@ -239,7 +242,11 @@ module DNN
     def get_prev_layer(layer)
       layer_index = @layers.index(layer)
       prev_layer = if layer_index == 0
-        @super_model.layers[@super_model.layers.index(self) - 1]
+        if @super_model
+          @super_model.layers[@super_model.layers.index(self) - 1]
+        else
+          self
+        end
       else
         @layers[layer_index - 1]
       end
@@ -261,18 +268,31 @@ module DNN
       end
     end
 
+    def input_data_shape_check(x, y = nil)
+      unless @layers.first.shape == x.shape[1..-1]
+        raise DNN_ShapeError.new("The shape of x does not match the input shape. x shape is #{x.shape[1..-1]}, but input shape is #{@layers.first.shape}.")
+      end
+      if y && @layers.last.shape != y.shape[1..-1]
+        raise DNN_ShapeError.new("The shape of y does not match the input shape. y shape is #{y.shape[1..-1]}, but output shape is #{@layers.last.shape}.")
+      end
+    end
+
     def layers_shape_check
       @layers.each.with_index do |layer, i|
+        prev_shape = layer.prev_layer.shape
         if layer.is_a?(Layers::Dense)
-          prev_shape = layer.prev_layer.shape
           if prev_shape.length != 1
             raise DNN_ShapeError.new("layer index(#{i}) Dense:  The shape of the previous layer is #{prev_shape}. The shape of the previous layer must be 1 dimensional.")
           end
         elsif layer.is_a?(Layers::Conv2D) || layer.is_a?(Layers::MaxPool2D)
-          prev_shape = layer.prev_layer.shape
           if prev_shape.length != 3
             raise DNN_ShapeError.new("layer index(#{i}) Conv2D:  The shape of the previous layer is #{prev_shape}. The shape of the previous layer must be 3 dimensional.")
           end
+        elsif layer.is_a?(Layers::RNN)
+          if prev_shape.length != 2
+            layer_name = layer.class.name.match("\:\:(.+)$")[1]
+            raise DNN_ShapeError.new("layer index(#{i}) #{layer_name}:  The shape of the previous layer is #{prev_shape}. The shape of the previous layer must be 3 dimensional.")
+          end
         end
       end
     end

data/lib/dnn/lib/mnist.rb

@@ -1,6 +1,6 @@
 require "open-uri"
 require "zlib"
-require "dnn/core/error"
+require_relative "../core/error"
 
 module DNN
   module MNIST

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

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