ruby-dnn 0.14.3 → 0.15.0

data/lib/dnn/core/param.rb

@@ -1,13 +1,11 @@
 module DNN
   class Param
-    attr_accessor :name
     attr_accessor :data
     attr_accessor :grad
 
     def initialize(data = nil, grad = nil)
       @data = data
       @grad = grad
-      @name = nil
     end
   end
 end

data/lib/dnn/core/savers.rb

@@ -19,15 +19,6 @@ module DNN
       def load_bin(bin)
         raise NotImplementedError, "Class '#{self.class.name}' has implement method 'load_bin'"
       end
-
-      def set_all_params_data(params_data)
-        all_params = @model.has_param_layers.map { |layer|
-          layer.get_params.values
-        }.flatten
-        all_params.each do |param|
-          param.data = params_data[param.name]
-        end
-      end
     end
 
     class MarshalLoader < Loader
@@ -36,12 +27,13 @@ module DNN
         unless @model.class.name == data[:class]
           raise DNN_Error, "Class name is not mismatch. Target model is #{@model.class.name}. But loading model is #{data[:class]}."
         end
-        opt = Optimizers::Optimizer.load(data[:optimizer])
-        loss_func = Losses::Loss.from_hash(data[:loss_func])
-        @model.setup(opt, loss_func)
-        @model.instance_variable_set(:@built, false)
-        @model.predict1(Xumo::SFloat.zeros(*data[:input_shape]))
-        set_all_params_data(data[:params])
+        if data[:model]
+          data[:model].instance_variables.each do |ivar|
+            obj = data[:model].instance_variable_get(ivar)
+            @model.instance_variable_set(ivar, obj)
+          end
+        end
+        @model.set_all_params_data(data[:params])
       end
     end
 
@@ -50,20 +42,20 @@ module DNN
 
       def load_bin(bin)
         data = JSON.parse(bin, symbolize_names: true)
-        opt = Optimizers::Optimizer.from_hash(data[:optimizer])
-        loss_func = Losses::Loss.from_hash(data[:loss_func])
-        @model.setup(opt, loss_func)
-        @model.instance_variable_set(:@built, false)
-        @model.predict1(Xumo::SFloat.zeros(*data[:input_shape]))
-        base64_to_params_data(data[:params])
+        unless @model.class.name == data[:class]
+          raise DNN_Error, "Class name is not mismatch. Target model is #{@model.class.name}. But loading model is #{data[:class]}."
+        end
+        set_all_params_base64_data(data[:params])
       end
 
-      def base64_to_params_data(base64_params_data)
-        params_data = base64_params_data.to_h do |key, (shape, base64_data)|
-          bin = Base64.decode64(base64_data)
-          [key, Xumo::SFloat.from_binary(bin).reshape(*shape)]
+      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)
+            data = Xumo::SFloat.from_binary(bin).reshape(*shape)
+            layer.get_params[key].data = data
+          end
         end
-        set_all_params_data(params_data)
       end
     end
 
@@ -92,28 +84,28 @@ module DNN
       def dump_bin
         raise NotImplementedError, "Class '#{self.class.name}' has implement method 'dump_bin'"
       end
-
-      def get_all_params_data
-        all_params = @model.has_param_layers.map { |layer|
-          layer.get_params.values
-        }.flatten
-        all_params.to_h { |param| [param.name, param.data] }
-      end
     end
 
     class MarshalSaver < Saver
-      def initialize(model, include_optimizer: true)
+      def initialize(model, include_model: true)
         super(model)
-        @include_optimizer = include_optimizer
+        @include_model = include_model
       end
 
       private def dump_bin
-        require_status = @include_optimizer ? true : false
-        data = {
-          version: VERSION, class: @model.class.name, input_shape: @model.layers.first.input_shape, params: get_all_params_data,
-          optimizer: @model.optimizer.dump(require_status), loss_func: @model.loss_func.to_hash
-        }
-        Zlib::Deflate.deflate(Marshal.dump(data))
+        params_data = @model.get_all_params_data
+        if @include_model
+          @model.clean_layers
+          data = {
+            version: VERSION, class: @model.class.name, input_shape: @model.layers.first.input_shape,
+            params: params_data, model: @model
+          }
+        else
+          data = { version: VERSION, class: @model.class.name, params: params_data }
+        end
+        bin = Zlib::Deflate.deflate(Marshal.dump(data))
+        @model.set_all_params_data(params_data) if @include_model
+        bin
       end
     end
 
@@ -121,17 +113,16 @@ module DNN
       private
 
       def dump_bin
-        data = {
-          version: VERSION, class: @model.class.name, input_shape: @model.layers.first.input_shape, params: params_data_to_base64,
-          optimizer: @model.optimizer.to_hash, loss_func: @model.loss_func.to_hash
-        }
+        data = { version: VERSION, class: @model.class.name, params: get_all_params_base64_data }
         JSON.dump(data)
       end
 
-      def params_data_to_base64
-        get_all_params_data.to_h do |key, data|
-          base64_data = Base64.encode64(data.to_binary)
-          [key, [data.shape, base64_data]]
+      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)
+            [key, [param.data.shape, base64_data]]
+          end
         end
       end
     end

data/lib/dnn/datasets/stl-10.rb

@@ -0,0 +1,65 @@
+require "zlib"
+require "archive/tar/minitar"
+require_relative "downloader"
+
+URL_STL10 = "http://ai.stanford.edu/~acoates/stl10/stl10_binary.tar.gz"
+DIR_STL10 = "stl10_binary"
+
+module DNN
+  module STL10
+    class DNN_STL10_LoadError < DNN_Error; end
+
+    def self.downloads
+      return if Dir.exist?(DOWNLOADS_PATH + "/downloads/" + DIR_STL10)
+      Downloader.download(URL_STL10)
+      stl10_binary_file_name = DOWNLOADS_PATH + "/downloads/" + URL_STL10.match(%r`.+/(.+)`)[1]
+      begin
+        Zlib::GzipReader.open(stl10_binary_file_name) do |gz|
+          Archive::Tar::Minitar.unpack(gz, DOWNLOADS_PATH + "/downloads")
+        end
+      ensure
+        File.unlink(stl10_binary_file_name)
+      end
+    end
+
+    def self.load_train
+      downloads
+      x_fname = DOWNLOADS_PATH + "/downloads/#{DIR_STL10}/train_X.bin"
+      raise DNN_STL10_LoadError.new(%`file "#{x_fname}" is not found.`) unless File.exist?(x_fname)
+      y_fname = DOWNLOADS_PATH + "/downloads/#{DIR_STL10}/train_y.bin"
+      raise DNN_STL10_LoadError.new(%`file "#{y_fname}" is not found.`) unless File.exist?(y_fname)
+      x_bin = File.binread(x_fname)
+      y_bin = File.binread(y_fname)
+      x_train = Numo::UInt8.from_binary(x_bin).reshape(5000, 3, 96, 96).transpose(0, 3, 2, 1).clone
+      y_train = Numo::UInt8.from_binary(y_bin)
+      [x_train, y_train]
+    end
+
+    def self.load_test
+      downloads
+      x_fname = DOWNLOADS_PATH + "/downloads/#{DIR_STL10}/test_X.bin"
+      raise DNN_STL10_LoadError.new(%`file "#{x_fname}" is not found.`) unless File.exist?(x_fname)
+      y_fname = DOWNLOADS_PATH + "/downloads/#{DIR_STL10}/test_y.bin"
+      raise DNN_STL10_LoadError.new(%`file "#{y_fname}" is not found.`) unless File.exist?(y_fname)
+      x_bin = File.binread(x_fname)
+      y_bin = File.binread(y_fname)
+      x_test = Numo::UInt8.from_binary(x_bin).reshape(8000, 3, 96, 96).transpose(0, 3, 2, 1).clone
+      y_test = Numo::UInt8.from_binary(y_bin)
+      [x_test, y_test]
+    end
+
+    def self.load_unlabeled(range = 0...100000)
+      unless 0 <= range.begin && range.end <= 100000
+        raise DNN_Error, "Range must between 0 and 100000. (But the end is excluded)"
+      end
+      downloads
+      x_fname = DOWNLOADS_PATH + "/downloads/#{DIR_STL10}/unlabeled_X.bin"
+      raise DNN_STL10_LoadError.new(%`file "#{x_fname}" is not found.`) unless File.exist?(x_fname)
+      num_datas = range.end - range.begin
+      length = num_datas * 3 * 96 * 96
+      ofs = range.begin * 3 * 96 * 96
+      x_bin = File.binread(x_fname, length, ofs)
+      Numo::UInt8.from_binary(x_bin).reshape(num_datas, 3, 96, 96).transpose(0, 3, 2, 1).clone
+    end
+  end
+end

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.14.3"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.0
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-03 00:00:00.000000000 Z
+date: 2019-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -118,24 +118,24 @@ files:
 - ext/rb_stb_image/extconf.rb
 - ext/rb_stb_image/rb_stb_image.c
 - lib/dnn.rb
-- lib/dnn/core/activations.rb
 - lib/dnn/core/callbacks.rb
-- lib/dnn/core/cnn_layers.rb
-- lib/dnn/core/embedding.rb
 - lib/dnn/core/error.rb
 - lib/dnn/core/global.rb
 - lib/dnn/core/initializers.rb
 - lib/dnn/core/iterator.rb
-- lib/dnn/core/layers.rb
+- lib/dnn/core/layers/activations.rb
+- lib/dnn/core/layers/basic_layers.rb
+- lib/dnn/core/layers/cnn_layers.rb
+- lib/dnn/core/layers/embedding.rb
+- lib/dnn/core/layers/merge_layers.rb
+- lib/dnn/core/layers/normalizations.rb
+- lib/dnn/core/layers/rnn_layers.rb
 - lib/dnn/core/link.rb
 - lib/dnn/core/losses.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
 - lib/dnn/core/regularizers.rb
-- lib/dnn/core/rnn_layers.rb
 - lib/dnn/core/savers.rb
 - lib/dnn/core/tensor.rb
 - lib/dnn/core/utils.rb
@@ -145,6 +145,7 @@ files:
 - lib/dnn/datasets/fashion-mnist.rb
 - lib/dnn/datasets/iris.rb
 - lib/dnn/datasets/mnist.rb
+- lib/dnn/datasets/stl-10.rb
 - lib/dnn/image.rb
 - lib/dnn/version.rb
 - ruby-dnn.gemspec