nn 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fd7f6dd2b015169de254f1fc68d8566a5ffa7e14bfc8bd9581239c96a6f6965
-  data.tar.gz: 232ee0dbbd7a16fce35e56e58ea40b79dc76b066a2c93dff576d48a34958ab66
+  metadata.gz: 8e26103663135846646308af8fa48851d0f56d34122bfdb6172e1a8bd4675bdf
+  data.tar.gz: cffd4270bae567540673a1ec327ea416b14c3794172b7db3c589c0053bf15466
 SHA512:
-  metadata.gz: 6323e2716a4ef835665b8955ce699ee5843649dfbaa469257d4b164c2702f39a508f2034510c001785e671dd781e36b4afc863f16d1305865114925876aa807a
-  data.tar.gz: da603d96fc83ab378cd34233624487b39fbd137037af5e4ca2d306a5c63cafc2193585d94405fb3f624ab7f9749e8587e86fc842a7cb5845e37001c70476f122
+  metadata.gz: abaa7793eb7e44cd44d9f49f63d7cd252f01e11e4c41d7e709cf6c8124b923d300ff6c2e2b07f410f4dbeaaa8f53a82f876e22582681ec4178364110128726ab
+  data.tar.gz: c8f830238afd0a767f5cc34a7be600c2fc481c591f8f8f433c13d0ad9647011e49f3b0ff4b87d5784a0c8ce2c01552445dc1540e252321cd856eea23c4a6f84d

data/document.txt

@@ -13,6 +13,11 @@ class NN
 
 <クラスメソッド>
 load(file_name) : NN
+Marshal形式で保存された学習結果を読み込みます。
+  String file_name  読み込むMarshalファイル名
+  戻り値  NNのインスタンス
+
+load_json(file_name) : NN
 JSON形式で保存された学習結果を読み込みます。
   String file_name  読み込むJSONファイル名
   戻り値  NNのインスタンス
@@ -109,6 +114,10 @@ run(x) : SFloat
   戻り値  出力ノードの値
 
 save(file_name) : void
+学習結果をMarshal形式で保存します。
+  String file_name  書き込むMarshalファイル名
+
+save_json(file_name) : void
 学習結果をJSON形式で保存します。
   String file_name  書き込むJSONファイル名
 
@@ -142,3 +151,4 @@ 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公開

data/lib/nn.rb

@@ -2,7 +2,7 @@ require "numo/narray"
 require "json"
 
 class NN
-  VERSION = "2.0"
+  VERSION = "2.1"
 
   include Numo
 
@@ -44,6 +44,10 @@ class NN
   end
 
   def self.load(file_name)
+    Marshal.load(File.binread(file_name))
+  end
+
+  def self.load_json(file_name)
     json = JSON.parse(File.read(file_name))
     nn = self.new(json["num_nodes"],
       learning_rate: json["learning_rate"],
@@ -150,6 +154,10 @@ class NN
   end
 
   def save(file_name)
+    File.binwrite(file_name, Marshal.dump(self))
+  end
+
+  def save_json(file_name)
     json = {
       "version" => VERSION,
       "num_nodes" => @num_nodes,
@@ -240,8 +248,8 @@ class NN
 
   def update_weight_and_bias
     @layers.select{|layer| layer.is_a?(Affine)}.each.with_index do |layer, i|
-      weight_amount = layer.d_weight.mean(0) * @learning_rate
-      bias_amount = layer.d_bias.mean * @learning_rate
+      weight_amount = layer.d_weight * @learning_rate
+      bias_amount = layer.d_bias * @learning_rate
       if @momentum > 0
         weight_amount += @momentum * @weight_amounts[i]
         @weight_amounts[i] = weight_amount
@@ -255,8 +263,8 @@ class NN
 
   def update_gamma_and_beta
     @layers.select{|layer| layer.is_a?(BatchNorm)}.each.with_index do |layer, i|
-      gamma_amount = layer.d_gamma.mean * @learning_rate
-      beta_amount = layer.d_beta.mean * @learning_rate
+      gamma_amount = layer.d_gamma * @learning_rate
+      beta_amount = layer.d_beta * @learning_rate
       if @momentum > 0
         gamma_amount += @momentum * @gamma_amounts[i]
         @gamma_amounts[i] = gamma_amount
@@ -290,20 +298,22 @@ class NN::Affine
 
   def backward(dout)
     x = @x.reshape(*@x.shape, 1)
-    @d_weight = x.dot(dout.reshape(dout.shape[0], 1, dout.shape[1]))
+    @d_weight = x.dot(dout.reshape(dout.shape[0], 1, dout.shape[1])).mean(0)
     if @nn.weight_decay > 0
       dridge = @nn.weight_decay * @nn.weights[@index]
       @d_weight += dridge
     end
-    @d_bias = dout
+    @d_bias = dout.mean
     dout.dot(@nn.weights[@index].transpose)
   end
 end
 
 
 class NN::Sigmoid
+  include Numo
+
   def forward(x)
-    @out = 1.0 / (1 + Numo::NMath.exp(-x))
+    @out = 1.0 / (1 + NMath.exp(-x))
   end
 
   def backward(dout)
@@ -328,8 +338,6 @@ end
 
 
 class NN::Identity
-  include Numo
-
   def initialize(nn)
     @nn = nn
   end
@@ -419,8 +427,8 @@ class NN::BatchNorm
   end
 
   def backward(dout)
-    @d_beta = dout.sum(0)
-    @d_gamma = (@xn * dout).sum(0)
+    @d_beta = dout.sum(0).mean
+    @d_gamma = (@xn * dout).sum(0).mean
     dxn = @nn.gammas[@index] * dout
     dxc = dxn / @std
     dstd = -((dxn * @xc) / (@std ** 2)).sum(0)

data/nn.gemspec

@@ -5,7 +5,7 @@ require "nn"
 
 Gem::Specification.new do |spec|
   spec.name          = "nn"
-  spec.version       = NN::VERSION + ".1"
+  spec.version       = NN::VERSION + ".0"
   spec.authors       = ["unagiootoro"]
   spec.email         = ["ootoro838861@outlook.jp"]
 

data/sample/cifar10_program.rb

@@ -32,7 +32,7 @@ func = -> x, y do
   [x, y]
 end
 
-nn.train(x_train, y_train, 50, func) do |epoch|
+nn.train(x_train, y_train, 20, func) do |epoch|
   nn.test(x_test, y_test, &func)
   nn.learning_rate *= 0.99
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nn
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - unagiootoro