ruby-dnn 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a07d117f60cfce7327a63514df0ffb2bf2228d4dfaa531d5b1c849ad581c5aa3
-  data.tar.gz: 460158875978df670f99a501dc1a5878c392517d2c5123f13c3c8c96718f3a5e
+  metadata.gz: 26d153a8ef243d2a069fd5b48a08e0216c28d8dd0307f570fce2ef146eef3cfe
+  data.tar.gz: 9130ce3f31d2e7b5b3a3ecb48d9e4e10cddd307b2f900e13799206f8b16c3022
 SHA512:
-  metadata.gz: e8cbb2fc0992b458f5af4176d2757f9e1222aba1cf1a980db5f8c4e64c20f8442bb1c6c103f78adbe5855bfdd7a8f01b33ffe3978b369b20b52efbdd9de7af4c
-  data.tar.gz: a67ced6f09ea4d1fd5c81a7e13a1ac1b35d46512b54e06fa3773025036fed3cf5200b5cefb985defe4debd8fc2b8a669fa9a48a2ea21ee6721ff539c89c1d944
+  metadata.gz: f6167f81c1c7c76ae0539d17e9f9d252f03b603a15ee376cf91d0aa620d8d60aa5f434d3587f3331221679f661d22978207564d60a7ae59cf22551c482beb62c
+  data.tar.gz: 0ab323a64dd7d68692c901257fa38981355c6533eb106a76ed1f4072c4d338bb4c5c72b0a4db2704c146ae49b827c75f45b79db924cdde92352f72f332bd7c9c

data/examples/api-examples/save_example.rb

@@ -76,7 +76,7 @@ model2 = MLP.new
 if SAVE_STYLE == USE_MARSHAL
   loader = MarshalLoader.new(model2)
   loader.load("trained_mnist.marshal")
-  # MLP.load("trained_mnist.marshal") # This code is equivalent to the code above.
+  # model2 = MLP.load("trained_mnist.marshal") # This code is equivalent to the code above.
 elsif SAVE_STYLE == USE_JSON
   loader = JSONLoader.new(model2)
   loader.load("trained_mnist.json")

data/lib/dnn/core/losses.rb

@@ -174,7 +174,7 @@ module DNN
 
       def forward(y, t)
         @x = SigmoidCrossEntropy.sigmoid(y)
-        -(t * Xumo::NMath.log(@x) + (1 - t) * Xumo::NMath.log(1 - @x))
+        -(t * Xumo::NMath.log(@x + @eps) + (1 - t) * Xumo::NMath.log(1 - @x + @eps))
       end
 
       def backward(y, t)

data/lib/dnn/core/models.rb

@@ -145,7 +145,7 @@ module DNN
       # @return [Hash] Hash of contents to be output to log.
       private def test(x, y, batch_size: 100)
         acc, test_loss = accuracy(x, y, batch_size: batch_size)
-        { accuracy: acc, test_loss: test_loss.mean }
+        { accuracy: acc, test_loss: test_loss }
       end
 
       # Training once.
@@ -180,7 +180,7 @@ module DNN
         batch_size = batch_size >= num_test_datas[0] ? num_test_datas : batch_size
         iter = Iterator.new(x, y, random: false)
         total_correct = 0
-        sum_loss = Xumo::SFloat[0]
+        sum_loss = 0
         max_steps = (num_test_datas.to_f / batch_size).ceil
         iter.foreach(batch_size) do |x_batch, y_batch|
           correct, loss_value = test_on_batch(x_batch, y_batch)
@@ -202,7 +202,7 @@ module DNN
         call_callbacks(:before_test_on_batch)
         x = forward(x, false)
         correct = evaluate(x, y)
-        loss_value = @loss_func.loss(x, y, layers)
+        loss_value = @loss_func.loss(x, y)
         call_callbacks(:after_test_on_batch)
         [correct, loss_value]
       end

data/lib/dnn/image.rb

@@ -37,7 +37,6 @@ module DNN
         Dir.mkdir(dir_name) unless Dir.exist?(dir_name)
       end
       h, w, ch = img.shape
-      bin = img.to_binary
       match_data = file_name.match(/\.(\w+)$/i)
       if match_data
         ext = match_data[1]
@@ -47,13 +46,18 @@ module DNN
       case ext
       when "png"
         stride_in_bytes = w * ch
-        res = Stb.stbi_write_png(file_name, w, h, ch, bin, stride_in_bytes)
+        res = Stb.stbi_write_png(file_name, w, h, ch, img.to_binary, stride_in_bytes)
       when "bmp"
-        res = Stb.stbi_write_bmp(file_name, w, h, ch, bin)
+        res = Stb.stbi_write_bmp(file_name, w, h, ch, img.to_binary)
       when "jpg", "jpeg"
         raise TypeError, "quality:#{quality.class} is not an instance of Integer class." unless quality.is_a?(Integer)
         raise ArgumentError, "quality should be between 1 and 100." unless quality.between?(1, 100)
-        res = Stb.stbi_write_jpg(file_name, w, h, ch, bin, quality)
+        res = Stb.stbi_write_jpg(file_name, w, h, ch, img.to_binary, quality)
+      when "hdr"
+        float_img = Numo::SFloat.cast(img) / 255
+        res = Stb.stbi_write_hdr(file_name, w, h, ch, float_img.to_binary)
+      when "tga"
+        res = Stb.stbi_write_tga(file_name, w, h, ch, img.to_binary)
       else
         raise ImageWriteError, "Extension '#{ext}' is not support."
       end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.14.1"
+  VERSION = "0.14.2"
 end

metadata

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