ruby-dnn 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91a60f8ec7da64fb5cb69e872734e917ff5ffbb35574dd4a640b1e6739d3f505
-  data.tar.gz: d4b4e6c127c2f41aaa21bf30ba87a0c44989e94f2aec5a32f92e5d99f7947118
+  metadata.gz: d33f1d5472229d184630d37063d4c42888230044a9e1b069035a144e8aae0964
+  data.tar.gz: 530d31b5fc5073fa02253eb0f7d7b78a007ccaed16ea4a49aba56a87174afb59
 SHA512:
-  metadata.gz: 90800594f4937415ba25fa13678a9e788d187c6ae3d7eb21f9b8ab4e091d491a0bce4117a06e018378c354bf69a651974148015a70271e944ea992530128f366
-  data.tar.gz: 9eb5f4a99cf493784ff13a1a9e74ef6a6ef693e20c3a9d53e4c24780855225ec9383167c36897b5c03afad5b122b35df9642f4ce71bb61901ecea6311706d559
+  metadata.gz: acf104aec7d661da52623930dbd8a60e105aff6b0c7fd4bdc675f507a50f55372451d7c4066992d13a390629d89ec7ba42d7c316376797e439e6b399d702e5aa
+  data.tar.gz: 1e338be765295d9c9827dc82c70e7af79473386be1574ae647ef2568c24be9f9142d94104b62726bda800aff064c37ede794066cfb098a40744dd24a2e7addb4

data/ext/rb_stb_image/rb_stb_image.c

@@ -5,6 +5,11 @@
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
 
+#if defined(_WIN32) || defined(_WIN64)
+#define STBI_WINDOWS_UTF8
+#define STBIW_WINDOWS_UTF8
+#endif
+
 #include "../../third_party/stb_image.h"
 #include "../../third_party/stb_image_write.h"
 #include "../../third_party/stb_image_resize.h"

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

@@ -3,7 +3,7 @@ module DNN
 
     # This module is used for convolution.
     module Conv2DUtils
-      private
+      module_function
 
       # img[bsize, out_h, out_w, ch] to col[bsize * out_h * out_w, fil_h * fil_w * ch]
       def im2col(img, out_h, out_w, fil_h, fil_w, strides)

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

@@ -1,7 +1,9 @@
 module DNN
   module Layers
     module MathUtils
-      def self.align_ndim(shape1, shape2)
+      module_function
+
+      def align_ndim(shape1, shape2)
         if shape1.length < shape2.length
           shape2.length.times do |axis|
             unless shape1[axis] == shape2[axis]
@@ -18,7 +20,7 @@ module DNN
         [shape1, shape2]
       end
 
-      def self.broadcast_to(x, target_shape)
+      def 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)
@@ -33,7 +35,7 @@ module DNN
         x
       end
 
-      def self.sum_to(x, target_shape)
+      def 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)
@@ -192,9 +194,13 @@ module DNN
     class Sum < Layer
       include LayerNode
 
-      def initialize(axis: 0)
+      attr_reader :axis
+      attr_reader :keepdims
+
+      def initialize(axis: 0, keepdims: true)
         super()
         @axis = axis
+        @keepdims = keepdims
       end
 
       def forward_node(x)
@@ -204,21 +210,28 @@ module DNN
       end
 
       def backward_node(dy)
-        return dy if @x_shape == dy.shape
-        dx = dy
-        (@dim - 1).times do
-          dx = dx.concatenate(dy, axis: @axis)
-        end
-        dx
+        MathUtils.broadcast_to(dy, @x_shape)
+      end
+
+      def to_hash
+        super(axis: @axis, keepdims: @keepdims)
+      end
+
+      def load_hash(hash)
+        initialize(axis: hash[:axis], keepdims: hash[:keepdims])
       end
     end
 
     class Mean < Layer
       include LayerNode
 
-      def initialize(axis: 0)
+      attr_reader :axis
+      attr_reader :keepdims
+
+      def initialize(axis: 0, keepdims: true)
         super()
         @axis = axis
+        @keepdims = keepdims
       end
 
       def forward_node(x)
@@ -228,12 +241,15 @@ module DNN
       end
 
       def backward_node(dy)
-        return dy / @dim if @x_shape == dy.shape
-        dx = dy
-        (@dim - 1).times do
-          dx = dx.concatenate(dy, axis: @axis)
-        end
-        dx / @dim
+        MathUtils.broadcast_to(dy, @x_shape) / @dim
+      end
+
+      def to_hash
+        super(axis: @axis, keepdims: @keepdims)
+      end
+
+      def load_hash(hash)
+        initialize(axis: hash[:axis], keepdims: hash[:keepdims])
       end
     end
 

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

@@ -9,11 +9,7 @@ require_relative "numo2numpy"
 
 include PyCall::Import
 
-pyimport :numpy, as: :np
 pyimport :keras
-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
@@ -185,9 +181,9 @@ class KerasModelConvertor
     conv2d_t.filters = Numpy.to_na(k_conv2d_t.get_weights[0])
     conv2d_t.bias.data = Numpy.to_na(k_conv2d_t.get_weights[1])
     returns = [conv2d_t]
-    unless conv2d_t.get_config[:activation] == "linear"
+    unless k_conv2d_t.get_config[:activation] == "linear"
       input_shape, output_shape = get_k_layer_shape(k_conv2d)
-      returns << activation_to_dnn_layer(conv2d_t.get_config[:activation], output_shape)
+      returns << activation_to_dnn_layer(k_conv2d_t.get_config[:activation], output_shape)
     end
     returns
   end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/ruby-dnn.gemspec

@@ -40,6 +40,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement