ruby-dnn 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d86f8c32dcd08b4a71ae4ce3892e0a4f0677d04ac32c0090b72c8f7fe008b591
-  data.tar.gz: 4003068dfacd2739426e6c8d19411a47b9401aaf2c7c09f214962de3cdf57986
+  metadata.gz: a9bd42ca5cbea3b4a3abd984157df19cf87ca2a6ba80a3a76cf155e020582508
+  data.tar.gz: 2be2b617347618bf18d140e1ed4b5ede5d3a0f6540d6bc18217ae9b86c22aa2d
 SHA512:
-  metadata.gz: 1699c885afb1494981784e435dd93c5f06c7f2041412eefacf0c2f24e700ab1a134a155dfc3babe6791b15c4936f15083463d32f3bd02f181c0f457273f4d4bd
-  data.tar.gz: '09b397dba80f67bf9dc5a66a557d3e358b11c397776cad73b7cd4d2a1fbe601d93b1df0d5dfa9a3675736e4e3ab7386ad59bf71825689714439c5480c85feb3a'
+  metadata.gz: 9077ebdf09fbc33d5b163c9ef2bd9ec4bb6681b87e5f638db25d6fbc46603ba50a8a6cb81123a42e07984636d2055fae3ed54712f11df815d856854a5845973d
+  data.tar.gz: 5b3c56027727a7dee1f1cbae31c6ddd887d5ea7cf015c1d111942e6c518579ffc607c8c38c13702e77f86ad9b4428d27296287fd3c2b13e02a77992b5360900b

data/lib/dnn/core/layers.rb

@@ -188,6 +188,12 @@ module DNN
         img2[true, true, pad...(ih + pad), pad...(iw + pad)] = img
         img2
       end
+
+      def back_padding(img, pad)
+        i_end = img.shape[2] - pad
+        j_end = img.shape[3] - pad
+        img[true, true, pad...i_end, pad...j_end]
+      end
     end
     
     
@@ -246,7 +252,8 @@ module DNN
         end
         @grads[:bias] = dout.sum(0)
         dcol = dout.dot(@params[:weight].transpose)
-        col2im(dcol, @x_shape, @out_height, @out_width, @filter_height, @filter_width, @strides)
+        dx = col2im(dcol, @x_shape, @out_height, @out_width, @filter_height, @filter_width, @strides)
+        @padding ? back_padding(dx, @padding) : dx
       end
     
       def shape
@@ -293,11 +300,12 @@ module DNN
         super
         prev_height, prev_width = prev_layer.shape[1], prev_layer.shape[2]
         @num_channel = prev_layer.shape[0]
-        @out_height = (prev_height - @pool_height) / @strides[0] + 1
-        @out_width = (prev_width - @pool_width) / @strides[1] + 1
+        @out_height = (prev_height + @padding * 2 - @pool_height) / @strides[0] + 1
+        @out_width = (prev_width + @padding * 2 - @pool_width) / @strides[1] + 1
       end
     
       def forward(x)
+        x = padding(x, 2) if @padding > 0
         @x_shape = x.shape
         col = im2col(x, @out_height, @out_width, @pool_height, @pool_width, @strides)
         col = col.reshape(x.shape[0] * @out_height * @out_width * x.shape[1], @pool_height * @pool_width)
@@ -311,7 +319,8 @@ module DNN
         dmax = SFloat.zeros(dout.size * pool_size)
         dmax[@max_index] = dout.flatten
         dcol = dmax.reshape(dout.shape[0..2].reduce(:*), dout.shape[3] * pool_size)
-        col2im(dcol, @x_shape, @out_height, @out_width, @pool_height, @pool_width, @strides)
+        dx = col2im(dcol, @x_shape, @out_height, @out_width, @pool_height, @pool_width, @strides)
+        @padding ? back_padding(dx, @padding) : dx
       end
     
       def shape

data/lib/dnn/core/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

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