ruby-dnn 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c34f355a4fdde6dce0cdc8c84f0eb3c670d61aa939b6e33b3c1b21b96ff84e2
-  data.tar.gz: 27362633d8824d7b5a1e765a50c5f248c3bc680ee9261a0cb2e103fde9eca42c
+  metadata.gz: 61defa3dd2c7b95ac7d3c3484789abfc7ec792be0fd4dea728fee628479fcf76
+  data.tar.gz: 12e3a398119eb5a64eec7578b6fb3263dca4a5a1028300ab97b47194766bf65b
 SHA512:
-  metadata.gz: 3fac1e61fffaca5126c4caa488bdadc02d613bd88a368316ce7924b162394d9cc1d9e0b4f8ec6b56078cea5cb23d02e89bed95ac0b0bba4c374290034a3550c2
-  data.tar.gz: 4df5ad737f827fc5ed063be6cc8d22bee34ef95e35c9c5522dc69b7bd453658b0af04b0f6adb1bb7c94d4f52f16d44040ee1097f83e533fa01717f1736a1a8f6
+  metadata.gz: cf23b2ea6cb6d00fa2a6b822c309e0db6677f890be18c43f910aae41ea3fee0342734434f349c98e597620b2729d3a165aa8c135f4ecb94d53343bbe49709f9a
+  data.tar.gz: 44c73b4b066a2026a2fa5d6ca81c52fdefb4c411ac9a241290c254a5071a9aa35d3ad63c71bbe09583980523f24ed8d78988fb37656b098d6896eab267585f16

data/lib/dnn/core/cnn_layers.rb

@@ -114,11 +114,6 @@ module DNN
       def backward(dout)
         dout = dout.reshape(dout.shape[0..2].reduce(:*), dout.shape[3])
         @weight.grad = @col.transpose.dot(dout)
-        if @l1_lambda > 0
-          @weight.grad += dlasso
-        elsif @l2_lambda > 0
-          @weight.grad += dridge
-        end
         @bias.grad = dout.sum(0)
         dcol = dout.dot(@weight.data.transpose)
         dx = col2im(dcol, @x_shape, *@out_size, *@filter_size, @strides)

data/lib/dnn/core/layers.rb

@@ -144,13 +144,17 @@ module DNN
       end
 
       def dlasso
-        dlasso = Xumo::SFloat.ones(*@weight.data.shape)
-        dlasso[@weight.data < 0] = -1
-        @l1_lambda * dlasso
+        if @l1_lambda > 0
+          dlasso = Xumo::SFloat.ones(*@weight.data.shape)
+          dlasso[@weight.data < 0] = -1
+          @weight.grad += @l1_lambda * dlasso
+        end
       end
 
       def dridge
-        @l2_lambda * @weight.data
+        if @l2_lambda > 0
+          @weight.grad += @l2_lambda * @weight.data
+        end
       end
 
       def to_hash(merge_hash)
@@ -197,11 +201,6 @@ module DNN
     
       def backward(dout)
         @weight.grad = @x.transpose.dot(dout)
-        if @l1_lambda > 0
-          @weight.grad += dlasso
-        elsif @l2_lambda > 0
-          @weight.grad += dridge
-        end
         @bias.grad = dout.sum(0)
         dout.dot(@weight.data.transpose)
       end
@@ -270,6 +269,18 @@ module DNN
 
 
     class OutputLayer < Layer
+      # Classes that inherit from this class must implement this method.
+      def loss(x)
+        raise NotImplementedError.new("Class '#{self.class.name}' has implement method 'forward'")
+      end
+
+      def dloss
+        @model.layers.select { |layer| layer.is_a?(Connection) }.each do |layer|
+          layer.dlasso
+          layer.dridge
+        end
+      end
+      
       private
 
       def lasso

data/lib/dnn/core/model.rb

@@ -2,6 +2,7 @@ require "json"
 require "base64"
 
 module DNN
+
   # This class deals with the model of the network.
   class Model
     attr_accessor :layers    # All layers possessed by the model
@@ -162,6 +163,7 @@ module DNN
       forward(x, true)
       loss_value = loss(y)
       backward(y)
+      dloss
       update
       loss_value
     end
@@ -230,6 +232,10 @@ module DNN
     def loss(y)
       @layers[-1].loss(y)
     end
+
+    def dloss
+      @layers[-1].dloss
+    end
   
     def backward(y)
       dout = y
@@ -303,4 +309,5 @@ module DNN
       end
     end
   end
+
 end

data/lib/dnn/core/rnn_layers.rb

@@ -94,24 +94,18 @@ module DNN
         end
       end
 
-      def dlasso
-        dlasso = Xumo::SFloat.ones(*@weight.data.shape)
-        dlasso[@weight.data < 0] = -1
-        @l1_lambda * dlasso
-      end
-
-      def dridge
-        @l2_lambda * @weight.data
-      end
-
       def dlasso2
-        dlasso = Xumo::SFloat.ones(*@weight2.data.shape)
-        dlasso[@weight2.data < 0] = -1
-        @l1_lambda * dlasso
+        if @l1_lambda > 0
+          dlasso = Xumo::SFloat.ones(*@weight2.data.shape)
+          dlasso[@weight2.data < 0] = -1
+          @weight2.grad += @l1_lambda * dlasso
+        end
       end
 
       def dridge2
-        @l2_lambda * @weight2.data
+        if @l2_lambda > 0
+          @weight2.grad += l2_lambda * @weight2.data
+        end
       end
 
       private
@@ -139,13 +133,6 @@ module DNN
         dh2 = @activation.backward(dh2)
         @rnn.weight.grad += @x.transpose.dot(dh2)
         @rnn.weight2.grad += @h.transpose.dot(dh2)
-        if @rnn.l1_lambda > 0
-          @rnn.weight.grad += dlasso
-          @rnn.weight2.grad += dlasso2
-        elsif @rnn.l2_lambda > 0
-          @rnn.weight.grad += dridge
-          @rnn.weight2.grad += dridge2
-        end
         @rnn.bias.grad += dh2.sum(0)
         dx = dh2.dot(@rnn.weight.data.transpose)
         dh = dh2.dot(@rnn.weight2.data.transpose)
@@ -250,13 +237,6 @@ module DNN
 
         @rnn.weight.grad += @x.transpose.dot(da)
         @rnn.weight2.grad += @h.transpose.dot(da)
-        if @rnn.l1_lambda > 0
-          @rnn.weight.grad += dlasso
-          @rnn.weight2.grad += dlasso2
-        elsif @rnn.l2_lambda > 0
-          @rnn.weight.grad += dridge
-          @rnn.weight2.grad += dridge2
-        end
         @rnn.bias.grad += da.sum(0)
         dx = da.dot(@rnn.weight.data.transpose)
         dh = da.dot(@rnn.weight2.data.transpose)
@@ -401,13 +381,6 @@ module DNN
 
         @rnn.weight.grad += Xumo::SFloat.hstack([dweight_a, dweight_h])
         @rnn.weight2.grad += Xumo::SFloat.hstack([dweight2_a, dweight2_h])
-        if @rnn.l1_lambda > 0
-          @rnn.weight.grad += dlasso
-          @rnn.weight2.grad += dlasso2
-        elsif @rnn.l2_lambda > 0
-          @rnn.weight.grad += dridge
-          @rnn.weight2.grad += dridge2
-        end
         @rnn.bias.grad += Xumo::SFloat.hstack([dbias_a, dbias_h])
         [dx, dh]
       end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray