ruby-dnn 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e54e26acfc92ade6be07da5c62e340b8d8c021a69b390a3a3bba21853ee6f3d
-  data.tar.gz: b111ee117a07e554d7166512756caf0da329ca70a9241495b268761597a48d98
+  metadata.gz: 0a3a2ea891bd75d6d2d3b97bc8e850c220c4118d87a1e7fcd47e1f9dd6943a08
+  data.tar.gz: 002d15961430e42b06b1b180718170b4e7e8f10b99b6569c312a550dc486a0e9
 SHA512:
-  metadata.gz: 82877266a1b2e01478e545fbf04071bd12a4c8ab07b13c2f11dc413aa7a6842d50a75206e7359ead5fd13a734bc3eccf9e7fb0122af3b20f92a989574c7e0741
-  data.tar.gz: 69c4999978dd9b4c2b4d7d2fbc3d4d6784b6894e606cee50eaaa1e1235542ca46f188a2f69c3d9ff7efb61a1e238660c2529424d2b9642d16d573b30eecce587
+  metadata.gz: ed91236978caff9d0def15edae2d743d03bb5e11b2546a8fec4f5d7cd3653af4b3f98d8fdf5cc2d93b10273dbebe84cca0f3b3fc7347afb846e489646dae51c2
+  data.tar.gz: e44ec8438481761ca2ba28ca6b6839abe4c97025a1985eb1be717bb85b9c44d11e71355a68370db1305412e67a3bcf5094c00fa05303f2ba2f33d5df5c324d87

data/API-Reference.ja.md

@@ -2,7 +2,7 @@
 ruby-dnnのAPIリファレンスです。このリファレンスでは、APIを利用するうえで必要となるクラスとメソッドしか記載していません。
 そのため、プログラムの詳細が必要な場合は、ソースコードを参照してください。
 
-最終更新バージョン:0.5.6
+最終更新バージョン:0.5.7
 
 # module DNN
 ruby-dnnの名前空間をなすモジュールです。
@@ -335,8 +335,8 @@ Arrayで指定する場合、[Integer height, Integer width]の形式で指定
 重み減衰を行うL2正則化項の強さを設定します。
 
 
-# class MaxPool2D < Layer
-maxプーリングを行うレイヤーです。
+# class Pool2D < Layer
+全ての2Dプーリングレイヤーのスーパークラスです。
 
 ## 【Properties】
 
@@ -367,6 +367,14 @@ Arrayで指定する場合、[Integer height, Integer width]の形式で指定
 ゼロパディングを行います。
 
 
+# class MaxPool2D < Pool2D
+maxプーリングを行うレイヤーです。
+
+
+# class AvgPool2D < Pool2D
+averageプーリングを行うレイヤーです。
+
+
 # class UnPool2D < Layer
 逆プーリングを行うレイヤーです。
 

data/lib/dnn/core/cnn_layers.rb

@@ -158,16 +158,16 @@ module DNN
         @bias_initializer.init_param(self, :bias)
       end
     end
-    
-    
-    class MaxPool2D < Layer
+
+    #Super class of all pooling2D class.
+    class Pool2D < Layer
       include Conv2DModule
 
       attr_reader :pool_size
       attr_reader :strides
 
-      def self.load_hash(hash)
-        MaxPool2D.new(hash[:pool_size], strides: hash[:strides], padding: hash[:padding])
+      def self.load_hash(pool2d_class, hash)
+        pool2d_class.new(hash[:pool_size], strides: hash[:strides], padding: hash[:padding])
       end
 
       def initialize(pool_size, strides: nil, padding: false)
@@ -197,15 +197,10 @@ module DNN
         x = padding(x, @pad) if @padding
         @x_shape = x.shape
         col = im2col(x, *@out_size, *@pool_size, @strides)
-        col = col.reshape(x.shape[0] * @out_size.reduce(:*) * x.shape[3], @pool_size.reduce(:*))
-        @max_index = col.max_index(1)
-        col.max(1).reshape(x.shape[0], *@out_size, x.shape[3])
+        col.reshape(x.shape[0] * @out_size.reduce(:*) * x.shape[3], @pool_size.reduce(:*))
       end
 
