ruby-dnn 0.16.2 → 1.0.0

data/lib/dnn/core/link.rb

@@ -1,15 +1,15 @@
 module DNN
   class Link
     attr_accessor :prev
-    attr_accessor :layer
+    attr_accessor :layer_node
 
-    def initialize(prev = nil, layer = nil)
+    def initialize(prev = nil, layer_node = nil)
       @prev = prev
-      @layer = layer
+      @layer_node = layer_node
     end
 
     def backward(dy = Numo::SFloat[1])
-      dy = @layer.backward(dy)
+      dy = @layer_node.backward_node(dy)
       @prev&.backward(dy)
     end
   end
@@ -17,16 +17,16 @@ module DNN
   class TwoInputLink
     attr_accessor :prev1
     attr_accessor :prev2
-    attr_accessor :layer
+    attr_accessor :layer_node
 
-    def initialize(prev1 = nil, prev2 = nil, layer = nil)
+    def initialize(prev1 = nil, prev2 = nil, layer_node = nil)
       @prev1 = prev1
       @prev2 = prev2
-      @layer = layer
+      @layer_node = layer_node
     end
 
     def backward(dy = Numo::SFloat[1])
-      dys = @layer.backward(dy)
+      dys = @layer_node.backward_node(dy)
       if dys.is_a?(Array)
         dy1, dy2 = *dys
       else

data/lib/dnn/core/losses.rb

@@ -10,7 +10,7 @@ module DNN
         return nil unless hash
         loss_class = DNN.const_get(hash[:class])
         loss = loss_class.allocate
-        raise DNN_Error, "#{loss.class} is not an instance of #{self} class." unless loss.is_a?(self)
+        raise DNNError, "#{loss.class} is not an instance of #{self} class." unless loss.is_a?(self)
         loss.load_hash(hash)
         loss
       end
@@ -21,7 +21,7 @@ module DNN
 
       def loss(y, t, layers = nil)
         unless y.shape == t.shape
-          raise DNN_ShapeError, "The shape of y does not match the t shape. y shape is #{y.shape}, but t shape is #{t.shape}."
+          raise DNNShapeError, "The shape of y does not match the t shape. y shape is #{y.shape}, but t shape is #{t.shape}."
         end
         loss = call(y, t)
         loss = regularizers_forward(loss, layers) if layers
@@ -76,7 +76,7 @@ module DNN
       end
 
       def backward_node(d)
-        (@y - @t) / @y.shape[0]
+        d * (@y - @t) / @y.shape[0]
       end
     end
 
@@ -93,7 +93,7 @@ module DNN
         dy = (@y - @t)
         dy[dy >= 0] = 1
         dy[dy < 0] = -1
-        dy / @y.shape[0]
+        d * dy / @y.shape[0]
       end
     end
 
@@ -109,7 +109,7 @@ module DNN
       def backward_node(d)
         a = Xumo::SFloat.ones(*@a.shape)
         a[@a <= 0] = 0
-        (a * -@t) / a.shape[0]
+        d * (a * -@t) / a.shape[0]
       end
     end
 
@@ -119,8 +119,8 @@ module DNN
       def forward_node(y, t)
         @y = y
         @t = t
-        loss_l1_value = loss_l1(y, t)
-        @loss_value = loss_l1_value > 1 ? loss_l1_value : loss_l2(y, t)
+        loss_l1_value = (y - t).abs.mean(0).sum
+        @loss_value = loss_l1_value > 1 ? loss_l1_value : 0.5 * ((y - t)**2).mean(0).sum
       end
 
       def backward_node(d)
@@ -129,17 +129,7 @@ module DNN
           dy[dy >= 0] = 1
           dy[dy < 0] = -1
         end
-        dy / @y.shape[0]
-      end
-
-      private
-
-      def loss_l1(y, t)
-        (y - t).abs.mean(0).sum
-      end
-
-      def loss_l2(y, t)
-        0.5 * ((y - t)**2).mean(0).sum
+        d * dy / @y.shape[0]
       end
     end
 
@@ -168,7 +158,7 @@ module DNN
       end
 
       def backward_node(d)
-        (@x - @t) / @x.shape[0]
+        d * (@x - @t) / @x.shape[0]
       end
 
       def to_hash
@@ -205,7 +195,7 @@ module DNN
       end
 
       def backward_node(d)
-        (@x - @t) / @x.shape[0]
+        d * (@x - @t) / @x.shape[0]
       end
 
       def to_hash

data/lib/dnn/core/models.rb

@@ -39,23 +39,28 @@ module DNN
     end
 
     class Chain
+      def initialize
+        @layers_cache = nil
+      end
+
       # Forward propagation.
-      # @param [Tensor] input_tensor Input tensor.
+      # @param [Tensor] input_tensors Input tensors.
       # @return [Tensor] Output tensor.
-      def forward(input_tensor)
+      def forward(input_tensors)
         raise NotImplementedError, "Class '#{self.class.name}' has implement method 'forward'"
       end
 
       # Forward propagation and create a link.
-      # @param [Tensor] input_tensor Input tensor.
+      # @param [Tensor | Array] input_tensors Input tensors.
       # @return [Tensor] Output tensor.
-      def call(input_tensor)
-        forward(input_tensor)
+      def call(input_tensors)
+        forward(input_tensors)
       end
 
       # Get the all layers.
       # @return [Array] All layers array.
       def layers
+        return @layers_cache if @layers_cache
         layers_array = []
         instance_variables.sort.each do |ivar|
           obj = instance_variable_get(ivar)
@@ -65,39 +70,7 @@ module DNN
             layers_array.concat(obj.layers)
           end
         end
-        layers_array
-      end
-
-      def to_hash
-        layers_hash = { class: self.class.name }
-        instance_variables.sort.each do |ivar|
-          obj = instance_variable_get(ivar)
-          if obj.is_a?(Layers::Layer) || obj.is_a?(Chain)
-            layers_hash[ivar] = obj.to_hash
-          elsif obj.is_a?(LayersList)
-            layers_hash[ivar] = obj.to_hash_list
-          end
-        end
-        layers_hash
-      end
-
-      def load_hash(layers_hash)
-        instance_variables.sort.each do |ivar|
-          hash_or_array = layers_hash[ivar]
-          if hash_or_array.is_a?(Array)
-            instance_variable_set(ivar, LayersList.from_hash_list(hash_or_array))
-          elsif hash_or_array.is_a?(Hash)
-            obj_class = DNN.const_get(hash_or_array[:class])
-            obj = obj_class.allocate
-            if obj.is_a?(Chain)
-              obj = obj_class.new
-              obj.load_hash(hash_or_array)
-              instance_variable_set(ivar, obj)
-            else
-              instance_variable_set(ivar, Layers::Layer.from_hash(hash_or_array))
-            end
-          end
-        end
+        @layers_cache = layers_array
       end
     end
 
@@ -118,17 +91,16 @@ module DNN
       end
 
       def initialize
+        super
         @optimizer = nil
         @loss_func = nil
         @built = false
         @callbacks = []
-        @layers_cache = nil
         @last_log = {}
       end
 
-      def call(inputs)
-        @layers_cache = nil
-        output_tensor = forward(inputs)
+      def call(input_tensors)
+        output_tensor = forward(input_tensors)
         @built = true unless @built
         output_tensor
       end
@@ -187,8 +159,8 @@ module DNN
                             initial_epoch: 1,
                             test: nil,
                             verbose: true)
-        raise DNN_Error, "The model is not optimizer setup complete." unless @optimizer
-        raise DNN_Error, "The model is not loss_func setup complete." unless @loss_func
+        raise DNNError, "The model is not optimizer setup complete." unless @optimizer
+        raise DNNError, "The model is not loss_func setup complete." unless @loss_func
 
         num_train_datas = train_iterator.num_datas
         num_train_datas = num_train_datas / batch_size * batch_size if train_iterator.last_round_down
@@ -255,8 +227,8 @@ module DNN
       # @param [Numo::SFloat] y Output training data.
       # @return [Float | Numo::SFloat] Return loss value in the form of Float or Numo::SFloat.
       def train_on_batch(x, y)
