nn 1.6 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8afd54182615146fe3023709fdcecdbdf8ef1857e048611efcde6abab91f00fc
-  data.tar.gz: 4d1f66eadf5c5c33ba416d30a7898af4f999c5a541d6018d914f10b3d0840285
+  metadata.gz: ac474651871e2134d4e2372cf8254d21f3e2e6e53173d9b0a2897e72a5c20979
+  data.tar.gz: fe0813922ccb9f7a1351d9bc4a7377ed99c7ff4e4140b537074a7540afe8ed69
 SHA512:
-  metadata.gz: de6ec3e4db6512fb71d20ac10db29eae197a57e5893befce8ab3493d2a4f22fc1d6b0a4c7779ff2031114d3541068c5095da32b35daad35348e50c0209794b87
-  data.tar.gz: 6f0aa482117bd51dcc255e923450646dbf5ae2df3506b1da466a162285824b3924602b79f19aaf255b6bf741f3fc706ab0c5daccf8aef1c7353e3087a0efb9cf
+  metadata.gz: 9b84f7be4c0aa1b0bf00d24b3e5e7df1f47cc4c73174a4b54c9d8b1e691db414c95ed174213b3aa7275d26752684cb9cd927d6b2e879951e1f278deb15727010
+  data.tar.gz: 7b50ce21afdb88cd306d1e38fa1c7718740cdc313e2ed669558f1d251c439cc939d996fe85cf76b4b16d9b902ebacecf343b81065fc4b0ccc84578d64400d948

data/document.txt

@@ -35,7 +35,7 @@ initialize(num_nodes,
            learning_rate: 0.01,
            batch_size: 1,
            activation: [:relu, :identity],
-           momentum: 0.9,
+           momentum: 0,
            weight_decay: 0,
            use_dropout: false,
            dropout_ratio: 0.5,
@@ -211,4 +211,5 @@ end
 2018/3/14 バージョン1.3公開
 2018/3/18 バージョン1.4公開
 2018/3/22 バージョン1.5公開
-2018/4/15 バージョン1.6公開
+2018/4/15 バージョン1.6公開
+2018/5/4  バージョン1.8公開

data/lib/nn.rb

@@ -2,7 +2,7 @@ require "numo/narray"
 require "json"
 
 class NN
-  VERSION = "1.6"
+  VERSION = "1.8"
 
   include Numo
 
@@ -22,7 +22,7 @@ class NN
                  learning_rate: 0.01,
                  batch_size: 1,
                  activation: %i(relu identity),
-                 momentum: 0.9,
+                 momentum: 0,
                  weight_decay: 0,
                  use_dropout: false,
                  dropout_ratio: 0.5,
@@ -79,7 +79,7 @@ class NN
         loss = learn(x_train, y_train, &block)
         if loss.nan?
           puts "loss is nan"
-          break
+          return
         end
       end
       if save_dir && epoch % save_interval == 0
@@ -112,6 +112,7 @@ class NN
       y = SFloat.zeros(@batch_size, @num_nodes.last)
       @batch_size.times do |j|
         k = i * @batch_size + j
+        break if k >= num_test_data
         if x_test.is_a?(SFloat)
           x[j, true] = x_test[k, true]
           y[j, true] = y_test[k, true]
@@ -216,7 +217,6 @@ class NN
     @beta_amounts = Array.new(@num_nodes.length - 2, 0)
   end
 
-
   def init_layers
     @layers = []
     @num_nodes[0...-2].each_index do |i|

data/lib/nn/cifar10.rb

@@ -0,0 +1,53 @@
+module CIFAR10
+  def self.load_train(index)
+    if File.exist?("CIFAR-10-train#{index}.marshal")
+      marshal = File.binread("CIFAR-10-train#{index}.marshal")
+      return Marshal.load(marshal)
+    end
+    bin = File.binread("#{dir}/data_batch_#{index}.bin")
+    datasets = bin.unpack("C*")
+    x_train = []
+    y_train = []
+    loop do
+      label = datasets.shift
+      break unless label
+      x_train << datasets.slice!(0, 3072)
+      y_train << label
+    end
+    train = [x_train, y_train]
+    File.binwrite("CIFAR-10-train#{index}.marshal", Marshal.dump(train))
+    train
+  end
+
+  def self.load_test
+    if File.exist?("CIFAR-10-test.marshal")
+      marshal = File.binread("CIFAR-10-test.marshal")
+      return Marshal.load(marshal)
+    end
+    bin = File.binread("#{dir}/test_batch.bin")
+    datasets = bin.unpack("C*")
+    x_test = []
+    y_test = []
+    loop do
+      label = datasets.shift
+      break unless label
+      x_test << datasets.slice!(0, 3072)
+      y_test << label
+    end
+    test = [x_test, y_test]
+    File.binwrite("CIFAR-10-test.marshal", Marshal.dump(test))
+    test
+  end
+
+  def self.categorical(y_data)
+    y_data = y_data.map do |label|
+      classes = Array.new(10, 0)
+      classes[label] = 1
+      classes
+    end
+  end
+
+  def self.dir
+    "cifar-10-batches-bin"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nn
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.8'
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -59,7 +59,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,6 +67,7 @@ files:
 - bin/setup
 - document.txt
 - lib/nn.rb
+- lib/nn/cifar10.rb
 - lib/nn/mnist.rb
 - nn.gemspec
 homepage: https://github.com/unagiootoro/nn.git

data/.gitignore

@@ -1,8 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/