-      def backward(dout)
-        dmax = SFloat.zeros(dout.size * @pool_size.reduce(:*))
-        dmax[@max_index] = dout.flatten
-        dcol = dmax.reshape(dout.shape[0..2].reduce(:*), dout.shape[3] * @pool_size.reduce(:*))
+      def backward(dcol)
         dx = col2im(dcol, @x_shape, *@out_size, *@pool_size, @strides)
         @padding ? back_padding(dx, @pad) : dx
       end
@@ -221,6 +216,49 @@ module DNN
                padding: @padding})
       end
     end
+    
+    
+    class MaxPool2D < Pool2D
+      def self.load_hash(hash)
+        Pool2D.load_hash(self, hash)
+      end
+
+      def forward(x)
+        col = super(x)
+        @max_index = col.max_index(1)
+        col.max(1).reshape(x.shape[0], *@out_size, x.shape[3])
+      end
+
+      def backward(dout)
+        dmax = SFloat.zeros(dout.size * @pool_size.reduce(:*))
+        dmax[@max_index] = dout.flatten
+        dcol = dmax.reshape(dout.shape[0..2].reduce(:*), dout.shape[3] * @pool_size.reduce(:*))
+        super(dcol)
+      end
+    end
+
+
+    class AvgPool2D < Pool2D
+      def self.load_hash(hash)
+        Pool2D.load_hash(self, hash)
+      end
+
+      def forward(x)
+        col = super(x)
+        col.mean(1).reshape(x.shape[0], *@out_size, x.shape[3])
+      end
+
+      def backward(dout)
+        row_length = @pool_size.reduce(:*)
+        dout /= row_length
+        davg = SFloat.zeros(dout.size, row_length)
+        row_length.times do |i|
+          davg[true, i] = dout.flatten
+        end
+        dcol = davg.reshape(dout.shape[0..2].reduce(:*), dout.shape[3] * @pool_size.reduce(:*))
+        super(dcol)
+      end
+    end
 
 
     class UnPool2D < Layer

data/lib/dnn/core/error.rb

@@ -1,7 +1,5 @@
 module DNN
   class DNN_Error < StandardError; end
 
-  class DNN_TypeError < DNN_Error; end
-
-  class DNN_SharpError < DNN_Error; end
+  class DNN_ShapeError < DNN_Error; end
 end

data/lib/dnn/core/model.rb

@@ -69,7 +69,7 @@ module DNN
   
     def <<(layer)
       unless layer.is_a?(Layers::Layer)
-        raise DNN_TypeError.new("layer is not an instance of the DNN::Layers::Layer class.")
+        raise TypeError.new("layer is not an instance of the DNN::Layers::Layer class.")
       end
       @layers << layer
       self
@@ -77,7 +77,7 @@ module DNN
   
     def compile(optimizer)
       unless optimizer.is_a?(Optimizers::Optimizer)
-        raise DNN_TypeError.new("optimizer is not an instance of the DNN::Optimizers::Optimizer class.")
+        raise TypeError.new("optimizer is not an instance of the DNN::Optimizers::Optimizer class.")
       end
       @compiled = true
       layers_check
@@ -202,10 +202,10 @@ module DNN
 
     def layers_check
       unless @layers.first.is_a?(Layers::InputLayer)
-        raise DNN_Error.new("The first layer is not an InputLayer.")
+        raise TypeError.new("The first layer is not an InputLayer.")
       end
       unless @layers.last.is_a?(Layers::OutputLayer)
-        raise DNN_Error.new("The last layer is not an OutputLayer.")
+        raise TypeError.new("The last layer is not an OutputLayer.")
       end
     end
 
@@ -214,12 +214,12 @@ module DNN
         if layer.is_a?(Layers::Dense)
           prev_shape = layer.prev_layer.shape
           if prev_shape.length != 1
-            raise DNN_SharpError.new("layer index(#{i}) Dense:  The shape of the previous layer is #{prev_shape}. The shape of the previous layer must be 1 dimensional.")
+            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_SharpError.new("layer index(#{i}) Conv2D:  The shape of the previous layer is #{prev_shape}. The shape of the previous layer must be 3 dimensional.")
+            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
         end
       end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

metadata

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