ruby-dnn 1.2.2 → 1.3.0

data/lib/dnn/core/savers.rb

@@ -14,15 +14,13 @@ module DNN
         load_bin(File.binread(file_name))
       end
 
-      private
-
       def load_bin(bin)
         raise NotImplementedError, "Class '#{self.class.name}' has implement method 'load_bin'"
       end
     end
 
     class MarshalLoader < Loader
-      private def load_bin(bin)
+      def load_bin(bin)
         data = Marshal.load(Zlib::Inflate.inflate(bin))
         unless @model.class.name == data[:class]
           raise DNNError, "Class name is mismatch. Target model is #{@model.class.name}. But loading model is #{data[:class]}."
@@ -38,8 +36,6 @@ module DNN
     end
 
     class JSONLoader < Loader
-      private
-
       def load_bin(bin)
         data = JSON.parse(bin, symbolize_names: true)
         unless @model.class.name == data[:class]
@@ -48,7 +44,7 @@ module DNN
         set_all_params_base64_data(data[:params])
       end
 
-      def set_all_params_base64_data(params_data)
+      private def set_all_params_base64_data(params_data)
         @model.trainable_layers.each.with_index do |layer, i|
           params_data[i].each do |(key, (shape, base64_data))|
             bin = Base64.decode64(base64_data)
@@ -79,8 +75,6 @@ module DNN
         end
       end
 
-      private
-
       def dump_bin
         raise NotImplementedError, "Class '#{self.class.name}' has implement method 'dump_bin'"
       end
@@ -92,7 +86,7 @@ module DNN
         @include_model = include_model
       end
 
-      private def dump_bin
+      def dump_bin
         params_data = @model.get_all_params_data
         if @include_model
           @model.clean_layers
@@ -110,14 +104,12 @@ module DNN
     end
 
     class JSONSaver < Saver
-      private
-
       def dump_bin
         data = { version: VERSION, class: @model.class.name, params: get_all_params_base64_data }
         JSON.dump(data)
       end
 
-      def get_all_params_base64_data
+      private def get_all_params_base64_data
         @model.trainable_layers.map do |layer|
           layer.get_params.to_h do |key, param|
             base64_data = Base64.encode64(param.data.to_binary)

data/lib/dnn/core/utils.rb

@@ -39,6 +39,20 @@ module DNN
       Losses::SoftmaxCrossEntropy.softmax(x)
     end
 
+    # Check training or evaluate input data type.
+    def self.check_input_data_type(data_name, data, expected_type)
+      if !data.is_a?(expected_type) && !data.is_a?(Array)
+        raise TypeError, "#{data_name}:#{data.class.name} is not an instance of #{expected_type.name} class or Array class."
+      end
+      if data.is_a?(Array)
+        data.each.with_index do |v, i|
+          unless v.is_a?(expected_type)
+            raise TypeError, "#{data_name}[#{i}]:#{v.class.name} is not an instance of #{expected_type.name} class."
+          end
+        end
+      end
+    end
+
     # Perform numerical differentiation.
     def self.numerical_grad(x, func)
       (func.(x + 1e-7) - func.(x)) / 1e-7

data/lib/dnn/datasets/downloader.rb

@@ -1,4 +1,4 @@
-require "net/http"
+require "net/https"
 
 module DNN
   DOWNLOADS_PATH = ENV["RUBY_DNN_DOWNLOADS_PATH"] || __dir__
@@ -18,13 +18,22 @@ module DNN
 
     def initialize(url)
       @url = url
-      *, @fqdn, @path = *url.match(%r`https?://(.+?)(/.+)`)
+      *, @protocol, @fqdn, @path = *url.match(%r`(https?)://(.+?)(/.+)`)
     end
 
     def download(dir_path)
       puts %`download "#{@url}"`
       buf = ""
-      Net::HTTP.start(@fqdn) do |http|
+      if @protocol == "http"
+        port = 80
+      elsif @protocol == "https"
+        port = 443
+      else
+        raise "Protocol(#{@protocol}) is not supported."
+      end
+      http = Net::HTTP.new(@fqdn, port)
+      http.use_ssl = true if @protocol == "https"
+      http.start do |http|
         content_length = http.head(@path).content_length
         http.get(@path) do |body_segment|
           buf << body_segment

data/lib/dnn/datasets/iris.rb

@@ -41,7 +41,11 @@ module DNN
         end
       end
       if shuffle
-        orig_seed = Random::DEFAULT.seed
+        if RUBY_VERSION.split(".")[0].to_i >= 3
+          orig_seed = Random.seed
+        else
+          orig_seed = Random::DEFAULT.seed
+        end
         srand(shuffle_seed)
         indexs = (0...csv_array.length).to_a.shuffle
         x[indexs, true] = x

data/lib/dnn/image.rb

@@ -1,5 +1,5 @@
 require "numo/narray"
-require_relative "../../ext/rb_stb_image/rb_stb_image"
+require_relative "../rb_stb_image"
 
 module DNN
   module Image

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/lib/dnn.rb

@@ -1,4 +1,8 @@
-require "numo/narray"
+if RUBY_PLATFORM == "wasm32-wasi"
+  require "narray.so"
+else
+  require "numo/narray"
+end
 
 module DNN
   if ENV["RUBY_DNN_USE_CUMO"] == "ENABLE"
@@ -27,28 +31,30 @@ module DNN
   end
 end
 
-require_relative "dnn/version"
-require_relative "dnn/core/monkey_patch"
-require_relative "dnn/core/error"
-require_relative "dnn/core/global"
-require_relative "dnn/core/tensor"
-require_relative "dnn/core/param"
-require_relative "dnn/core/link"
-require_relative "dnn/core/iterator"
-require_relative "dnn/core/models"
-require_relative "dnn/core/layers/basic_layers"
-require_relative "dnn/core/layers/normalizations"
-require_relative "dnn/core/layers/activations"
-require_relative "dnn/core/layers/merge_layers"
-require_relative "dnn/core/layers/split_layers"
-require_relative "dnn/core/layers/cnn_layers"
-require_relative "dnn/core/layers/embedding"
-require_relative "dnn/core/layers/rnn_layers"
-require_relative "dnn/core/layers/math_layers"
-require_relative "dnn/core/optimizers"
-require_relative "dnn/core/losses"
-require_relative "dnn/core/initializers"
-require_relative "dnn/core/regularizers"
-require_relative "dnn/core/callbacks"
-require_relative "dnn/core/savers"
-require_relative "dnn/core/utils"
+if RUBY_PLATFORM != "wasm32-wasi"
+  require_relative "dnn/version"
+  require_relative "dnn/core/monkey_patch"
+  require_relative "dnn/core/error"
+  require_relative "dnn/core/global"
+  require_relative "dnn/core/tensor"
+  require_relative "dnn/core/param"
+  require_relative "dnn/core/link"
+  require_relative "dnn/core/iterator"
+  require_relative "dnn/core/models"
+  require_relative "dnn/core/layers/basic_layers"
+  require_relative "dnn/core/layers/normalizations"
+  require_relative "dnn/core/layers/activations"
+  require_relative "dnn/core/layers/merge_layers"
+  require_relative "dnn/core/layers/split_layers"
+  require_relative "dnn/core/layers/cnn_layers"
+  require_relative "dnn/core/layers/embedding"
+  require_relative "dnn/core/layers/rnn_layers"
+  require_relative "dnn/core/layers/math_layers"
+  require_relative "dnn/core/optimizers"
+  require_relative "dnn/core/losses"
+  require_relative "dnn/core/initializers"
+  require_relative "dnn/core/regularizers"
+  require_relative "dnn/core/callbacks"
+  require_relative "dnn/core/savers"
+  require_relative "dnn/core/utils"
+end

data/ruby-dnn.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "numo-narray"
   spec.add_dependency "archive-tar-minitar"
+  spec.add_development_dependency "rake-compiler"
 
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - unagiootoro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2023-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +139,7 @@ files:
 - examples/dcgan/imgen.rb
 - examples/dcgan/train.rb
 - examples/iris_example.rb
+- examples/iris_example_unused_model.rb
 - examples/judge-number/README.md
 - examples/judge-number/capture.PNG
 - examples/judge-number/convnet8.rb
@@ -195,7 +210,7 @@ homepage: https://github.com/unagiootoro/ruby-dnn.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -210,8 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: ruby deep learning library.
 test_files: []