-        raise DNN_Error, "The model is not optimizer setup complete." unless @optimizer
-        raise DNN_Error, "The model is not loss_func setup complete." unless @loss_func
+        raise DNNError, "The model is not optimizer setup complete." unless @optimizer
+        raise DNNError, "The model is not loss_func setup complete." unless @loss_func
         check_xy_type(x, y)
         call_callbacks(:before_train_on_batch)
         DNN.learning_phase = true
@@ -419,12 +391,15 @@ module DNN
         @built
       end
 
+      # Clean all layers.
       def clean_layers
         layers.each(&:clean)
         @loss_func.clean
         @layers_cache = nil
       end
 
+      # Get parameter data of all layers.
+      # @return [Array] Parameter data.
       def get_all_params_data
         trainable_layers.map do |layer|
           layer.get_params.to_h do |key, param|
@@ -433,6 +408,8 @@ module DNN
         end
       end
 
+      # Set parameter data of all layers.
+      # @param [Array] params_data Parameter data obtained by get_all_params_data.
       def set_all_params_data(params_data)
         trainable_layers.each.with_index do |layer, i|
           params_data[i].each do |(key, data)|

data/lib/dnn/core/monkey_patch.rb

@@ -73,3 +73,13 @@ class Float
     end
   end
 end
+
+if RUBY_VERSION < "2.6.0"
+  class Hash
+    alias dnn__to_h to_h
+    def to_h(&block)
+      dnn__to_h unless block
+      map(&block).to_h
+    end
+  end
+end

data/lib/dnn/core/optimizers.rb

@@ -9,7 +9,7 @@ module DNN
         return nil unless hash
         optimizer_class = DNN.const_get(hash[:class])
         optimizer = optimizer_class.allocate
-        raise DNN_Error, "#{optimizer.class} is not an instance of #{self} class." unless optimizer.is_a?(self)
+        raise DNNError, "#{optimizer.class} is not an instance of #{self} class." unless optimizer.is_a?(self)
         optimizer.load_hash(hash)
         optimizer
       end
@@ -49,7 +49,6 @@ module DNN
       private def clip_grads(params)
         norm = Math.sqrt(params.reduce(0) { |total, param| total + (param.grad**2).sum })
         return if norm <= @clip_norm
-
         rate = @clip_norm / (norm + 1e-7)
         params.each do |param|
           param.grad *= rate

data/lib/dnn/core/param.rb

@@ -18,7 +18,7 @@ module DNN
         elsif @data.shape == grad.shape[1..-1]
           @grad += grad.sum(0)
         else
-          raise DNN_Error, "Shape is missmatch."
+          raise DNNError, "Shape is missmatch."
         end
       else
         @grad = Xumo::SFloat[0]
@@ -34,7 +34,7 @@ module DNN
     end
 
     def -@
-      self * -1
+      Neg.(self)
     end
 
     def +(other)

data/lib/dnn/core/regularizers.rb

@@ -8,7 +8,7 @@ module DNN
         return nil unless hash
         regularizer_class = DNN.const_get(hash[:class])
         regularizer = regularizer_class.allocate
-        raise DNN_Error, "#{regularizer.class} is not an instance of #{self} class." unless regularizer.is_a?(self)
+        raise DNNError, "#{regularizer.class} is not an instance of #{self} class." unless regularizer.is_a?(self)
         regularizer.load_hash(hash)
         regularizer
       end

data/lib/dnn/core/savers.rb

@@ -25,7 +25,7 @@ module DNN
       private def load_bin(bin)
         data = Marshal.load(Zlib::Inflate.inflate(bin))
         unless @model.class.name == data[:class]
-          raise DNN_Error, "Class name is not mismatch. Target model is #{@model.class.name}. But loading model is #{data[:class]}."
+          raise DNNError, "Class name is mismatch. Target model is #{@model.class.name}. But loading model is #{data[:class]}."
         end
         if data[:model]
           data[:model].instance_variables.each do |ivar|
@@ -43,7 +43,7 @@ module DNN
       def load_bin(bin)
         data = JSON.parse(bin, symbolize_names: true)
         unless @model.class.name == data[:class]
