ruby-dnn 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62482330aab914fc53313fa7a1170a53ea3644e72dfe1cecb2fffca1160f6f7e
-  data.tar.gz: e21d0e28ba2c603179ece6fe9cb2c4722ea8bbaa85c72cc357f8b5fa691e33d0
+  metadata.gz: 97822807b84847cb2ad475bef5dd65329ae0c699847c577eb8b30a2be0425ec0
+  data.tar.gz: 6871849ea256e466f4d10e354c5e7698247be8328c17e540e5d4b35adf46ee27
 SHA512:
-  metadata.gz: 5f7a34efbba1465aa4e245b83928bbbe764d67708e9e6c3faef7030b13873dc27f775adbf8b32b0f3015280f1b3bbb600a1e4c4bff9c1a5be40387217efc2e26
-  data.tar.gz: 9bba32d0b4142df90ab07b75191bb7590fa000f38470f9d9149f4cd95c346f5ba90fbf4549d714dee5374d1024184cf45eb61bcd1ba3e10e1ab0aa5eda398011
+  metadata.gz: aa8fb779d8cec6e4acd1ce63a952f626eceae801ee7e16045a890412d8b9189e95d3798c9d840ab07de4afe517ebeac9230391e193b24cedb316927bda4726c9
+  data.tar.gz: 16aa82f8e009eca027e693adb3fb543046376f11539b881a65ef29dd484b8225b34c17ee3171d72a6a9b2a3712b8463630deac778f1a851830df6ed53b7feca8

data/README.md

@@ -4,7 +4,7 @@
 
 ruby-dnn is a ruby deep learning library. This library supports full connected neural network and convolution neural network
 and recurrent neural network.
-Currently, you can get 99% accuracy with MNIST and 78% with CIFAR 10.
+Currently, you can get 99% accuracy with MNIST and 82% with CIFAR 10.
 
 ## Installation
 
@@ -43,7 +43,6 @@ model.setup(Adam.new, SoftmaxCrossEntropy.new)
 
 model.train(x_train, y_train, 10, batch_size: 128, test: [x_test, y_test])
 
-
 accuracy, loss = model.evaluate(x_test, y_test)
 puts "accuracy: #{accuracy}"
 puts "loss: #{loss}"

data/examples/iris_example.rb

@@ -42,7 +42,7 @@ end
     out = net.(x, y)
     loss = lf.(out, y)
     loss.link.backward
-    puts "epoch: #{epoch}, step: #{step}, loss = #{loss.data}"
+    puts "epoch: #{epoch}, step: #{step}, loss = #{loss.data.to_f}"
     opt.update([w1, b1, w2, b2])
   end
 end

data/lib/dnn/core/layers/basic_layers.rb

@@ -8,7 +8,7 @@ module DNN
         y = forward_node(x)
         link = Link.new(prev, self)
         prev.next = link if prev.is_a?(Link)
-        Tensor.new(y, link)
+        Tensor.convert(y, link)
       end
 
       def forward_node(x)
@@ -46,7 +46,7 @@ module DNN
       # @param [Tensor | Param] input Input tensor or param.
       # @return [Tensor] Output tensor.
       def call(input)
-        input = Tensor.new(input) if !input.is_a?(Tensor) && !input.is_a?(Param)
+        input = Tensor.convert(input) if !input.is_a?(Tensor) && !input.is_a?(Param)
         build(input.data.shape[1..-1]) unless built?
         forward(input)
       end

data/lib/dnn/core/layers/math_layers.rb

@@ -1,5 +1,50 @@
 module DNN
   module Layers
+    module MathUtils
+      def self.align_ndim(shape1, shape2)
+        if shape1.length < shape2.length
+          shape2.length.times do |axis|
+            unless shape1[axis] == shape2[axis]
+              shape1.insert(axis, 1)
+            end
+          end
+        elsif shape1.length > shape2.length
+          shape1.length.times do |axis|
+            unless shape1[axis] == shape2[axis]
+              shape2.insert(axis, 1)
+            end
+          end
+        end
+        [shape1, shape2]
+      end
+
+      def self.broadcast_to(x, target_shape)
+        return x if x.shape == target_shape
+        x_shape, target_shape = align_ndim(x.shape, target_shape)
+        x = x.reshape(*x_shape)
+        x_shape.length.times do |axis|
+          unless x.shape[axis] == target_shape[axis]
+            tmp = x
+            (target_shape[axis] - 1).times do
+              x = x.concatenate(tmp, axis: axis)
+            end
+          end
+        end
+        x
+      end
+
+      def self.sum_to(x, target_shape)
+        return x if x.shape == target_shape
+        x_shape, target_shape = align_ndim(x.shape, target_shape)
+        x = x.reshape(*x_shape)
+        x_shape.length.times do |axis|
+          unless x.shape[axis] == target_shape[axis]
+            x = x.sum(axis: axis, keepdims: true)
+          end
+        end
+        x
+      end
+    end
 
     class Neg < Layer
       include LayerNode
@@ -17,11 +62,15 @@ module DNN
       include MergeLayerNode
 
       def forward_node(x1, x2)
+        @x1_shape = x1.shape
+        @x2_shape = x2.shape
         x1 + x2
       end
 
       def backward_node(dy)
-        [dy, dy]
+        dx1 = MathUtils.sum_to(dy, @x1_shape)
+        dx2 = MathUtils.sum_to(dy, @x2_shape)
+        [dx1, dx2]
       end
     end
 
@@ -29,11 +78,15 @@ module DNN
       include MergeLayerNode
 
       def forward_node(x1, x2)
+        @x1_shape = x1.shape
+        @x2_shape = x2.shape
         x1 - x2
       end
 
       def backward_node(dy)
-        [dy, -dy]
+        dx1 = MathUtils.sum_to(dy, @x1_shape)
+        dx2 = MathUtils.sum_to(-dy, @x2_shape)
+        [dx1, dx2]
       end
     end
 
@@ -46,7 +99,9 @@ module DNN
       end
 
       def backward_node(dy)
-        [dy * @x2, dy * @x1]
+        dx1 = MathUtils.sum_to(dy * @x2, @x1.shape)
+        dx2 = MathUtils.sum_to(dy * @x1, @x2.shape)
+        [dx1, dx2]
       end
     end
 
@@ -59,8 +114,8 @@ module DNN
       end
 
       def backward_node(dy)
-        dx1 = dy / @x2
-        dx2 = dy * -(@x1 / @x2**2)
+        dx1 = MathUtils.sum_to(dy / @x2, @x1.shape)
+        dx2 = MathUtils.sum_to(dy * -(@x1 / @x2**2), @x2.shape)
         [dx1, dx2]
       end
     end

data/lib/dnn/core/layers/merge_layers.rb

@@ -9,7 +9,7 @@ module DNN
         prev2 = (input2.is_a?(Tensor) ? input2.link : input2)
         y = forward_node(x1, x2)
         link = TwoInputLink.new(prev1, prev2, self)
-        Tensor.new(y, link)
+        Tensor.convert(y, link)
       end
 
       def backward(dy)
@@ -31,8 +31,8 @@ module DNN
       end
 
       def call(input1, input2)
-        input1 = Tensor.new(input1) if !input1.is_a?(Tensor) && !input1.is_a?(Param)
-        input2 = Tensor.new(input2) if !input2.is_a?(Tensor) && !input2.is_a?(Param)
+        input1 = Tensor.convert(input1) if !input1.is_a?(Tensor) && !input1.is_a?(Param)
+        input2 = Tensor.convert(input2) if !input2.is_a?(Tensor) && !input2.is_a?(Param)
         if input1.data.is_a?(Numo::NArray)
           build(input1.data.shape[1..-1]) unless built?
         else

data/lib/dnn/core/monkey_patch.rb

@@ -2,7 +2,7 @@ class Integer
   alias dnn__add +
   def +(other)
     if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
-      DNN::Layers::Add.(self, other)
+      DNN::Layers::Add.(DNN::Tensor.convert(self), other)
     else
       dnn__add(other)
     end
@@ -11,7 +11,7 @@ class Integer
   alias dnn__sub -
   def -(other)
     if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
-      DNN::Layers::Sub.(self, other)
+      DNN::Layers::Sub.(DNN::Tensor.convert(self), other)
     else
       dnn__sub(other)
     end
@@ -20,7 +20,7 @@ class Integer
   alias dnn__mul *
   def *(other)
     if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
-      DNN::Layers::Mul.(self, other)
+      DNN::Layers::Mul.(DNN::Tensor.convert(self), other)
     else
       dnn__mul(other)
     end
@@ -29,7 +29,7 @@ class Integer
   alias dnn__div /
   def /(other)
     if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
-      DNN::Layers::Div.(self, other)
+      DNN::Layers::Div.(DNN::Tensor.convert(self), other)
     else
       dnn__div(other)
     end
@@ -40,7 +40,7 @@ class Float
   alias dnn__add +
   def +(other)
     if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
-      DNN::Layers::Add.(self, other)
+      DNN::Layers::Add.(DNN::Tensor.convert(self), other)
     else
       dnn__add(other)
     end
@@ -49,7 +49,7 @@ class Float
   alias dnn__sub -
   def -(other)
     if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
-      DNN::Layers::Sub.(self, other)
+      DNN::Layers::Sub.(DNN::Tensor.convert(self), other)
     else
       dnn__sub(other)
     end
@@ -58,7 +58,7 @@ class Float
   alias dnn__mul *
   def *(other)
     if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
-      DNN::Layers::Mul.(self, other)
+      DNN::Layers::Mul.(DNN::Tensor.convert(self), other)
     else
       dnn__mul(other)
     end
@@ -67,7 +67,7 @@ class Float
   alias dnn__div /
   def /(other)
     if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
-      DNN::Layers::Div.(self, other)
+      DNN::Layers::Div.(DNN::Tensor.convert(self), other)
     else
       dnn__div(other)
     end

data/lib/dnn/core/param.rb

@@ -38,18 +38,22 @@ module DNN
     end
 
     def +(other)
+      other = Tensor.convert(other) unless other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       Layers::Add.(self, other)
     end
 
     def -(other)
+      other = Tensor.convert(other) unless other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       Layers::Sub.(self, other)
     end
 
     def *(other)
+      other = Tensor.convert(other) unless other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       Layers::Mul.(self, other)
     end
 
     def /(other)
+      other = Tensor.convert(other) unless other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       Layers::Div.(self, other)
     end
 

data/lib/dnn/core/tensor.rb

@@ -3,11 +3,13 @@ module DNN
     attr_reader :data
     attr_accessor :link
 
-    def self.convert(inputs)
+    def self.convert(inputs, link = nil)
       if inputs.is_a?(Array)
-        inputs.map { |input| Tensor.new(input) }
+        inputs.map { |input| Tensor.new(input, link) }
+      elsif inputs.is_a?(Integer) || inputs.is_a?(Float)
+        Tensor.new(Xumo::SFloat[inputs], link)
       else
-        Tensor.new(inputs)
+        Tensor.new(inputs, link)
       end
     end
 
@@ -33,18 +35,22 @@ module DNN
     end
 
     def +(other)
+      other = Tensor.convert(other) unless other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       Layers::Add.(self, other)
     end
 
     def -(other)
+      other = Tensor.convert(other) unless other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       Layers::Sub.(self, other)
     end
 
     def *(other)
+      other = Tensor.convert(other) unless other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       Layers::Mul.(self, other)
     end
 
     def /(other)
+      other = Tensor.convert(other) unless other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       Layers::Div.(self, other)
     end
 

data/lib/dnn/core/utils.rb

@@ -21,6 +21,14 @@ module DNN
       dnn_class.from_hash(hash)
     end
 
+    # Broadcast to target shape.
+    # @param [Numo::SFloat] x Data to broadcast.
+    # @param [Array] Shape to broadcast.
+    # @return [Numo::SFloat] Broadcasted data.
+    def self.broadcast_to(x, target_shape)
+      Layers::MathUtils.broadcast_to(x, target_shape)
+    end
+
     # Return the result of the sigmoid function.
     def self.sigmoid(x)
       Losses::SigmoidCrossEntropy.sigmoid(x)

data/lib/dnn/keras-model-convertor.rb

@@ -15,6 +15,16 @@ pyfrom :"keras.models", import: :Sequential
 pyfrom :"keras.layers", import: [:Dense, :Dropout, :Conv2D, :Activation, :MaxPooling2D, :Flatten]
 pyfrom :"keras.layers.normalization", import: :BatchNormalization
 
+module DNN
+  module Layers
+    class Softmax < Layer
+      def forward(x)
+        Exp.(x) / Sum.(Exp.(x), axis: 1)
+      end
+    end
+  end
+end
+
 class DNNKerasModelConvertError < DNN::DNNError; end
 
 class KerasModelConvertor
@@ -34,18 +44,21 @@ class KerasModelConvertor
     unless @k_model.__class__.__name__ == "Sequential"
       raise DNNKerasModelConvertError.new("#{@k_model.__class__.__name__} models do not support convert.")
     end
-    dnn_model = DNN::Models::Sequential.new
-    @k_model.layers.each do |k_layer|
-      dnn_layer = layer_convert(k_layer)
-      dnn_model << dnn_layer if dnn_layer
-    end
+    layers = convert_layers(@k_model.layers)
     input_shape = @k_model.layers[0].input_shape.to_a[1..-1]
     input_layer = DNN::Layers::InputLayer.new(input_shape)
     input_layer.build(input_shape)
-    dnn_model.insert(0, input_layer)
+    layers.unshift(input_layer)
+    dnn_model = DNN::Models::Sequential.new(layers)
     dnn_model
   end
 
+  def convert_layers(k_layers)
+    k_layers.map do |k_layer|
+      layer_convert(k_layer)
+    end
+  end
+
   private
 
   def layer_convert(k_layer)
@@ -80,15 +93,15 @@ class KerasModelConvertor
 
   def convert_Activation(k_activation)
     activation_name = k_activation.get_config[:activation].to_s
-    case k_activation.get_config[:activation].to_s
+    activation = case k_activation.get_config[:activation].to_s
     when "sigmoid"
-      activation = DNN::Layers::Sigmoid.new
+       DNN::Layers::Sigmoid.new
     when "tanh"
-      activation = DNN::Layers::Tanh.new
+      DNN::Layers::Tanh.new
     when "relu"
-      activation = DNN::Layers::ReLU.new
+      DNN::Layers::ReLU.new
     when "softmax"
-      return nil
+      DNN::Layers::Softmax.new
     else
       raise DNNKerasModelConvertError.new("#{activation_name} activation do not support convert.")
     end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/ruby-dnn.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "numo-narray"
   spec.add_dependency "archive-tar-minitar"
+  spec.add_dependency "yard"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.7

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-02 00:00:00.000000000 Z
+date: 2020-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement