ruby-dnn 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea912bca075445de925fda876e2b003bf0f63936100a3c14adf58bf810a6a9af
-  data.tar.gz: 41a40ee396cbda27faa7719cfcf2bed5e1337dc2963c1315561e186e05b81d77
+  metadata.gz: 2e04eef16303e2e223bfdb1ac17e2a35fc20d0eafff022f71e412d8b41dc49c9
+  data.tar.gz: d0cd83a209069eba6ea2c48fc6c3480e5edf5b99932b31cb9d7a73adb0eb573d
 SHA512:
-  metadata.gz: 16a12d59eb61b73f76b1361ddf2e5d3e2ca8929d5195f8f8d89299f829fa4a32284d2138ca6b8c4b8c5de5249c18e4a273390e9e80298e52d0e9a8109f4533a8
-  data.tar.gz: 859b180d139bff4f8904c939a41482574b1dd2c972fc83cf42743e078c3e04c28a1f8d740ba20dc970923bcb9411accefa86442fb7b77661de9ae015db1fc6b0
+  metadata.gz: 2b7126723c81495c603a1b98fc64fdd111d4853db78e4f0c840f75e925d60d97a3dd6ba22a9a9e2a8f643562a1284bfe502e38e0e9e4870c7699f16ed151df40
+  data.tar.gz: c1c8900e92ec77a03f46853a9ff14d4b09c8442a597f6ae87d1ee049764a3316e1b7ff92cdb4c13c4b2787d2759ff5c8f6c28c11668503d1d0062a2f671a04b7

data/README.md

@@ -55,7 +55,7 @@ class MLP < Model
     @l3 = Dense.new(10)
   end
 
-  def call(x)
+  def forward(x)
     x = InputLayer.new(784).(x)
     x = @l1.(x)
     x = ReLU.(x)

data/examples/dcgan/dcgan.rb

@@ -63,14 +63,7 @@ class Discriminator < Model
     @l6 = Dense.new(1)
   end
 
-  def forward(x, trainable = true)
-    @l1.trainable = trainable
-    @l2.trainable = trainable
-    @l3.trainable = trainable
-    @l4.trainable = trainable
-    @l5.trainable = trainable
-    @l6.trainable = trainable
-
+  def forward(x)
     x = InputLayer.new([28, 28, 1]).(x)
     x = @l1.(x)
     x = LeakyReLU.(x, 0.2)
@@ -91,6 +84,18 @@ class Discriminator < Model
     x = @l6.(x)
     x
   end
+
+  def enable_training
+    trainable_layers.each do |layer|
+      layer.trainable = true
+    end
+  end
+  
+  def disable_training
+    trainable_layers.each do |layer|
+      layer.trainable = false
+    end
+  end
 end
 
 class DCGAN < Model
@@ -105,7 +110,8 @@ class DCGAN < Model
 
   def forward(x)
     x = @gen.(x)
-    x = @dis.(x, false)
+    @dis.disable_training
+    x = @dis.(x)
     x
   end
 
@@ -115,6 +121,7 @@ class DCGAN < Model
     images = @gen.predict(noise)
     x = x_batch.concatenate(images)
     y = Numo::SFloat.cast([1] * batch_size + [0] * batch_size).reshape(batch_size * 2, 1)
+    @dis.enable_training
     dis_loss = @dis.train_on_batch(x, y)
 
     noise = Numo::SFloat.new(batch_size, 20).rand(-1, 1)

data/examples/iris_example.rb

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

data/examples/pix2pix/dcgan.rb

@@ -97,11 +97,7 @@ class Discriminator < Model
     @bn6 = BatchNormalization.new
   end
 
-  def forward(inputs, trainable = true)
-    trainable_layers.each do |layer|
-      layer.trainable = trainable
-    end
-
+  def forward(inputs)
     input, images = *inputs
     x = InputLayer.new(@gen_input_shape).(input)
     x = @l1_1.(x)
@@ -137,6 +133,18 @@ class Discriminator < Model
     x = @l7.(x)
     x
   end
+
+  def enable_training
+    trainable_layers.each do |layer|
+      layer.trainable = true
+    end
+  end
+  
+  def disable_training
+    trainable_layers.each do |layer|
+      layer.trainable = false
+    end
+  end
 end
 
 class DCGAN < Model
@@ -151,7 +159,8 @@ class DCGAN < Model
 
   def forward(input)
     x = @gen.(input)
-    x = @dis.([input, x], false)
+    @dis.disable_training
+    x = @dis.([input, x])
     x
   end
 end

data/examples/pix2pix/train.rb

@@ -38,6 +38,7 @@ num_batchs = x_in.shape[0] / batch_size
     images = gen.predict(x_in)
     y_real = Numo::SFloat.ones(batch_size, 1)
     y_fake = Numo::SFloat.zeros(batch_size, 1)
+    dis.enable_training
     dis_loss = dis.train_on_batch([x_in, x_out], y_real)
     dis_loss += dis.train_on_batch([x_in, images], y_fake)
 

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

@@ -96,7 +96,7 @@ module DNN
       end
 
       def backward_node(dy)
-        @index * @x**(@index - 1)
+        dy * @index * @x**(@index - 1)
       end
     end
 

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

@@ -60,7 +60,7 @@ module DNN
         xs.shape[1].times do |t|
           x = xs[true, t, false]
           @hidden_layers[t].trainable = @trainable
-          h = @hidden_layers[t].forward_node(x, h)
+          h = @hidden_layers[t].forward(x, h)
           hs[true, t, false] = h
         end
         @hidden.data = h
@@ -77,7 +77,7 @@ module DNN
         dh = 0
         (dh2s.shape[1] - 1).downto(0) do |t|
           dh2 = dh2s[true, t, false]
-          dx, dh = @hidden_layers[t].backward_node(dh2 + dh)
+          dx, dh = @hidden_layers[t].backward(dh2 + dh)
           dxs[true, t, false] = dx
         end
         dxs
@@ -136,9 +136,7 @@ module DNN
       end
     end
 
-    class SimpleRNNDense < Layer
-      include LayerNode
-
+    class SimpleRNNDense
       attr_accessor :trainable
 
       def initialize(weight, recurrent_weight, bias, activation)
@@ -149,7 +147,7 @@ module DNN
         @trainable = true
       end
 
-      def forward_node(x, h)
+      def forward(x, h)
         @x = x
         @h = h
         h2 = x.dot(@weight.data) + h.dot(@recurrent_weight.data)
@@ -157,7 +155,7 @@ module DNN
         @activation.forward_node(h2)
       end
 
-      def backward_node(dh2)
+      def backward(dh2)
         dh2 = @activation.backward_node(dh2)
         if @trainable
           @weight.grad += @x.transpose.dot(dh2)
@@ -230,9 +228,7 @@ module DNN
       end
     end
 
-    class LSTMDense < Layer
-      include LayerNode
-
+    class LSTMDense
       attr_accessor :trainable
 
       def initialize(weight, recurrent_weight, bias)
@@ -247,7 +243,7 @@ module DNN
         @trainable = true
       end
 
-      def forward_node(x, h, c)
+      def forward(x, h, c)
         @x = x
         @h = h
         @c = c
@@ -266,7 +262,7 @@ module DNN
         [h2, c2]
       end
 
-      def backward_node(dh2, dc2)
+      def backward(dh2, dc2)
         dh2_tmp = @tanh_c2 * dh2
         dc2_tmp = @tanh.backward_node(@out * dh2) + dc2
 
@@ -334,7 +330,7 @@ module DNN
         xs.shape[1].times do |t|
           x = xs[true, t, false]
           @hidden_layers[t].trainable = @trainable
-          h, c = @hidden_layers[t].forward_node(x, h, c)
+          h, c = @hidden_layers[t].forward(x, h, c)
           hs[true, t, false] = h
         end
         @hidden.data = h
@@ -353,7 +349,7 @@ module DNN
         dc = 0
         (dh2s.shape[1] - 1).downto(0) do |t|
           dh2 = dh2s[true, t, false]
-          dx, dh, dc = @hidden_layers[t].backward_node(dh2 + dh, dc)
+          dx, dh, dc = @hidden_layers[t].backward(dh2 + dh, dc)
           dxs[true, t, false] = dx
         end
         dxs
@@ -370,8 +366,6 @@ module DNN
     end
 
     class GRUDense < Layer
-      include LayerNode
-
       attr_accessor :trainable
 
       def initialize(weight, recurrent_weight, bias)
@@ -384,7 +378,7 @@ module DNN
         @trainable = true
       end
 
-      def forward_node(x, h)
+      def forward(x, h)
         @x = x
         @h = h
         num_nodes = h.shape[1]
@@ -407,7 +401,7 @@ module DNN
         h2
       end
 
-      def backward_node(dh2)
+      def backward(dh2)
         dtanh_h = @tanh.backward_node(dh2 * (1 - @update))
         dh = dh2 * @update
 

data/lib/dnn/core/link.rb

@@ -8,7 +8,7 @@ module DNN
       @layer = layer
     end
 
-    def backward(dy)
+    def backward(dy = Numo::SFloat[1])
       dy = @layer.backward(dy)
       @prev&.backward(dy)
     end
@@ -25,7 +25,7 @@ module DNN
       @layer = layer
     end
 
-    def backward(dy)
+    def backward(dy = Numo::SFloat[1])
       dys = @layer.backward(dy)
       if dys.is_a?(Array)
         dy1, dy2 = *dys

data/lib/dnn/core/monkey_patch.rb

@@ -1,7 +1,7 @@
 class Integer
   alias dnn__add +
   def +(other)
-    if other.is_a?(DNN::Tensor)
+    if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       DNN::Layers::Add.(self, other)
     else
       dnn__add(other)
@@ -10,7 +10,7 @@ class Integer
 
   alias dnn__sub -
   def -(other)
-    if other.is_a?(DNN::Tensor)
+    if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       DNN::Layers::Sub.(self, other)
     else
       dnn__sub(other)
@@ -19,7 +19,7 @@ class Integer
 
   alias dnn__mul *
   def *(other)
-    if other.is_a?(DNN::Tensor)
+    if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       DNN::Layers::Mul.(self, other)
     else
       dnn__mul(other)
@@ -28,7 +28,7 @@ class Integer
 
   alias dnn__div /
   def /(other)
-    if other.is_a?(DNN::Tensor)
+    if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       DNN::Layers::Div.(self, other)
     else
       dnn__div(other)
@@ -39,7 +39,7 @@ end
 class Float
   alias dnn__add +
   def +(other)
-    if other.is_a?(DNN::Tensor)
+    if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       DNN::Layers::Add.(self, other)
     else
       dnn__add(other)
@@ -48,7 +48,7 @@ class Float
 
   alias dnn__sub -
   def -(other)
-    if other.is_a?(DNN::Tensor)
+    if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       DNN::Layers::Sub.(self, other)
     else
       dnn__sub(other)
@@ -57,7 +57,7 @@ class Float
 
   alias dnn__mul *
   def *(other)
-    if other.is_a?(DNN::Tensor)
+    if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       DNN::Layers::Mul.(self, other)
     else
       dnn__mul(other)
@@ -66,7 +66,7 @@ class Float
 
   alias dnn__div /
   def /(other)
-    if other.is_a?(DNN::Tensor)
+    if other.is_a?(DNN::Tensor) || other.is_a?(DNN::Param)
       DNN::Layers::Div.(self, other)
     else
       dnn__div(other)

data/lib/dnn/core/param.rb

@@ -24,5 +24,37 @@ module DNN
         @grad = Xumo::SFloat[0]
       end
     end
+
+    def shape
+      @data.shape
+    end
+
+    def +@
+      self
+    end
+
+    def -@
+      self * -1
+    end
+
+    def +(other)
+      Layers::Add.(self, other)
+    end
+
+    def -(other)
+      Layers::Sub.(self, other)
+    end
+
+    def *(other)
+      Layers::Mul.(self, other)
+    end
+
+    def /(other)
+      Layers::Div.(self, other)
+    end
+
+    def **(index)
+      Layers::Pow.new(index).(self)
+    end
   end
 end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.16.0"
+  VERSION = "0.16.1"
 end

metadata

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