red-chainer 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7ed2df404bfc36275381f523c0439f2e73debcf36f3b5edb063e985502d7a70
-  data.tar.gz: 357c983134aae985808568113d3f4f82bacebf6d25e5cf7c4f9197b1825455dc
+  metadata.gz: d05c5d3cb55a9e6c7e45afffd5483b9968959749d911a2e6292f5bea1e90ef40
+  data.tar.gz: fcdbb11f8b64a3f54a68a1629c40e9ffce774b551e79d21689757f1a495a7d66
 SHA512:
-  metadata.gz: 40eb83d14d6efd140a4cb9748f04f50cfa325c9831d8020890a20fe88fc1485547f4dcab48cdcadfda317b46b3f4a6bc936eb8204ae39a876e053878caa7359f
-  data.tar.gz: af4133b975c5b4b5ca6e2ce9fb05eddd2b1de5a8a30df9c776531a5acdcf5bc4d8322dc7d6875c49800587a4d98031d0eb62054dbd87ced964093c501da32c95
+  metadata.gz: e0a1423530e8b62dacd6ae876957cd00e604a659815dd1bd2e3ce6a7c30d3f22f68f718451b261e559fb3719211067a79c78a0b1f229e96c96db4dc7d3a7004a
+  data.tar.gz: da1bc06481526f5424705a8d68f0c4a1e98decaf30c81e217c5390ab96c4d4850eeecdec7cf88287c4581cc5556bbd24adbf26c3007145b9bf9e007e40047ae1

data/lib/chainer.rb

@@ -22,6 +22,7 @@ require 'chainer/initializers/uniform'
 require 'chainer/iterators/serial_iterator'
 require 'chainer/link'
 require 'chainer/links/connection/convolution_2d'
+require 'chainer/links/connection/embed_id'
 require 'chainer/links/connection/linear'
 require 'chainer/links/normalization/batch_normalization'
 require 'chainer/links/model/classifier'
@@ -56,6 +57,7 @@ require 'chainer/functions/loss/softmax_cross_entropy'
 require 'chainer/functions/connection/convolution_2d'
 require 'chainer/functions/connection/deconvolution_2d'
 require 'chainer/functions/connection/convolution_2d_grad_w'
+require 'chainer/functions/connection/embed_id'
 require 'chainer/functions/connection/linear'
 require 'chainer/functions/noise/dropout'
 require 'chainer/functions/normalization/batch_normalization'

data/lib/chainer/functions/connection/embed_id.rb

@@ -0,0 +1,49 @@
+module Chainer
+  module Functions
+    module Connection
+      class EmbedIDFunction < Chainer::Function
+        def initialize(ignore_label: nil)
+          @ignore_label = ignore_label
+        end
+
+        def self.embed_id(x, w, ignore_label: nil)
+          self.new(ignore_label: ignore_label).(x, w)
+        end
+
+        def forward(inputs)
+          xm = Chainer.get_array_module(*inputs)
+          (x, w) = inputs
+
+          unless @ignore_label
+            return [Chainer::Utils::Array.take(w, x, axis: 0)]
+          end
+
+          valid_x = x.ne(@ignore_label)
+          if valid_x.count == x.size
+            return [Chainer::Utils::Array.take(w, x, axis: 0)]
+          end
+          x *= valid_x
+          y = Chainer::Utils::Array.take(w, x, axis: 0).dup
+
+          y = y.reshape(y.shape.take(y.shape.size - 1).reduce(&:*), true)
+          valid_x.where2.last.each {|i| y[i, true] = y.class.zeros(y.shape.last) }
+
+          [y.reshape(*x.shape, true)]
+        end
+
+        def backward(inputs, grad_outputs)
+          (x, w) = inputs
+          gy = grad_outputs[0].reshape(x.size, true)
+          gw = w.class.zeros(w.shape).reshape(w.shape.take(w.shape.size - 1).reduce(&:*), true)
+
+          x.reshape(x.size).each_with_index do |ix, i|
+            next if ix == @ignore_label
+            gw[ix, true] = gw[ix, true] + gy[i, true]
+          end
+
+          [nil, gw.reshape(*w.shape)]
+        end
+      end
+    end
+  end
+end

