ruby-dnn 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebd331d481ec073102bb4b8c79a6ef280741deaf147a7908ef83f35603f784b9
-  data.tar.gz: c65399f9f29b65be2ffdc179047f58ae17d6b598328163fc45bb2da5f5f64751
+  metadata.gz: b213164ca3e4a7d781a673c4c49ec8dfbd6713468687a98c3739c0cf5629de73
+  data.tar.gz: 92a8133dc0ab085d387199f92c2a602bb3782b810c20a931f7ee8de6e247f2a4
 SHA512:
-  metadata.gz: fb50c04b888f520d441de0643a6c9870be6df0c7e6d5c54f7c2b8e441e339723945f427cef67c51dc4d250bf0f02c20150e0ca47e1c13974fbe19d272f2301fb
-  data.tar.gz: 696f4fcbe01aa29f31ea08d32c7e399789ef841e22bfd77029701f132c10687ea81f25fe56e3044de95e4e8cd4c86b947fc32b257896f4dbcc3c125710d52ab8
+  metadata.gz: ea6652994f71d97142fe7357947701eff5f0c26708698a670a148e995fb10816b75b62b0bd60004d9ea99b6c837e5b599e790982ad12d010394e4ec7d6962135
+  data.tar.gz: 9d474a7bdd120f0e39fcb05e11f0f8370100dd21e79440fe0408bbccf676890726623f516ada78ae6b8829bcf0799ceeea78218f64d74a70ca7f5dd9286bdae3

data/lib/dnn/core/callbacks.rb

@@ -27,7 +27,8 @@ module DNN
 
     # This callback wrap the lambda function.
     class LambdaCallback < Callback
-      def initialize(event, lambda)
+      def initialize(event, lambda = nil, &block)
+        lambda = block unless lambda
         instance_eval do
           define_singleton_method(event) { lambda.call }
         end
@@ -37,15 +38,19 @@ module DNN
     # A callback that save the model at the after of the epoch.
     # @param [String] base_file_name Base file name for saving.
     # @param [Boolean] include_model When set a true, save data included model structure.
+    # @param [Integer] interval Save interval.
     class CheckPoint < Callback
-      def initialize(base_file_name, include_model: true)
+      def initialize(base_file_name, include_model: true, interval: 1)
         @base_file_name = base_file_name
         @include_model = include_model
+        @interval = interval
       end
 
       def after_epoch
         saver = Savers::MarshalSaver.new(@model, include_model: @include_model)
-        saver.save(@base_file_name + "_epoch#{model.last_log[:epoch]}.marshal")
+        if @model.last_log[:epoch] % @interval == 0
+          saver.save(@base_file_name + "_epoch#{model.last_log[:epoch]}.marshal")
+        end
       end
     end
 

data/lib/dnn/core/losses.rb

@@ -17,7 +17,7 @@ module DNN
         end
         loss_value = forward(y, t)
         loss_value += regularizers_forward(layers) if layers
-        loss_value.is_a?(Float) ? loss_value : loss_value.sum
+        loss_value
       end
 
       def forward(y, t)
@@ -65,8 +65,7 @@ module DNN
 
     class MeanSquaredError < Loss
       def forward(y, t)
-        batch_size = t.shape[0]
-        0.5 * ((y - t)**2).sum / batch_size
+        0.5 * ((y - t)**2).mean(0).sum
       end
 
       def backward(y, t)
@@ -76,8 +75,7 @@ module DNN
 
     class MeanAbsoluteError < Loss
       def forward(y, t)
-        batch_size = t.shape[0]
-        (y - t).abs.sum / batch_size
+        (y - t).abs.mean(0).sum
       end
 
       def backward(y, t)
@@ -91,7 +89,7 @@ module DNN
     class Hinge < Loss
       def forward(y, t)
         @a = 1 - y * t
-        Xumo::SFloat.maximum(0, @a)
+        Xumo::SFloat.maximum(0, @a).mean(0).sum
       end
 
       def backward(y, t)
@@ -119,13 +117,11 @@ module DNN
       private
 
       def loss_l1(y, t)
-        batch_size = t.shape[0]
-        (y - t).abs.sum / batch_size
+        (y - t).abs.mean(0).sum
       end
 
       def loss_l2(y, t)
-        batch_size = t.shape[0]
-        0.5 * ((y - t)**2).sum / batch_size
+        0.5 * ((y - t)**2).mean(0).sum
       end
     end
 
@@ -147,8 +143,7 @@ module DNN
 
       def forward(y, t)
         @x = SoftmaxCrossEntropy.softmax(y)
-        batch_size = t.shape[0]
-        -(t * Xumo::NMath.log(@x + @eps)).sum / batch_size
+        -(t * Xumo::NMath.log(@x + @eps)).mean(0).sum
       end
 
       def backward(y, t)
@@ -182,7 +177,7 @@ module DNN
 
       def forward(y, t)
         @x = SigmoidCrossEntropy.sigmoid(y)
-        -(t * Xumo::NMath.log(@x + @eps) + (1 - t) * Xumo::NMath.log(1 - @x + @eps))
+        -(t * Xumo::NMath.log(@x + @eps) + (1 - t) * Xumo::NMath.log(1 - @x + @eps)).mean(0).sum
       end
 
       def backward(y, t)

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.15.2"
+  VERSION = "0.15.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray