red-chainer 0.2.1 → 0.3.0

data/lib/chainer/training/extensions/exponential_shift.rb

@@ -0,0 +1,78 @@
+module Chainer
+  module Training
+    module Extensions
+      # Trainer extension to exponentially shift an optimizer attribute.
+      # 
+      # This extension exponentially increases or decreases the specified attribute of the optimizer.
+      # The typical use case is an exponential decay of the learning rate.
+      # This extension is also called before the training loop starts by default.
+      class ExponentialShift < Extension
+        attr_reader :last_value        
+
+        # @param [string] attr Name of the attribute to shift
+        # @param [float] rate Rate of the exponential shift.
+        # @param [float] init Initial value of the attribute.
+        # @param [float] target Target value of the attribute.
+        # @param [Chainer::Optimizer] optimizer Target optimizer to adjust the attribute.
+        def initialize(attr, rate, init: nil, target: nil, optimizer: nil)
+          @attr = attr
+          raise 'ExponentialShift does not support negative rate' if rate < 0
+          @rate = rate
+          @init = init
+          @target = target
+          @optimizer = optimizer
+          @t = 0
+          @last_value = nil
+        end
+
+        def init(trainer)
+          optimizer = get_optimizer(trainer)
+          @init = optimizer.send(@attr) if @init.nil?
+          if @last_value.nil?
+            update_value(optimizer, @init)
+          else
+            update_value(optimizer, @last_value)
+          end
+        end
+
+        def call(trainer)
+          @t += 1
+
+          optimizer = get_optimizer(trainer)
+          value = @init * (@rate ** @t)
+          if @target
+            if @rate > 1
+              if value / @target > 1
+                value = @target
+              end
+            else
+              if value / @target < 1
+                value = @target
+              end
+            end
+          end
+          update_value(optimizer, value)
+        end
+
+        def serialize(serializer)
+          @t = serializer.('t', @t)
+          @last_value = serializer.('last_value', @last_value)
+          if @last_value.is_a?(Numo::NArray)
+            @last_value = @last_value[0]
+          end
+        end
+
+        private 
+
+        def get_optimizer(trainer)
+          @optimizer || trainer.updater.get_optimizer(:main)
+        end
+
+        def update_value(optimizer, value)
+          optimizer.send("#{@attr}=", value)
+          @last_value = value
+        end
+      end
+    end
+  end
+end

data/lib/chainer/training/extensions/snapshot.rb

@@ -23,7 +23,7 @@ module Chainer
           filename = filename_proc.call(trainer)
           prefix = "tmp#{filename}"
           temp_file = Tempfile.create(basename: prefix, tmpdir: trainer.out)
-          save_class.save_file(temp_file, trainer)
+          save_class.save_file(temp_file.path, trainer)
           FileUtils.move(temp_file.path, File.join(trainer.out, filename))
         end
       end

data/lib/chainer/training/standard_updater.rb

@@ -20,6 +20,10 @@ module Chainer
         @iteration = 0
       end
 
+      def get_optimizer(name)
+        @optimizers[name]
+      end
+
       def get_all_optimizers
         @optimizers.to_h
       end

data/lib/chainer/training/trainer.rb

@@ -54,7 +54,7 @@ module Chainer
                  elsif extension.default_name
                    extension.default_name
                  else
-                   raise ArgumentError 'name is not given for the extension'
+                   raise ArgumentError, 'name is not given for the extension'
                  end
         end
 

data/lib/chainer/utils/array.rb

@@ -2,8 +2,19 @@ module Chainer
   module Utils
     module Array
       def self.force_array(x, dtype=nil)
-        # TODO: conversion by dtype
-        Numo::NArray.[](*x)
+        if x.is_a? Integer or x.is_a? Float
+          if dtype.nil?
+            Numo::NArray.cast(x)
+          else
+            dtype.cast(x.dup)
+          end
+        else
+          if dtype.nil?
+            x
+          else
+            dtype.cast(x)
+          end
+        end
       end
     end
   end

data/lib/chainer/utils/conv.rb

@@ -0,0 +1,59 @@
+module Chainer
+  module Utils
+    module Conv
+      def self.get_conv_outsize(size, k, s, p, cover_all: false, d: 1)
+        dk = k + (k - 1) * (d - 1)
+        if cover_all
+          (size + p * 2 - dk + s - 1).div(s) + 1
+        else
+          (size + p * 2 - dk).div(s) + 1
+        end
+      end
+
+      def self.im2col_cpu(img, kh, kw, sy, sx, ph, pw, pval: 0, cover_all: false, dy: 1, dx: 1)
+        n, c, h, w = img.shape
+
+        out_h = self.get_conv_outsize(h, kh, sy, ph, cover_all: cover_all, d: dy)
+        raise 'Height in the output should be positive.' if out_h <= 0
+        out_w = self.get_conv_outsize(w, kw, sx, pw, cover_all: cover_all, d: dx)
+        raise 'Width in the output should be positive.' if out_w <= 0
+
+        # padding
+        # TODO: ref: numpy.pad
+        pad_bottom = ph + sy - 1
+        pad_right = pw + sx - 1
+        pad_img = img.class.new(n, c, (h + ph + pad_bottom), (w + pw + pad_right)).fill(pval)
+        pad_img[nil, nil, ph...(ph+h), pw...(pw+w)] = img
+
+        col = pad_img.class.new(n, c, kh, kw, out_h, out_w).rand(1)
+
+        kh.times do |j|
+          jdy = j * dy
+          j_lim = [jdy + sy * out_h, pad_img.shape[2]].min
+          kw.times do |i|
+            idx = i * dx
+            i_lim = [idx + sx * out_w, pad_img.shape[3]].min
+            col[nil, nil, j, i, nil, nil] = pad_img[nil, nil, (jdy...j_lim).step(sy), (idx...i_lim).step(sx)]
+          end
+        end
+
+        col
+      end
+
+      def self.col2im_cpu(col, sy, sx, ph, pw, h, w, dy: 1, dx: 1)
+        n, c, kh, kw, out_h, out_w = col.shape
+        img = col.class.zeros(n, c, h + 2 * ph + sy - 1, w + 2 * pw + sx - 1)
+        kh.times do |j|
+          jdy = j * dy
+          j_lim = [jdy + sy * out_h, img.shape[2]].min
+          kw.times do |i|
+            idx = i * dx
+            i_lim = [idx + sx * out_w, img.shape[3]].min
+            img[nil, nil, (jdy...j_lim).step(sy), (idx...i_lim).step(sx)] += col[nil, nil, j, i, nil, nil]
+          end
+        end
+        return img[nil, nil, (ph...(h + ph)), (pw...(w + pw))]
+      end
+    end
+  end
+end

data/lib/chainer/utils/math.rb

@@ -0,0 +1,72 @@
+module Chainer
+  module Utils
+    module Math
+      def self.tensordot(a, b, axes)
+        if axes.is_a?(Integer)
+          axes_a = (-axes...0).to_a
+          axes_b = (0...axes).to_a
+        else axes.is_a?(Array)
+          axes_a, axes_b = axes
+        end
+
+        axes_a = Array(axes_a)
+        axes_b = Array(axes_b)
+        na = axes_a.size
+        nb = axes_b.size
+
+        as = a.shape
+        nda = a.ndim
+        bs = b.shape
+        ndb = b.ndim
+        equal = true
+        if na != nb
+            equal = false
+        else
+          na.times do |k|
+            if as[axes_a[k]] != bs[axes_b[k]]
+              equal = false
+              break
+            end
+
+            if axes_a[k] < 0
+              axes_a[k] += nda
+            end
+
+            if axes_b[k] < 0
+              axes_b[k] += ndb
+            end
+          end
+        end
+
+        raise "shape-mismatch for sum" unless equal
+
+        notin = (0...nda).reject { |i| axes_a.include?(i) } 
+        newaxes_a = notin + axes_a
+        n2 = 1
+        axes_a.each do |axis|
+          n2 *= as[axis]
+        end
+        tmp = a.shape.reduce(:*) / n2
+        newshape_a = [tmp, n2]
+        olda = notin.map { |axis| as[axis] }
+
+        notin = (0...ndb).reject { |i| axes_b.include?(i) }
+        newaxes_b = axes_b + notin
+        n2 = 1
+        axes_b.each do |axis|
+          n2 *= bs[axis]
+        end
+        tmp = b.shape.reduce(:*) / n2
+        newshape_b = [n2, tmp]
+        oldb = notin.map { |axis| bs[axis] }
+
+        at = a.transpose(*newaxes_a).reshape(*newshape_a)
+        bt = b.transpose(*newaxes_b).reshape(*newshape_b)
+        res = at.dot(bt)
+
+        return res.reshape(*(olda + oldb))
+      end
+    end
+  end
+end
+

data/lib/chainer/utils/variable.rb

@@ -6,12 +6,16 @@ module Chainer
           return
         end
 
-        unless gx.instance_of?(x.data.class)
-          raise TypeError, "Type of data and grad mismatch\n#{x.class} != #{gx.class}"
+        unless gx.is_a?(x.data.class.superclass)
+          raise TypeError, "Type of data and grad mismatch\n#{x.data.class} != #{gx.class}"
+        end
+
+        unless gx.class == x.data.class
+          raise TypeError, "Dtype(Class) of data and grad mismatch\n#{x.data.class} != #{gx.class}"
         end
 
         unless gx.shape == x.data.shape
-          raise TypeError, "Shape of data and grad mismatch\n#{x.class} != #{gx.class}"
+          raise TypeError, "Shape of data and grad mismatch\n#{x.data.shape} != #{gx.shape}"
         end
       end
     end

data/lib/chainer/version.rb

@@ -1,4 +1,4 @@
 module Chainer
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end
 

data/red-chainer.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "numo-narray", ">= 0.9.1.1"
+  spec.add_runtime_dependency "red-datasets"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-chainer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Yusaku Hatanaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1.1
+- !ruby/object:Gem::Dependency
+  name: red-datasets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -82,12 +96,17 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/cifar/models/vgg.rb
+- examples/cifar/train_cifar.rb
+- examples/iris.rb
 - examples/mnist.rb
 - lib/chainer.rb
 - lib/chainer/configuration.rb
+- lib/chainer/cuda.rb
 - lib/chainer/dataset/convert.rb
 - lib/chainer/dataset/download.rb
 - lib/chainer/dataset/iterator.rb
+- lib/chainer/datasets/cifar.rb
 - lib/chainer/datasets/mnist.rb
 - lib/chainer/datasets/tuple_dataset.rb
 - lib/chainer/function.rb
@@ -96,10 +115,18 @@ files:
 - lib/chainer/functions/activation/relu.rb
 - lib/chainer/functions/activation/sigmoid.rb
 - lib/chainer/functions/activation/tanh.rb
+- lib/chainer/functions/connection/convolution_2d.rb
 - lib/chainer/functions/connection/linear.rb
 - lib/chainer/functions/evaluation/accuracy.rb
+- lib/chainer/functions/loss/mean_squared_error.rb
 - lib/chainer/functions/loss/softmax_cross_entropy.rb
 - lib/chainer/functions/math/basic_math.rb
+- lib/chainer/functions/math/identity.rb
+- lib/chainer/functions/noise/dropout.rb
+- lib/chainer/functions/normalization/batch_normalization.rb
+- lib/chainer/functions/pooling/max_pooling_2d.rb
+- lib/chainer/functions/pooling/pooling_2d.rb
+- lib/chainer/gradient_check.rb
 - lib/chainer/gradient_method.rb
 - lib/chainer/hyperparameter.rb
 - lib/chainer/initializer.rb
@@ -108,16 +135,21 @@ files:
 - lib/chainer/initializers/normal.rb
 - lib/chainer/iterators/serial_iterator.rb
 - lib/chainer/link.rb
+- lib/chainer/links/connection/convolution_2d.rb
 - lib/chainer/links/connection/linear.rb
 - lib/chainer/links/model/classifier.rb
+- lib/chainer/links/normalization/batch_normalization.rb
 - lib/chainer/optimizer.rb
 - lib/chainer/optimizers/adam.rb
+- lib/chainer/optimizers/momentum_sgd.rb
 - lib/chainer/parameter.rb
 - lib/chainer/reporter.rb
 - lib/chainer/serializer.rb
 - lib/chainer/serializers/marshal.rb
+- lib/chainer/testing/array.rb
 - lib/chainer/training/extension.rb
 - lib/chainer/training/extensions/evaluator.rb
+- lib/chainer/training/extensions/exponential_shift.rb
 - lib/chainer/training/extensions/log_report.rb
 - lib/chainer/training/extensions/print_report.rb
 - lib/chainer/training/extensions/progress_bar.rb
@@ -128,7 +160,9 @@ files:
 - lib/chainer/training/updater.rb
 - lib/chainer/training/util.rb
 - lib/chainer/utils/array.rb
+- lib/chainer/utils/conv.rb
 - lib/chainer/utils/initializer.rb
+- lib/chainer/utils/math.rb
 - lib/chainer/utils/variable.rb
 - lib/chainer/variable.rb
 - lib/chainer/variable_node.rb
@@ -154,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A flexible framework for neural network for Ruby