-          raise DNN_Error, "Class name is not mismatch. Target model is #{@model.class.name}. But loading model is #{data[:class]}."
+          raise DNNError, "Class name is mismatch. Target model is #{@model.class.name}. But loading model is #{data[:class]}."
         end
         set_all_params_base64_data(data[:params])
       end

data/lib/dnn/core/tensor.rb

@@ -25,7 +25,7 @@ module DNN
     end
 
     def -@
-      self * -1
+      Neg.(self)
     end
 
     def +(other)

data/lib/dnn/datasets/cifar10.rb

@@ -7,7 +7,7 @@ DIR_CIFAR10 = "cifar-10-batches-bin"
 
 module DNN
   module CIFAR10
-    class DNN_CIFAR10_LoadError < DNN_Error; end
+    class DNN_CIFAR10_LoadError < DNNError; end
 
     def self.downloads
       return if Dir.exist?(DOWNLOADS_PATH + "/downloads/" + DIR_CIFAR10)

data/lib/dnn/datasets/cifar100.rb

@@ -7,7 +7,7 @@ DIR_CIFAR100 = "cifar-100-binary"
 
 module DNN
   module CIFAR100
-    class DNN_CIFAR100_LoadError < DNN_Error; end
+    class DNN_CIFAR100_LoadError < DNNError; end
 
     def self.downloads
       return if Dir.exist?(DOWNLOADS_PATH + "/downloads/" + DIR_CIFAR100)

data/lib/dnn/datasets/downloader.rb

@@ -3,7 +3,7 @@ require "net/http"
 module DNN
   DOWNLOADS_PATH = ENV["RUBY_DNN_DOWNLOADS_PATH"] || __dir__
 
-  class DNN_DownloadError < DNN_Error; end
+  class DNN_DownloadError < DNNError; end
 
   class Downloader
     def self.download(url, dir_path = nil)

data/lib/dnn/datasets/fashion-mnist.rb

@@ -5,7 +5,7 @@ require_relative "mnist"
 
 module DNN
   module FashionMNIST
-    class DNN_MNIST_LoadError < DNN_Error; end
+    class DNN_MNIST_LoadError < DNNError; end
 
     URL_BASE = "http://fashion-mnist.s3-website.eu-central-1.amazonaws.com/"
 

data/lib/dnn/datasets/iris.rb

@@ -2,7 +2,7 @@ require "csv"
 require_relative "downloader"
 
 module DNN
-  class DNN_Iris_LoadError < DNN_Error; end
+  class DNN_Iris_LoadError < DNNError; end
 
   module Iris
     URL_CSV = "https://archive.ics.uci.edu/ml/machine-learning-databases/iris/iris.data"

data/lib/dnn/datasets/mnist.rb

@@ -4,7 +4,7 @@ require_relative "downloader"
 
 module DNN
   module MNIST
-    class DNN_MNIST_LoadError < DNN_Error; end
+    class DNN_MNIST_LoadError < DNNError; end
 
     URL_BASE = "http://yann.lecun.com/exdb/mnist/"
 

data/lib/dnn/datasets/stl-10.rb

@@ -7,7 +7,7 @@ DIR_STL10 = "stl10_binary"
 
 module DNN
   module STL10
-    class DNN_STL10_LoadError < DNN_Error; end
+    class DNN_STL10_LoadError < DNNError; end
 
     def self.downloads
       return if Dir.exist?(DOWNLOADS_PATH + "/downloads/" + DIR_STL10)
@@ -49,7 +49,7 @@ module DNN
     end
 
     def self.load_unlabeled(range = 0...100000)
-      raise DNN_Error, "Range must between 0 and 100000. (But the end is excluded)" unless range.begin >= 0 && range.end <= 100000
+      raise DNNError, "Range must between 0 and 100000. (But the end is excluded)" unless range.begin >= 0 && range.end <= 100000
       downloads
       x_fname = DOWNLOADS_PATH + "/downloads/#{DIR_STL10}/unlabeled_X.bin"
       raise DNN_STL10_LoadError, %`file "#{x_fname}" is not found.` unless File.exist?(x_fname)

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.16.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 1.0.0
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray