nn 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a22a2db0abf0ff95fda30fcfdc92ec12847bd033b544cdb87ce007f69cb9f760
-  data.tar.gz: 91528c11fa35c99e0a3b0d84b863266a0107e810d8493d0489f6c7c372483fbe
+  metadata.gz: dae759f927b41bad2f29c7d4739cf198cf0080e7054d2e8276d518db94bb33f3
+  data.tar.gz: 99594955a3e1d8801a2415413387cc9ca86b068a25e3f079ce15d19226318952
 SHA512:
-  metadata.gz: d6cf94cf86c9c0e160f369466a146b18b5114bafff755ed6ff4cb88a98898727fb67a94ce04a117b3d90761028be57777e7fb7effdca01a023586ba6a84cd1f1
-  data.tar.gz: 27cf471cece4749dea22e2a470d5e342fd33de689ff38191cfc0445a6df3655b0da5f91552766fbd2db10e0ba3bd7a17997a863a2811db2b937bddaea5dc5a60
+  metadata.gz: 2612677d78320574f714002006b8be85f5abe5d0b0eb107dbb83d8be67eebc99f077c62771325f4d06e372ba54e4a60f9f1c7edbb5bea3214a610790502e9b0e
+  data.tar.gz: 36268d75d8b43bf9d3fc7442d4d3b15ca93f45bb585e0fd73f6967586ba576ebbadbeed957ef59c731ce76daf40159441c6684c26238e3e6e53a1ca659e7fc7f

data/document.txt

@@ -151,5 +151,6 @@ http://d.hatena.ne.jp/n_shuyo/20090913/mnist
 2018/5/4  バージョン1.8公開
 2018/5/16 バージョン2.0公開
 2018/6/10 バージョン2.0.1公開
-2018/6/10 バージョン2.1.0公開
-2018/6/10 バージョン2.2.0公開
+2018/6/17 バージョン2.1.0公開
+2018/6/17 バージョン2.2.0公開
+2018/6/24 バージョン2.3.0公開

data/lib/nn.rb

@@ -2,7 +2,7 @@ require "numo/narray"
 require "json"
 
 class NN
-  VERSION = "2.2"
+  VERSION = "2.3"
 
   include Numo
 
@@ -124,17 +124,17 @@ class NN
   end
 
   def learn(x_train, y_train, &block)
-    x = SFloat.zeros(@batch_size, @num_nodes.first)
-    y = SFloat.zeros(@batch_size, @num_nodes.last)
-    @batch_size.times do |i|
-      if x_train.is_a?(SFloat)
-        r = rand(x_train.shape[0])
-        x[i, true] = x_train[r, true]
-        y[i, true] = y_train[r, true]
-      else
-        r = rand(x_train.length)
-        x[i, true] = SFloat.cast(x_train[r])
-        y[i, true] = SFloat.cast(y_train[r])
+    if x_train.is_a?(SFloat)
+      indexes = (0...x_train.shape[0]).to_a.sample(@batch_size)
+      x = x_train[indexes, true]
+      y = y_train[indexes, true]
+    else
+      indexes = (0...x_train.length).to_a.sample(@batch_size)
+      x = SFloat.zeros(@batch_size, @num_nodes.first)
+      y = SFloat.zeros(@batch_size, @num_nodes.last)
+      @batch_size.times do |i|
+        x[i, true] = SFloat.cast(x_train[indexes[i]])
+        y[i, true] = SFloat.cast(y_train[indexes[i]])
       end
     end
     x, y = block.call(x, y) if block
@@ -415,14 +415,12 @@ class NN::BatchNorm
   end
 
   def forward(x)
-    @x = x
     @mean = x.mean(0)
     @xc = x - @mean
     @var = (@xc ** 2).mean(0)
     @std = NMath.sqrt(@var + 1e-7)
     @xn = @xc / @std
-    out = @nn.gammas[@index] * @xn + @nn.betas[@index]
-    out.reshape(*@x.shape)
+    @nn.gammas[@index] * @xn + @nn.betas[@index]
   end
 
   def backward(dout)
@@ -434,7 +432,6 @@ class NN::BatchNorm
     dvar = 0.5 * dstd / @std
     dxc += (2.0 / @nn.batch_size) * @xc * dvar
     dmean = dxc.sum(0)
-    dx = dxc - dmean / @nn.batch_size
-    dx.reshape(*@x.shape)
+    dxc - dmean / @nn.batch_size
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nn
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 2018-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby用ニューラルネットワークライブラリ