ruby-dnn 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a0f021b01f03d45c51e52a1147b05703f8da8895380560d4add4fd3f2fc3d90
-  data.tar.gz: 2c5b3b04d23b0285a0acd1fbde3ca4f774948645d016c471264484f45230fa6f
+  metadata.gz: 58ef35a4277a86304c39350b743d308145da921fdc2db4308fa6ed208be47d93
+  data.tar.gz: b8238e52c849e222277284c20723c1a1ab72e70fed409ad1f2962a9ba93190b8
 SHA512:
-  metadata.gz: 33758acb29f83b8523accd213293c84d4b887591926de256e38bd41895f86358c80ee64f2876cd4fb679a9a2c71a64929780149a324dd80020f5b6d397c9a608
-  data.tar.gz: 6a8e95ca8c57a968a846562ad4fa921e382cef83c0839599651ab93ad2d7f6d6cb0c36ada945fb125c0b13e10aa1333030ce019b138146b00e19ed9882237ae7
+  metadata.gz: fd335af25c5d11745960364dc6096f18fbf78387358f5a1b24959328b001e87c3454132960133a74ba9cb81ac90f98e8d2663a9a9492b78d7a8558124471dc44
+  data.tar.gz: 132da9ac8fccee2c0de894543e2800b8066b75e746e4faed609594096e6d894a3938e69c0e1155056aef384dc522d39c647b9dfce8b9a5ceb659716f6ba961f0

data/lib/dnn/core/activations.rb

@@ -66,9 +66,7 @@ module DNN
       end
 
       def backward(dy)
-        dx = Xumo::SFloat.ones(@x.shape)
-        dx[@x <= 0] = 0
-        dy * dx
+        dy * Xumo::SFloat.cast(@x > 0)
       end
     end
 

data/lib/dnn/core/cnn_layers.rb

@@ -353,15 +353,14 @@ module DNN
         x = zero_padding(x, @pad_size) if @padding
         @x_shape = x.shape
         col = im2col(x, *@out_size, *@pool_size, @strides)
-        col = col.reshape(x.shape[0] * @out_size.reduce(:*), @pool_size.reduce(:*), x.shape[3]).transpose(0, 2, 1)
-                 .reshape(x.shape[0] * @out_size.reduce(:*) * x.shape[3], @pool_size.reduce(:*))
+        col = col.reshape(x.shape[0] * @out_size.reduce(:*), @pool_size.reduce(:*), x.shape[3])
         @max_index = col.max_index(1)
         col.max(1).reshape(x.shape[0], *@out_size, x.shape[3])
       end
 
       def backward(dy)
         dmax = Xumo::SFloat.zeros(dy.size * @pool_size.reduce(:*))
-        dmax[@max_index] = dy.flatten
+        dmax[@max_index.flatten] = dy.flatten
         dcol = dmax.reshape(dy.shape[0..2].reduce(:*), @pool_size.reduce(:*) * dy.shape[3])
         dx = col2im(dcol, @x_shape, *@out_size, *@pool_size, @strides)
         @padding ? zero_padding_bwd(dx, @pad_size) : dx
@@ -374,8 +373,7 @@ module DNN
         x = zero_padding(x, @pad_size) if @padding
         @x_shape = x.shape
         col = im2col(x, *@out_size, *@pool_size, @strides)
-        col = col.reshape(x.shape[0] * @out_size.reduce(:*), @pool_size.reduce(:*), x.shape[3]).transpose(0, 2, 1)
-                 .reshape(x.shape[0] * @out_size.reduce(:*) * x.shape[3], @pool_size.reduce(:*))
+        col = col.reshape(x.shape[0] * @out_size.reduce(:*), @pool_size.reduce(:*), x.shape[3])
         col.mean(1).reshape(x.shape[0], *@out_size, x.shape[3])
       end
 
@@ -436,8 +434,7 @@ module DNN
       def backward(dy)
         in_size = input_shape[0..1]
         col = im2col(dy, *in_size, *@unpool_size, @unpool_size)
-        col = col.reshape(dy.shape[0] * in_size.reduce(:*), @unpool_size.reduce(:*), dy.shape[3]).transpose(0, 2, 1)
-                 .reshape(dy.shape[0] * in_size.reduce(:*) * dy.shape[3], @unpool_size.reduce(:*))
+        col = col.reshape(dy.shape[0] * in_size.reduce(:*), @unpool_size.reduce(:*), dy.shape[3])
         col.sum(1).reshape(dy.shape[0], *in_size, dy.shape[3])
       end
 

data/lib/dnn/core/losses.rb

@@ -120,7 +120,7 @@ module DNN
       end
 
       def self.softmax(y)
-        Xumo::NMath.exp(y) / Xumo::NMath.exp(y).sum(1).reshape(y.shape[0], 1)
+        Xumo::NMath.exp(y) / Xumo::NMath.exp(y).sum(1, keepdims: true)
       end
 
       # @param [Float] eps Value to avoid nan.

data/lib/dnn/core/rnn_layers.rb

@@ -81,7 +81,7 @@ module DNN
         end
         dxs = Xumo::SFloat.zeros(@xs_shape)
         dh = 0
-        (0...dh2s.shape[1]).to_a.reverse.each do |t|
+        (dh2s.shape[1] - 1).downto(0) do |t|
           dh2 = dh2s[true, t, false]
           dx, dh = @layers[t].backward(dh2 + dh)
           dxs[true, t, false] = dx
@@ -341,7 +341,7 @@ module DNN
         dxs = Xumo::SFloat.zeros(@xs_shape)
         dh = 0
         dc = 0
-        (0...dh2s.shape[1]).to_a.reverse.each do |t|
+        (dh2s.shape[1] - 1).downto(0) do |t|
           dh2 = dh2s[true, t, false]
           dx, dh, dc = @layers[t].backward(dh2 + dh, dc)
           dxs[true, t, false] = dx

data/lib/dnn/core/savers.rb

@@ -55,10 +55,10 @@ module DNN
       end
 
       def base64_to_params_data(base64_params_data)
-        params_data = base64_params_data.map { |key, (shape, base64_data)|
+        params_data = base64_params_data.to_h do |key, (shape, base64_data)|
           bin = Base64.decode64(base64_data)
           [key, Xumo::SFloat.from_binary(bin).reshape(*shape)]
-        }.to_h
+        end
         set_all_params_data(params_data)
       end
     end
@@ -94,7 +94,7 @@ module DNN
         all_params = @model.has_param_layers.uniq.map { |layer|
           layer.get_params.values
         }.flatten
-        all_params.map { |param| [param.name, param.data] }.to_h
+        all_params.to_h { |param| [param.name, param.data] }
       end
     end
 
@@ -127,10 +127,10 @@ module DNN
       end
 
       def params_data_to_base64
-        get_all_params_data.map { |key, data|
+        get_all_params_data.to_h do |key, data|
           base64_data = Base64.encode64(data.to_binary)
           [key, [data.shape, base64_data]]
-        }.to_h
+        end
       end
     end
 

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-15 00:00:00.000000000 Z
+date: 2019-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray