ruby-dnn 0.10.4 → 0.12.4

data/third_party/stb_image_write.h

@@ -1,4 +1,4 @@
-/* stb_image_write - v1.13 - public domain - http://nothings.org/stb/stb_image_write.h
+/* stb_image_write - v1.13 - public domain - http://nothings.org/stb
    writes out PNG/BMP/TGA/JPEG/HDR images to C stdio - Sean Barrett 2010-2015
                                      no warranty implied; use at your own risk
 
@@ -10,11 +10,6 @@
 
    Will probably not work correctly with strict-aliasing optimizations.
 
-   If using a modern Microsoft Compiler, non-safe versions of CRT calls may cause 
-   compilation warnings or even errors. To avoid this, also before #including,
-
-       #define STBI_MSC_SECURE_CRT
-
 ABOUT:
 
    This header file is a library for writing images to C stdio or a callback.
@@ -873,7 +868,7 @@ STBIWDEF unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, i
    unsigned int bitbuf=0;
    int i,j, bitcount=0;
    unsigned char *out = NULL;
-   unsigned char ***hash_table = (unsigned char***) STBIW_MALLOC(stbiw__ZHASH * sizeof(char**));
+   unsigned char ***hash_table = (unsigned char***) STBIW_MALLOC(stbiw__ZHASH * sizeof(unsigned char**));
    if (hash_table == NULL)
       return NULL;
    if (quality < 5) quality = 5;
@@ -1535,6 +1530,8 @@ STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const
 #endif // STB_IMAGE_WRITE_IMPLEMENTATION
 
 /* Revision history
+      1.11  (2019-08-11)
+             
       1.10  (2019-02-07)
              support utf8 filenames in Windows; fix warnings and platform ifdefs 
       1.09  (2018-02-11)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.12.4
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -100,8 +100,12 @@ files:
 - bin/setup
 - examples/cifar100_example.rb
 - examples/cifar10_example.rb
+- examples/dcgan/dcgan.rb
+- examples/dcgan/imgen.rb
+- examples/dcgan/train.rb
 - examples/iris_example.rb
 - examples/mnist_conv2d_example.rb
+- examples/mnist_define_by_run.rb
 - examples/mnist_example.rb
 - examples/mnist_lstm_example.rb
 - examples/xor_example.rb
@@ -114,13 +118,15 @@ files:
 - lib/dnn/cifar100.rb
 - lib/dnn/core/activations.rb
 - lib/dnn/core/cnn_layers.rb
-- lib/dnn/core/dataset.rb
 - lib/dnn/core/embedding.rb
 - lib/dnn/core/error.rb
 - lib/dnn/core/initializers.rb
+- lib/dnn/core/iterator.rb
 - lib/dnn/core/layers.rb
+- lib/dnn/core/link.rb
 - lib/dnn/core/losses.rb
-- lib/dnn/core/model.rb
+- lib/dnn/core/merge_layers.rb
+- lib/dnn/core/models.rb
 - lib/dnn/core/normalizations.rb
 - lib/dnn/core/optimizers.rb
 - lib/dnn/core/param.rb
@@ -128,12 +134,14 @@ files:
 - lib/dnn/core/rnn_layers.rb
 - lib/dnn/core/utils.rb
 - lib/dnn/downloader.rb
+- lib/dnn/fashion-mnist.rb
 - lib/dnn/image.rb
 - lib/dnn/iris.rb
 - lib/dnn/mnist.rb
 - lib/dnn/version.rb
 - ruby-dnn.gemspec
 - third_party/stb_image.h
+- third_party/stb_image_resize.h
 - third_party/stb_image_write.h
 homepage: https://github.com/unagiootoro/ruby-dnn.git
 licenses:

data/lib/dnn/core/dataset.rb

@@ -1,34 +0,0 @@
-# This class manages input datas and output datas together.
-class DNN::Dataset
-  # @param [Numo::SFloat] x_datas input datas.
-  # @param [Numo::SFloat] y_datas output datas.
-  # @param [Bool] random Set true to return batches randomly. Setting false returns batches in order of index.
-  def initialize(x_datas, y_datas, random = true)
-    @x_datas = x_datas
-    @y_datas = y_datas
-    @random = random
-    @num_datas = x_datas.shape[0]
-    reset_indexs
-  end
-
-  # Return the next batch.
-  # If the number of remaining data < batch size, if random = true, shuffle the data again and return a batch.
-  # If random = false, all remaining data will be returned regardless of the batch size.
-  def next_batch(batch_size)
-    if @indexes.length < batch_size
-      batch_indexes = @indexes unless @random
-      reset_indexs
-      batch_indexes = @indexes.shift(batch_size) if @random
-    else
-      batch_indexes = @indexes.shift(batch_size)
-    end
-    x_batch = @x_datas[batch_indexes, false]
-    y_batch = @y_datas[batch_indexes, false]
-    [x_batch, y_batch]
-  end
-
-  private def reset_indexs
-    @indexes = @num_datas.times.to_a
-    @indexes.shuffle! if @random
-  end
-end

data/lib/dnn/core/model.rb

@@ -1,440 +0,0 @@
-require "zlib"
-require "json"
-require "base64"
-
-module DNN
-
-  # This class deals with the model of the network.
-  class Model
-    # @return [Array] All layers possessed by the model.
-    attr_accessor :layers
-    # @return [Bool] Setting false prevents learning of parameters.
-    attr_accessor :trainable
-
-    # Load marshal model.
-    # @param [String] file_name File name of marshal model to load.
-    def self.load(file_name)
-      Marshal.load(Zlib::Inflate.inflate(File.binread(file_name)))
-    end
-
-    # Load json model.
-    # @param [String] json_str json string to load model.
-    # @return [DNN::Model]
-    def self.load_json(json_str)
-      hash = JSON.parse(json_str, symbolize_names: true)
-      model = self.from_hash(hash)
-      model.compile(Utils.from_hash(hash[:optimizer]), Utils.from_hash(hash[:loss]))
-      model
-    end
-
-    def self.from_hash(hash)
-      model = self.new
-      model.layers = hash[:layers].map { |hash_layer| Utils.from_hash(hash_layer) }
-      model
-    end
-  
-    def initialize
-      @layers = []
-      @trainable = true
-      @optimizer = nil
-      @compiled = false
-    end
-
-    # Load json model parameters.
-    # @param [String] json_str json string to load model parameters.
-    def load_json_params(json_str)
-      hash = JSON.parse(json_str, symbolize_names: true)
-      has_param_layers_params = hash[:params]
-      has_param_layers_index = 0
-      has_param_layers = get_all_layers.select { |layer| layer.is_a?(Layers::HasParamLayer) }
-      has_param_layers.each do |layer|
-        hash_params = has_param_layers_params[has_param_layers_index]
-        hash_params.each do |key, (shape, base64_param)|
-          bin = Base64.decode64(base64_param)
-          data = Xumo::SFloat.from_binary(bin).reshape(*shape)
-          layer.params[key].data = data
-        end
-        has_param_layers_index += 1
-      end
-    end
-
-    # Save the model in marshal format.
-    # @param [String] file_name name to save model.
-    def save(file_name)
-      bin = Zlib::Deflate.deflate(Marshal.dump(self))
-      begin
-        File.binwrite(file_name, bin)
-      rescue Errno::ENOENT => ex
-        dir_name = file_name.match(%r`(.*)/.+$`)[1]
-        Dir.mkdir(dir_name)
-        File.binwrite(file_name, bin)
-      end
-    end
-
-    # Convert model to json string.
-    # @return [String] json string.
-    def to_json
-      hash = self.to_hash
-      hash[:version] = VERSION
-      JSON.pretty_generate(hash)
-    end
-    
-    # Convert model parameters to json string.
-    # @return [String] json string.
-    def params_to_json
-      has_param_layers = get_all_layers.select { |layer| layer.is_a?(Layers::HasParamLayer) }
-      has_param_layers_params = has_param_layers.map do |layer|
-        layer.params.map { |key, param|
-          base64_data = Base64.encode64(param.data.to_binary)
-          [key, [param.data.shape, base64_data]]
-        }.to_h
-      end
-      hash = {version: VERSION, params: has_param_layers_params}
-      JSON.dump(hash)
-    end
-
-    # Add layer to the model.
-    # @param [DNN::Layers::Layer] layer Layer to add to the model.
-    # @return [DNN::Model] return self.
-    def <<(layer)
-      if !layer.is_a?(Layers::Layer) && !layer.is_a?(Model)
-        raise TypeError.new("layer is not an instance of the DNN::Layers::Layer class or DNN::Model class.")
-      end
-      @layers << layer
-      self
-    end
-
-    # Set optimizer and loss_func to model and build all layers.
-    # @param [DNN::Optimizers::Optimizer] optimizer Optimizer to use for learning.
-    # @param [DNN::Losses::Loss] loss_func Loss function to use for learning.
-    def compile(optimizer, loss_func)
-      raise DNN_Error.new("The model is already compiled.") if compiled?
-      unless optimizer.is_a?(Optimizers::Optimizer)
-        raise TypeError.new("optimizer:#{optimizer.class} is not an instance of DNN::Optimizers::Optimizer class.")
-      end
-      unless loss_func.is_a?(Losses::Loss)
-        raise TypeError.new("loss_func:#{loss_func.class} is not an instance of DNN::Losses::Loss class.")
-      end
-      @compiled = true
-      layers_check
-      @optimizer = optimizer
-      @loss_func = loss_func
-      build
-    end
-
-    # Set optimizer and loss_func to model and recompile. But does not build layers.
-    # @param [DNN::Optimizers::Optimizer] optimizer Optimizer to use for learning.
-    # @param [DNN::Losses::Loss] loss_func Loss function to use for learning.
-    def recompile(optimizer, loss_func)
-      unless optimizer.is_a?(Optimizers::Optimizer)
-        raise TypeError.new("optimizer:#{optimizer.class} is not an instance of DNN::Optimizers::Optimizer class.")
-      end
-      unless loss_func.is_a?(Losses::Loss)
-        raise TypeError.new("loss_func:#{loss_func.class} is not an instance of DNN::Losses::Loss class.")
-      end
-      @compiled = true
-      layers_check
-      @optimizer = optimizer
-      @loss_func = loss_func
-    end
-
-    def build(super_model = nil)
-      @super_model = super_model
-      shape = if super_model
-        super_model.get_prev_layer(self).output_shape
-      else
-        @layers.first.build
-      end
-      layers = super_model ? @layers : @layers[1..-1]
-      layers.each do |layer|
-        if layer.is_a?(Model)
-          layer.build(self)
-          layer.recompile(@optimizer, @loss_func)
-        else
-          layer.build(shape)
-        end
-        shape = layer.output_shape
-      end
-    end
-
-    # @return [Array] Return the input shape of the model.
-    def input_shape
-      @layers.first.input_shape
-    end
-
-    # @return [Array] Return the output shape of the model.
-    def output_shape
-      @layers.last.output_shape
-    end
-
-    # @return [DNN::Optimizers::Optimizer] optimizer Return the optimizer to use for learning.
-    def optimizer
-      raise DNN_Error.new("The model is not compiled.") unless compiled?
-      @optimizer
-    end
-
-    # @return [DNN::Losses::Loss] loss Return the loss to use for learning.
-    def loss_func
-      raise DNN_Error.new("The model is not compiled.") unless compiled?
-      @loss_func
-    end
-
-    # @return [Bool] Returns whether the model is learning.
-    def compiled?
-      @compiled
-    end
-
-    # Start training.
-    # Compile the model before use this method.
-    # @param [Numo::SFloat] x Input training data.
-    # @param [Numo::SFloat] y Output training data.
-    # @param [Integer] epochs Number of training.
-    # @param [Integer] batch_size Batch size used for one training.
-    # @param [Array or NilClass] test If you to test the model for every 1 epoch,
-    #                            specify [x_test, y_test]. Don't test to the model, specify nil.
-    # @param [Bool] verbose Set true to display the log. If false is set, the log is not displayed.
-    # @param [Lambda] before_epoch_cbk Process performed before one training.
-    # @param [Lambda] after_epoch_cbk Process performed after one training.
-    # @param [Lambda] before_batch_cbk Set the proc to be performed before batch processing.
-    # @param [Lambda] after_batch_cbk Set the proc to be performed after batch processing.
-    def train(x, y, epochs,
-              batch_size: 1,
-              test: nil,
-              verbose: true,
-              before_epoch_cbk: nil,
-              after_epoch_cbk: nil,
-              before_batch_cbk: nil,
-              after_batch_cbk: nil)
-      raise DNN_Error.new("The model is not compiled.") unless compiled?
-      check_xy_type(x, y)
-      dataset = Dataset.new(x, y)
-      num_train_datas = x.shape[0]
-      (1..epochs).each do |epoch|
-        before_epoch_cbk.call(epoch) if before_epoch_cbk
-        puts "【 epoch #{epoch}/#{epochs} 】" if verbose
-        (num_train_datas.to_f / batch_size).ceil.times do |index|
-          x_batch, y_batch = dataset.next_batch(batch_size)
-          loss_value = train_on_batch(x_batch, y_batch,
-                                      before_batch_cbk: before_batch_cbk, after_batch_cbk: after_batch_cbk)
-          if loss_value.is_a?(Numo::SFloat)
-            loss_value = loss_value.mean
-          elsif loss_value.nan?
-            puts "\nloss is nan" if verbose
-            return
-          end
-          num_trained_datas = (index + 1) * batch_size
-          num_trained_datas = num_trained_datas > num_train_datas ? num_train_datas : num_trained_datas
-          log = "\r"
-          40.times do |i|
-            if i < num_trained_datas * 40 / num_train_datas
-              log << "="
-            elsif i == num_trained_datas * 40 / num_train_datas
-              log << ">"
-            else
-              log << "_"
-            end
-          end
-          log << "  #{num_trained_datas}/#{num_train_datas} loss: #{sprintf('%.8f', loss_value)}"
-          print log if verbose
-        end
-        if verbose && test
-          acc, test_loss = accurate(test[0], test[1], batch_size,
-                                    before_batch_cbk: before_batch_cbk, after_batch_cbk: after_batch_cbk)
-          print "  accurate: #{acc}, test loss: #{sprintf('%.8f', test_loss)}"
-        end
-        puts "" if verbose
-        after_epoch_cbk.call(epoch) if after_epoch_cbk
-      end
-    end
-  
-    # Training once.
-    # Compile the model before use this method.
-    # @param [Numo::SFloat] x Input training data.
-    # @param [Numo::SFloat] y Output training data.
-    # @param [Lambda] before_batch_cbk Set the proc to be performed before batch processing.
-    # @param [Lambda] after_batch_cbk Set the proc to be performed after batch processing.
-    # @return [Float | Numo::SFloat] Return loss value in the form of Float or Numo::SFloat.
-    def train_on_batch(x, y, before_batch_cbk: nil, after_batch_cbk: nil)
-      raise DNN_Error.new("The model is not compiled.") unless compiled?
-      check_xy_type(x, y)
-      input_data_shape_check(x, y)
-      x, y = before_batch_cbk.call(x, y, true) if before_batch_cbk
-      x = forward(x, true)
-      loss_value = @loss_func.forward(x, y, get_all_layers)
-      dy = @loss_func.backward(y, get_all_layers)
-      backward(dy)
-      update
-      after_batch_cbk.call(loss_value, true) if after_batch_cbk
-      loss_value
-    end
-  
-    # Evaluate model and get accurate of test data.
-    # @param [Numo::SFloat] x Input test data.
-    # @param [Numo::SFloat] y Output test data.
-    # @param [Lambda] before_batch_cbk Set the proc to be performed before batch processing.
-    # @param [Lambda] after_batch_cbk Set the proc to be performed after batch processing.
-    # @return [Array] Returns the test data accurate and mean loss in the form [accurate, mean_loss].
-    def accurate(x, y, batch_size = 100, before_batch_cbk: nil, after_batch_cbk: nil)
-      check_xy_type(x, y)
-      input_data_shape_check(x, y)
-      batch_size = batch_size >= x.shape[0] ? x.shape[0] : batch_size
-      dataset = Dataset.new(x, y, false)
-      correct = 0
-      sum_loss = 0
-      max_iter = (x.shape[0].to_f / batch_size)
-      max_iter.ceil.times do |i|
-        x_batch, y_batch = dataset.next_batch(batch_size)
-        x_batch, y_batch = before_batch_cbk.call(x_batch, y_batch, false) if before_batch_cbk
-        x_batch = forward(x_batch, false)
-        sigmoid = Sigmoid.new
-        x_batch.shape[0].times do |j|
-          if @layers.last.output_shape == [1]
-            if @loss_func.is_a?(SigmoidCrossEntropy)
-              correct += 1 if sigmoid.forward(x_batch[j, 0]).round == y_batch[j, 0].round
-            else
-              correct += 1 if x_batch[j, 0].round == y_batch[j, 0].round
-            end
-          else
-            correct += 1 if x_batch[j, true].max_index == y_batch[j, true].max_index
-          end
-        end
-        loss_value = @loss_func.forward(x_batch, y_batch, get_all_layers)
-        after_batch_cbk.call(loss_value, false) if after_batch_cbk
-        sum_loss += loss_value.is_a?(Xumo::SFloat) ? loss_value.mean : loss_value
-      end
-      mean_loss = sum_loss / max_iter
-      [correct.to_f / x.shape[0], mean_loss]
-    end
-
-    # Predict data.
-    # @param [Numo::SFloat] x Input data.
-    def predict(x)
-      check_xy_type(x)
-      input_data_shape_check(x)
-      forward(x, false)
-    end
-
-    # Predict one data.
-    # @param [Numo::SFloat] x Input data. However, x is single data.
-    def predict1(x)
-      check_xy_type(x)
-      predict(x.reshape(1, *x.shape))[0, false]
-    end
-
-    # Get loss value.
-    # @param [Numo::SFloat] x Input data.
-    # @param [Numo::SFloat] y Output data.
-    # @return [Float | Numo::SFloat] Return loss value in the form of Float or Numo::SFloat.
-    def loss(x, y)
-      check_xy_type(x, y)
-      input_data_shape_check(x, y)
-      x = forward(x, false)
-      @loss_func.forward(x, y, get_all_layers)
-    end
-
-    # @return [DNN::Model] Copy this model.
-    def copy
-      Marshal.load(Marshal.dump(self))
-    end
-
-    # Get the layer that the model has.
-    def get_layer(*args)
-      if args.length == 1
-        index = args[0]
-        @layers[index]
-      else
-        layer_class, index = args
-        @layers.select { |layer| layer.is_a?(layer_class) }[index]
-      end
-    end
-
-    # Get the all layers.
-    # @return [Array] all layers array.
-    def get_all_layers
-      @layers.map { |layer|
-        layer.is_a?(Model) ? layer.get_all_layers : layer
-      }.flatten
-    end
-  
-    def forward(x, learning_phase)
-      @layers.each do |layer|
-        x = if layer.is_a?(Model)
-          layer.forward(x, learning_phase)
-        else
-          layer.learning_phase = learning_phase
-          layer.forward(x)
-        end
-      end
-      x
-    end
-  
-    def backward(dy)
-      @layers.reverse.each do |layer|
-        dy = layer.backward(dy)
-      end
-      dy
-    end
-
-    def update
-      return unless @trainable
-      all_trainable_layers = @layers.map { |layer|
-        if layer.is_a?(Model)
-          layer.trainable ? layer.get_all_layers : nil
-        else
-          layer
-        end
-      }.flatten.compact.uniq
-      @optimizer.update(all_trainable_layers)
-    end
-
-    def get_prev_layer(layer)
-      layer_index = @layers.index(layer)
-      prev_layer = if layer_index == 0
-        if @super_model
-          @super_model.layers[@super_model.layers.index(self) - 1]
-        else
-          self
-        end
-      else
-        @layers[layer_index - 1]
-      end
-      if prev_layer.is_a?(Layers::Layer)
-        prev_layer
-      elsif prev_layer.is_a?(Model)
-        prev_layer.layers.last
-      end
-    end
-
-    def to_hash
-      hash_layers = @layers.map { |layer| layer.to_hash }
-      {class: Model.name, layers: hash_layers, optimizer: @optimizer.to_hash, loss: @loss_func.to_hash}
-    end
-
-    private
-
-    def layers_check
-      if !@layers.first.is_a?(Layers::InputLayer) && !@layers.first.is_a?(Layers::Embedding) && !@super_model
-        raise TypeError.new("The first layer is not an InputLayer or Embedding.")
-      end
-    end
-
-    def input_data_shape_check(x, y = nil)
-      unless @layers.first.input_shape == x.shape[1..-1]
-        raise DNN_ShapeError.new("The shape of x does not match the input shape. x shape is #{x.shape[1..-1]}, but input shape is #{@layers.first.input_shape}.")
-      end
-      if y && @layers.last.output_shape != y.shape[1..-1]
-        raise DNN_ShapeError.new("The shape of y does not match the input shape. y shape is #{y.shape[1..-1]}, but output shape is #{@layers.last.output_shape}.")
-      end
-    end
-
-    def check_xy_type(x, y = nil)
-      unless x.is_a?(Xumo::SFloat)
-        raise TypeError.new("x:#{x.class.name} is not an instance of #{Xumo::SFloat.name} class.")
-      end
-      if y && !y.is_a?(Xumo::SFloat)
-        raise TypeError.new("y:#{y.class.name} is not an instance of #{Xumo::SFloat.name} class.")
-      end
-    end
-  end
-
-end