ruby-dnn 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63b7cd17090ec6fd4e1f23e6b40f3c41e8a31ad0fa887945bda962a6df305c1b
-  data.tar.gz: b7e173f392c73e8151bde633d61913e8ce1645aaf9acc3a48788a950890d6ca4
+  metadata.gz: '081852bef9d80484e000f4c67e2be9d7b7b5e4c4c72500800ab80ba6a56322e7'
+  data.tar.gz: 8365b770fabd3a021ea7472058569be62fa9ef7d4f459a2220a614b2e213c8ed
 SHA512:
-  metadata.gz: c35a8a90216f42fcd8f88b4d4ee6f98fa517c5c2c8aaa6e61eeb8c260b176966c979e0e25311c6c4d0237e89f5e9c0f39eb056f1fad37f5fbaeeff7d0a4e1739
-  data.tar.gz: d2905e0b21c2dd2911cd985e490425be1909fed26e66e63b357aff7d657c2c86099653b1cdff8910171a7f1302029b2aa1f5f63f850b2a3f3d398e2325982475
+  metadata.gz: c3ee7b5203c8cb70e4cbd375d6c53f4a61e54d73aafc77582acc61fd2dd11b8a54642264ef70eaf4f02385b53d62303c0c0ca56de68ddfc2f80a39ca343953d8
+  data.tar.gz: d26ef9bf7040e200fd9ed3673fab1538432f1174669cbbe944a8c6566736a5ea7f8a355d0a0672e3b1f51a6e0e1cdf94f8df5b836a2b2b2ce7370160c7a6066d

data/API-Reference.ja.md

@@ -2,7 +2,7 @@
 ruby-dnnのAPIリファレンスです。このリファレンスでは、APIを利用するうえで必要となるクラスとメソッドしか記載していません。
 そのため、プログラムの詳細が必要な場合は、ソースコードを参照してください。
 
-最終更新バージョン:0.8.6
+最終更新バージョン:0.8.7
 
 # module DNN
 ruby-dnnの名前空間をなすモジュールです。
@@ -698,7 +698,7 @@ Float alpha
 ### arguments
 * HasParamLayer layer  
 更新対象のパラメータを持つレイヤーを指定します。
-* LearningParam param  
+* Param param  
 更新するパラメータです。
 
 

data/examples/cifar10_example.rb

@@ -17,8 +17,8 @@ x_test = Numo::SFloat.cast(x_test)
 x_train /= 255
 x_test /= 255
 
-y_train = DNN::Util.to_categorical(y_train, 10)
-y_test = DNN::Util.to_categorical(y_test, 10)
+y_train = DNN::Util.to_categorical(y_train, 10, Numo::SFloat)
+y_test = DNN::Util.to_categorical(y_test, 10, Numo::SFloat)
 
 model = Model.new
 

data/examples/mnist_conv2d_example.rb

@@ -17,8 +17,8 @@ x_test = Numo::SFloat.cast(x_test).reshape(x_test.shape[0], 28, 28, 1)
 x_train /= 255
 x_test /= 255
 
-y_train = DNN::Util.to_categorical(y_train, 10)
-y_test = DNN::Util.to_categorical(y_test, 10)
+y_train = DNN::Util.to_categorical(y_train, 10, Numo::SFloat)
+y_test = DNN::Util.to_categorical(y_test, 10, Numo::SFloat)
 
 model = Model.new
 

data/examples/mnist_example.rb

@@ -17,8 +17,8 @@ x_test = Numo::SFloat.cast(x_test).reshape(x_test.shape[0], 784)
 x_train /= 255
 x_test /= 255
 
-y_train = DNN::Util.to_categorical(y_train, 10)
-y_test = DNN::Util.to_categorical(y_test, 10)
+y_train = DNN::Util.to_categorical(y_train, 10, Numo::SFloat)
+y_test = DNN::Util.to_categorical(y_test, 10, Numo::SFloat)
 
 model = Model.new
 

data/examples/mnist_lstm_example.rb

@@ -17,8 +17,8 @@ x_test = Numo::SFloat.cast(x_test).reshape(x_test.shape[0], 28, 28)
 x_train /= 255
 x_test /= 255
 
-y_train = DNN::Util.to_categorical(y_train, 10)
-y_test = DNN::Util.to_categorical(y_test, 10)
+y_train = DNN::Util.to_categorical(y_train, 10, Numo::SFloat)
+y_test = DNN::Util.to_categorical(y_test, 10, Numo::SFloat)
 
 model = Model.new
 

data/lib/dnn.rb

@@ -12,7 +12,7 @@ module DNN; end
 require_relative "dnn/version"
 require_relative "dnn/core/error"
 require_relative "dnn/core/model"
-require_relative "dnn/core/learning_param"
+require_relative "dnn/core/param"
 require_relative "dnn/core/initializers"
 require_relative "dnn/core/layers"
 require_relative "dnn/core/activations"

data/lib/dnn/core/layers.rb

@@ -123,8 +123,8 @@ module DNN
         @bias_initializer = bias_initializer
         @l1_lambda = l1_lambda
         @l2_lambda = l2_lambda
-        @params[:weight] = @weight = LearningParam.new
-        @params[:bias] = @bias = LearningParam.new
+        @params[:weight] = @weight = Param.new
+        @params[:bias] = @bias = Param.new
       end
 
       def lasso
@@ -349,11 +349,11 @@ module DNN
           @std = Xumo::NMath.sqrt(var + 1e-7)
           xn = @xc / @std
           @xn = xn
-          @params[:running_mean] = @momentum * @params[:running_mean] + (1 - @momentum) * mean
-          @params[:running_var] = @momentum * @params[:running_var] + (1 - @momentum) * var
+          @running_mean.data = @momentum * @running_mean.data + (1 - @momentum) * mean
+          @running_var.data = @momentum * @running_var.data + (1 - @momentum) * var
         else
-          xc = x - @params[:running_mean]
-          xn = xc / Xumo::NMath.sqrt(@params[:running_var] + 1e-7)
+          xc = x - @running_mean.data
+          xn = xc / Xumo::NMath.sqrt(@running_var.data + 1e-7)
         end
         @gamma.data * xn + @beta.data
       end
@@ -378,12 +378,10 @@ module DNN
       private
     
       def init_params
-        @params[:gamma] = @gamma = LearningParam.new
-        @params[:beta] = @beta = LearningParam.new
-        @gamma.data = Xumo::SFloat.ones(*shape)
-        @beta.data = Xumo::SFloat.zeros(*shape)
-        @params[:running_mean] = Xumo::SFloat.zeros(*shape)
-        @params[:running_var] = Xumo::SFloat.zeros(*shape)
+        @params[:gamma] = @gamma = Param.new(Xumo::SFloat.ones(*shape))
+        @params[:beta] = @beta = Param.new(Xumo::SFloat.zeros(*shape))
+        @params[:running_mean] = @running_mean = Param.new(Xumo::SFloat.zeros(*shape))
+        @params[:running_var] = @running_var = Param.new(Xumo::SFloat.zeros(*shape))
       end
     end
   end

data/lib/dnn/core/model.rb

@@ -37,7 +37,7 @@ module DNN
         hash_params.each do |key, (shape, base64_param)|
           bin = Base64.decode64(base64_param)
           data = Xumo::SFloat.from_binary(bin).reshape(*shape)
-          if layer.params[key].is_a?(LearningParam)
+          if layer.params[key].is_a?(Param)
             layer.params[key].data = data
           else
             layer.params[key] = data
@@ -68,9 +68,8 @@ module DNN
       has_param_layers = @layers.select { |layer| layer.is_a?(Layers::HasParamLayer) }
       has_param_layers_params = has_param_layers.map do |layer|
         layer.params.map { |key, param|
-          param = param.data if param.is_a?(LearningParam)
-          base64_param = Base64.encode64(param.to_binary)
-          [key, [param.shape, base64_param]]
+          base64_data = Base64.encode64(param.data.to_binary)
+          [key, [param.data.shape, base64_data]]
         }.to_h
       end
       JSON.dump(has_param_layers_params)

data/lib/dnn/core/optimizers.rb

@@ -37,7 +37,7 @@ module DNN
       end
     
       def update(params)
-        params.select { |key, param| param.is_a?(LearningParam) }.each_value do |param|
+        params.select { |key, param| param.grad }.each_value do |param|
           amount = param.grad * @learning_rate
           if @momentum > 0
             @v[param] ||= 0
@@ -64,7 +64,7 @@ module DNN
       end
     
       def update(params)
-        params.select { |key, param| param.is_a?(LearningParam) }.each_value do |param|
+        params.select { |key, param| param.grad }.each_value do |param|
           @v[param] ||= 0
           amount = param.grad * @learning_rate
           @v[param] = @v[param] * @momentum - amount
@@ -85,7 +85,7 @@ module DNN
       end
     
       def update(params)
-        params.select { |key, param| param.is_a?(LearningParam) }.each_value do |param|
+        params.select { |key, param| param.grad }.each_value do |param|
           @g[param] ||= 0
           @g[param] += param.grad**2
           param.data -= (@learning_rate / Xumo::NMath.sqrt(@g[param] + 1e-7)) * param.grad
@@ -108,7 +108,7 @@ module DNN
       end
     
       def update(params)
-        params.select { |key, param| param.is_a?(LearningParam) }.each_value do |param|
+        params.select { |key, param| param.grad }.each_value do |param|
           @g[param] ||= 0
           @g[param] = @alpha * @g[param] + (1 - @alpha) * param.grad**2
           param.data -= (@learning_rate / Xumo::NMath.sqrt(@g[param] + 1e-7)) * param.grad
@@ -136,7 +136,7 @@ module DNN
       end
 
       def update(params)
-        params.select { |key, param| param.is_a?(LearningParam) }.each_value do |param|
+        params.select { |key, param| param.grad }.each_value do |param|
           @h[param] ||= Xumo::SFloat.zeros(*param.data.shape)
           @s[param] ||= Xumo::SFloat.zeros(*param.data.shape)
           @h[param] = @rho * @h[param] + (1 - @rho) * param.grad**2
@@ -172,7 +172,7 @@ module DNN
       def update(params)
         @iter += 1
         lr = @learning_rate * Math.sqrt(1 - @beta2**@iter) / (1 - @beta1**@iter) 
-        params.select { |key, param| param.is_a?(LearningParam) }.each_value do |param|
+        params.select { |key, param| param.grad }.each_value do |param|
           @m[param] ||= 0
           @v[param] ||= 0
           @m[param] += (1 - @beta1) * (param.grad - @m[param])

data/lib/dnn/core/param.rb

@@ -0,0 +1,9 @@
+class DNN::Param
+  attr_accessor :data
+  attr_accessor :grad
+
+  def initialize(data = nil, grad = nil)
+    @data = data
+    @grad = grad
+  end
+end

data/lib/dnn/core/rnn_layers.rb

@@ -25,7 +25,7 @@ module DNN
         @return_sequences = return_sequences
         @layers = []
         @params[:h] = nil
-        @params[:weight2] = @weight2 = LearningParam.new
+        @params[:weight2] = @weight2 = Param.new
       end
 
       def forward(xs)

data/lib/dnn/lib/cifar10.rb

@@ -1,7 +1,7 @@
-require "open-uri"
 require "zlib"
 require "archive/tar/minitar"
 require_relative "../ext/cifar10_loader/cifar10_loader"
+require_relative "downloader"
 
 URL_CIFAR10 = "https://www.cs.toronto.edu/~kriz/cifar-10-binary.tar.gz"
 CIFAR10_DIR = "cifar-10-batches-bin"
@@ -10,27 +10,19 @@ module DNN
   module CIFAR10
     class DNN_CIFAR10_LoadError < DNN_Error; end
 
-    class DNN_CIFAR10_DownloadError < DNN_Error; end
-
     private_class_method :load_binary
 
     def self.downloads
       return if Dir.exist?(__dir__ + "/" + CIFAR10_DIR)
+      Downloader.download(URL_CIFAR10)
       cifar10_binary_file_name = __dir__ + "/" + URL_CIFAR10.match(%r`.+/(.+)`)[1]
-      puts "Now downloading..."
-      open(URL_CIFAR10, "rb") do |f|
-        File.binwrite(cifar10_binary_file_name, f.read)
-        begin
-          Zlib::GzipReader.open(cifar10_binary_file_name) do |gz|
-            Archive::Tar::Minitar::unpack(gz, __dir__)
-          end
-        ensure
-          File.unlink(cifar10_binary_file_name)
+      begin
+        Zlib::GzipReader.open(cifar10_binary_file_name) do |gz|
+          Archive::Tar::Minitar::unpack(gz, __dir__)
         end
+      ensure
+        File.unlink(cifar10_binary_file_name)
       end
-      puts "The download has ended."
-    rescue => ex
-      raise DNN_CIFAR10_DownloadError.new(ex.message)
     end
 
     def self.load_train

data/lib/dnn/lib/downloader.rb

@@ -0,0 +1,46 @@
+require "net/http"
+
+module DNN
+
+  class DNN_DownloadError < DNN_Error; end
+
+  class Downloader
+    def self.download(url, dir_path = __dir__)
+      Downloader.new(url).download(dir_path)
+    rescue => ex
+      raise DNN_DownloadError.new(ex.message)
+    end
+
+    def initialize(url)
+      @url = url
+      *, @fqdn, @path = *url.match(%r`https?://(.+?)(/.+)`)
+    end
+
+    def download(dir_path)
+      puts %`download "#{@url}"`
+      buf = ""
+      Net::HTTP.start(@fqdn) do |http|
+        content_length = http.head(@path).content_length
+        http.get(@path) do |body_segment|
+          buf << body_segment
+          log = "\r"
+          40.times do |i|
+            if i < buf.size * 40 / content_length
+              log << "="
+            elsif i == buf.size * 40 / content_length
+              log << ">"
+            else
+              log << "_"
+            end
+          end
+          log << "  #{buf.size}/#{content_length}"
+          print log
+        end
+        puts ""
+      end
+      file_name = @path.match(%r`.+/(.+)`)[1]
+      File.binwrite("#{dir_path}/#{file_name}", buf)
+    end
+  end
+
+end

data/lib/dnn/lib/mnist.rb

@@ -1,13 +1,11 @@
-require "open-uri"
 require "zlib"
 require_relative "../core/error"
+require_relative "downloader"
 
 module DNN
   module MNIST
     class DNN_MNIST_LoadError < DNN_Error; end
 
-    class DNN_MNIST_DownloadError < DNN_Error; end
-
     URL_TRAIN_IMAGES = "http://yann.lecun.com/exdb/mnist/train-images-idx3-ubyte.gz"
     URL_TRAIN_LABELS = "http://yann.lecun.com/exdb/mnist/train-labels-idx1-ubyte.gz"
     URL_TEST_IMAGES = "http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz"
@@ -16,12 +14,10 @@ module DNN
     def self.downloads
       return if Dir.exist?(mnist_dir)
       Dir.mkdir(mnist_dir)
-      puts "Now downloading..."
-      download(URL_TRAIN_IMAGES)
-      download(URL_TRAIN_LABELS)
-      download(URL_TEST_IMAGES)
-      download(URL_TEST_LABELS)
-      puts "The download has ended."
+      Downloader.download(URL_TRAIN_IMAGES, mnist_dir)
+      Downloader.download(URL_TRAIN_LABELS, mnist_dir)
+      Downloader.download(URL_TEST_IMAGES, mnist_dir)
+      Downloader.download(URL_TEST_LABELS, mnist_dir)
     end
 
     def self.load_train
@@ -56,14 +52,6 @@ module DNN
 
     private_class_method
 
-    def self.download(url)
-      open(url, "rb") do |f|
-        File.binwrite(url_to_file_name(url), f.read)
-      end
-    rescue => ex
-      raise DNN_MNIST_DownloadError.new(ex.message)
-    end
-
     def self.load_images(file_name)
       images = nil
       Zlib::GzipReader.open(file_name) do |f|

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -111,9 +111,9 @@ files:
 - lib/dnn/core/error.rb
 - lib/dnn/core/initializers.rb
 - lib/dnn/core/layers.rb
-- lib/dnn/core/learning_param.rb
 - lib/dnn/core/model.rb
 - lib/dnn/core/optimizers.rb
+- lib/dnn/core/param.rb
 - lib/dnn/core/rnn_layers.rb
 - lib/dnn/core/util.rb
 - lib/dnn/ext/cifar10_loader/cifar10_loader.c
@@ -123,6 +123,7 @@ files:
 - lib/dnn/ext/rb_stb_image/stb_image.h
 - lib/dnn/ext/rb_stb_image/stb_image_write.h
 - lib/dnn/lib/cifar10.rb
+- lib/dnn/lib/downloader.rb
 - lib/dnn/lib/image.rb
 - lib/dnn/lib/mnist.rb
 - lib/dnn/version.rb

data/lib/dnn/core/learning_param.rb

@@ -1,4 +0,0 @@
-class DNN::LearningParam
-  attr_accessor :data
-  attr_accessor :grad
-end