data/lib/chainer/links/connection/embed_id.rb

@@ -0,0 +1,23 @@
+module Chainer
+  module Links
+    module Connection
+      class EmbedID < ::Chainer::Link
+        attr_reader :w
+
+        def initialize(in_size, out_size, initial_w: nil, ignore_label: nil)
+          super()
+          @ignore_label = ignore_label
+
+          init_scope do
+            initial_w ||= Chainer::Initializers::Normal.new(scale: 1.0)
+            @w = Chainer::Parameter.new(initializer: initial_w, shape: [in_size, out_size])
+          end
+        end
+
+        def call(x)
+          Chainer::Functions::Connection::EmbedIDFunction.embed_id(x, @w, ignore_label: @ignore_label)
+        end
+      end
+    end
+  end
+end

data/lib/chainer/serializers/marshal.rb

@@ -46,9 +46,9 @@ module Chainer
       #
       # @param [string] filename Name of the file to be loaded.
       # @param [object] obj Object to be deserialized. It must support serialization protocol.
-      def self.load_file(filename, obj)
+      def self.load_file(filename, obj, path: '', strict: true)
         File.open(filename) do |f|
-          d = self.new(Marshal.load(f))
+          d = self.new(Marshal.load(f), path: path, strict: strict)
           d.load(obj)
         end
       end

data/lib/chainer/utils/array.rb

@@ -18,28 +18,32 @@ module Chainer
         end
       end
 
-      def self.take(x, indices, axis: nil)
-        if axis
-          indices = make_indecies_with_axis(x.shape, indices, axis)
+      def self.ndindex(shape)
+        shape.reduce(&:*).times.map do |i|
+          shape.size.times.reduce([]) do |ndidx, j|
+            ndidx << (i / shape.drop(j + 1).reduce(1, &:*)) % shape[j]
+          end
         end
-        x[indices]
       end
 
-      def self.make_indecies_with_axis(shape, indices, axis, values = [])
-        target_axis = values.size
-        if shape.size == values.size
-          values.zip(shape.drop(1) + [1]).reduce(0) do |sum, (x, ndim)|
-            (sum + x) * ndim
-          end
-        else
-          enum = (axis == target_axis) ? indices : (0...shape[target_axis])
-          if enum.is_a?(Integer)
-            make_indecies_with_axis(shape, indices, axis, values + [indices])
-          else
-            enum.map do |x|
-              make_indecies_with_axis(shape, indices, axis, values + [x])
+      def self.take(x, indices, axis: nil)
+        if axis
+          dimensional_indices = ::Array.new(x.shape.size, true)
+
+          indices_narray = Numo::Int32.cast(indices)
+          if indices_narray.shape.size > 1
+            y = x.class.zeros(*indices_narray.shape, *x.shape.drop(axis + 1))
+            self.ndindex(indices_narray.shape).each do |ndidx|
+              dimensional_indices[axis] = indices_narray[*ndidx]
+              y[*ndidx, *::Array.new(x.shape.size - axis - 1, true)] = x[*dimensional_indices]
             end
+            return y
+          else
+            dimensional_indices[axis] = indices
           end
+          x[*dimensional_indices]
+        else
+          x[indices]
         end
       end
 

data/lib/chainer/version.rb

@@ -1,4 +1,4 @@
 module Chainer
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-chainer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Yusaku Hatanaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -145,6 +145,7 @@ files:
 - lib/chainer/functions/connection/convolution_2d.rb
 - lib/chainer/functions/connection/convolution_2d_grad_w.rb
 - lib/chainer/functions/connection/deconvolution_2d.rb
+- lib/chainer/functions/connection/embed_id.rb
 - lib/chainer/functions/connection/linear.rb
 - lib/chainer/functions/evaluation/accuracy.rb
 - lib/chainer/functions/loss/mean_squared_error.rb
@@ -169,6 +170,7 @@ files:
 - lib/chainer/iterators/serial_iterator.rb
 - lib/chainer/link.rb
 - lib/chainer/links/connection/convolution_2d.rb
+- lib/chainer/links/connection/embed_id.rb
 - lib/chainer/links/connection/linear.rb
 - lib/chainer/links/model/classifier.rb
 - lib/chainer/links/normalization/batch_normalization.rb