ruby-dnn 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4587938452bbdaf1a51f7fb9d7c3693570194d349204bdbfb8aa17c7f3f0db73
-  data.tar.gz: 8b893be6c2a546ddae5c39c8a5a5967864b1af0c320a11e8d7ed72f5a738d144
+  metadata.gz: ad7089d958268c000dbe71a9fd44b5a65a9824fe792ad445c0ed58eff33f82fe
+  data.tar.gz: 249b43df73430bf42c15e435be51842ec6b8d0a52fb46e59b573ac5fe14d44f6
 SHA512:
-  metadata.gz: 591c74427f134032c4a9ee0ed01fa0ced4b238a918ae1001c3d98b86cc9d5693be94e33f91f069dff58da0dd156a38746eb6665667bd872081f42d41230e77eb
-  data.tar.gz: 4ac43a25bcee0f02453764fefc2dbd8e812158cd0d1f78eeb4d3c1ad1f3047634a831b49caf55202f9e9824c73bd7d2f40b318c8f22e005c9702d6d8fe2ceebf
+  metadata.gz: 8d904d65210bae39bb4ce3c0d4cb7bd31331663084a112a8ba11424ea73b06d7706ead1c2113e9812e98dd5f82510fe045c4deb13c92480b2897811bbf063885
+  data.tar.gz: 7c32096caf2a00edab6d27a65f3dfdd1663291be10ac50af256fc9486b866fd9455d5d4216aebb71b984fc41c3f6db7272e27aa39accaa0f0489990d8c562d3f

data/lib/dnn/core/cnn_layers.rb

@@ -123,6 +123,9 @@ module DNN
       end
 
       def build(input_shape)
+        unless input_shape.length == 3
+          raise DNN_ShapeError.new("Input shape is #{input_shape}. But input shape must be 3 dimensional.")
+        end
         super
         prev_h, prev_w, num_prev_filter = *input_shape
         @weight.data = Xumo::SFloat.new(@filter_size.reduce(:*) * num_prev_filter, @num_filters)
@@ -228,16 +231,14 @@ module DNN
       end
 
       def build(input_shape)
+        unless input_shape.length == 3
+          raise DNN_ShapeError.new("Input shape is #{input_shape}. But input shape must be 3 dimensional.")
+        end
         super
         prev_h, prev_w, num_prev_filter = *input_shape
         @weight.data = Xumo::SFloat.new(@filter_size.reduce(:*) * @num_filters, num_prev_filter)
-        @weight_initializer.init_param(self, @weight)
-        @weight_regularizer.param = @weight if @weight_regularizer
-        if @bias
-          @bias.data = Xumo::SFloat.new(@num_filters)
-          @bias_initializer.init_param(self, @bias)
-          @bias_regularizer.param = @bias if @bias_regularizer
-        end
+        @bias.data = Xumo::SFloat.new(@num_filters) if @bias
+        init_weight_and_bias
         if @padding == true
           out_h, out_w = calc_deconv2d_out_size(prev_h, prev_w, *@filter_size, 0, 0, @strides)
           @pad_size = calc_padding_size(out_h, out_w, prev_h, prev_w, @strides)
@@ -327,6 +328,9 @@ module DNN
       end
 
       def build(input_shape)
+        unless input_shape.length == 3
+          raise DNN_ShapeError.new("Input shape is #{input_shape}. But input shape must be 3 dimensional.")
+        end
         super
         prev_h, prev_w = input_shape[0..1]
         @num_channel = input_shape[2]
@@ -423,6 +427,9 @@ module DNN
       end
 
       def build(input_shape)
+        unless input_shape.length == 3
+          raise DNN_ShapeError.new("Input shape is #{input_shape}. But input shape must be 3 dimensional.")
+        end
         super
         prev_h, prev_w = input_shape[0..1]
         unpool_h, unpool_w = @unpool_size

data/lib/dnn/core/layers.rb

@@ -188,6 +188,9 @@ module DNN
       end
 
       def build(input_shape)
+        unless input_shape.length == 1
+          raise DNN_ShapeError.new("Input shape is #{input_shape}. But input shape must be 1 dimensional.")
+        end
         super
         num_prev_nodes = input_shape[0]
         @weight.data = Xumo::SFloat.new(num_prev_nodes, @num_nodes)

data/lib/dnn/core/model.rb

@@ -120,7 +120,6 @@ module DNN
       @optimizer = optimizer
       @loss_func = loss_func
       build
-      layers_shape_check
     end
 
     # Set optimizer and loss_func to model and recompile. But does not build layers.
@@ -137,7 +136,6 @@ module DNN
       layers_check
       @optimizer = optimizer
       @loss_func = loss_func
-      layers_shape_check
     end
 
     def build(super_model = nil)
@@ -428,26 +426,6 @@ module DNN
       end
     end
 
-    def layers_shape_check
-      @layers.each.with_index do |layer, i|
-        prev_shape = layer.input_shape
-        if layer.is_a?(Layers::Dense)
-          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)
-          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
-
     def check_xy_type(x, y = nil)
       unless x.is_a?(Xumo::SFloat)
         raise TypeError.new("x:#{x.class.name} is not an instance of #{Xumo::SFloat.name} class.")

data/lib/dnn/core/rnn_layers.rb

@@ -39,6 +39,9 @@ module DNN
       end
 
       def build(input_shape)
+        unless input_shape.length == 2
+          raise DNN_ShapeError.new("Input shape is #{input_shape}. But input shape must be 2 dimensional.")
+        end
         super
         @time_length = @input_shape[0]
       end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray