ruby-dnn 0.10.1 → 0.10.2

data/examples/mnist_example.rb

@@ -1,39 +1,39 @@
-require "dnn"
-require "dnn/mnist"
-# If you use numo/linalg then please uncomment out.
-# require "numo/linalg/autoloader"
-
-include DNN::Layers
-include DNN::Activations
-include DNN::Optimizers
-include DNN::Losses
-Model = DNN::Model
-MNIST = DNN::MNIST
-
-x_train, y_train = MNIST.load_train
-x_test, y_test = MNIST.load_test
-
-x_train = Numo::SFloat.cast(x_train).reshape(x_train.shape[0], 784)
-x_test = Numo::SFloat.cast(x_test).reshape(x_test.shape[0], 784)
-
-x_train /= 255
-x_test /= 255
-
-y_train = DNN::Utils.to_categorical(y_train, 10, Numo::SFloat)
-y_test = DNN::Utils.to_categorical(y_test, 10, Numo::SFloat)
-
-model = Model.new
-
-model << InputLayer.new(784)
-
-model << Dense.new(256)
-model << ReLU.new
-
-model << Dense.new(256)
-model << ReLU.new
-
-model << Dense.new(10)
-
-model.compile(RMSProp.new, SoftmaxCrossEntropy.new)
-
-model.train(x_train, y_train, 10, batch_size: 100, test: [x_test, y_test])
+require "dnn"
+require "dnn/mnist"
+# If you use numo/linalg then please uncomment out.
+# require "numo/linalg/autoloader"
+
+include DNN::Layers
+include DNN::Activations
+include DNN::Optimizers
+include DNN::Losses
+Model = DNN::Model
+MNIST = DNN::MNIST
+
+x_train, y_train = MNIST.load_train
+x_test, y_test = MNIST.load_test
+
+x_train = Numo::SFloat.cast(x_train).reshape(x_train.shape[0], 784)
+x_test = Numo::SFloat.cast(x_test).reshape(x_test.shape[0], 784)
+
+x_train /= 255
+x_test /= 255
+
+y_train = DNN::Utils.to_categorical(y_train, 10, Numo::SFloat)
+y_test = DNN::Utils.to_categorical(y_test, 10, Numo::SFloat)
+
+model = Model.new
+
+model << InputLayer.new(784)
+
+model << Dense.new(256)
+model << ReLU.new
+
+model << Dense.new(256)
+model << ReLU.new
+
+model << Dense.new(10)
+
+model.compile(RMSProp.new, SoftmaxCrossEntropy.new)
+
+model.train(x_train, y_train, 10, batch_size: 100, test: [x_test, y_test])

data/examples/mnist_lstm_example.rb

@@ -1,36 +1,36 @@
-require "dnn"
-require "dnn/mnist"
-# If you use numo/linalg then please uncomment out.
-# require "numo/linalg/autoloader"
-
-include DNN::Layers
-include DNN::Activations
-include DNN::Optimizers
-include DNN::Losses
-Model = DNN::Model
-MNIST = DNN::MNIST
-
-x_train, y_train = MNIST.load_train
-x_test, y_test = MNIST.load_test
-
-x_train = Numo::SFloat.cast(x_train).reshape(x_train.shape[0], 28, 28)
-x_test = Numo::SFloat.cast(x_test).reshape(x_test.shape[0], 28, 28)
-
-x_train /= 255
-x_test /= 255
-
-y_train = DNN::Utils.to_categorical(y_train, 10, Numo::SFloat)
-y_test = DNN::Utils.to_categorical(y_test, 10, Numo::SFloat)
-
-model = Model.new
-
-model << InputLayer.new([28, 28])
-
-model << LSTM.new(200)
-model << LSTM.new(200, return_sequences: false)
-
-model << Dense.new(10)
-
-model.compile(Adam.new, SoftmaxCrossEntropy.new)
-
-model.train(x_train, y_train, 10, batch_size: 100, test: [x_test, y_test])
+require "dnn"
+require "dnn/mnist"
+# If you use numo/linalg then please uncomment out.
+# require "numo/linalg/autoloader"
+
+include DNN::Layers
+include DNN::Activations
+include DNN::Optimizers
+include DNN::Losses
+Model = DNN::Model
+MNIST = DNN::MNIST
+
+x_train, y_train = MNIST.load_train
+x_test, y_test = MNIST.load_test
+
+x_train = Numo::SFloat.cast(x_train).reshape(x_train.shape[0], 28, 28)
+x_test = Numo::SFloat.cast(x_test).reshape(x_test.shape[0], 28, 28)
+
+x_train /= 255
+x_test /= 255
+
+y_train = DNN::Utils.to_categorical(y_train, 10, Numo::SFloat)
+y_test = DNN::Utils.to_categorical(y_test, 10, Numo::SFloat)
+
+model = Model.new
+
+model << InputLayer.new([28, 28])
+
+model << LSTM.new(200)
+model << LSTM.new(200, return_sequences: false)
+
+model << Dense.new(10)
+
+model.compile(Adam.new, SoftmaxCrossEntropy.new)
+
+model.train(x_train, y_train, 10, batch_size: 100, test: [x_test, y_test])

data/examples/xor_example.rb

@@ -1,24 +1,24 @@
-require "dnn"
-
-include DNN::Layers
-include DNN::Activations
-include DNN::Optimizers
-include DNN::Losses
-Model = DNN::Model
-Utils = DNN::Utils
-
-x = Numo::SFloat[[0, 0], [1, 0], [0, 1], [1, 1]]
-y = Numo::SFloat[[0], [1], [1], [0]]
-
-model = Model.new
-
-model << InputLayer.new(2)
-model << Dense.new(16)
-model << ReLU.new
-model << Dense.new(1)
-
-model.compile(SGD.new, SigmoidCrossEntropy.new)
-
-model.train(x, y, 20000, batch_size: 4, verbose: false)
-
-p Utils.sigmoid(model.predict(x))
+require "dnn"
+
+include DNN::Layers
+include DNN::Activations
+include DNN::Optimizers
+include DNN::Losses
+Model = DNN::Model
+Utils = DNN::Utils
+
+x = Numo::SFloat[[0, 0], [1, 0], [0, 1], [1, 1]]
+y = Numo::SFloat[[0], [1], [1], [0]]
+
+model = Model.new
+
+model << InputLayer.new(2)
+model << Dense.new(16)
+model << ReLU.new
+model << Dense.new(1)
+
+model.compile(SGD.new, SigmoidCrossEntropy.new)
+
+model.train(x, y, 20000, batch_size: 4, verbose: false)
+
+p Utils.sigmoid(model.predict(x))

data/lib/dnn.rb

@@ -1,26 +1,27 @@
-if defined? Cumo
-  Xumo = Cumo
-else
-  require "numo/narray"
-  Xumo = Numo
-end
-
-module DNN
-  NMath = Xumo::NMath
-end
-
-require_relative "dnn/version"
-require_relative "dnn/core/error"
-require_relative "dnn/core/model"
-require_relative "dnn/core/param"
-require_relative "dnn/core/dataset"
-require_relative "dnn/core/initializers"
-require_relative "dnn/core/layers"
-require_relative "dnn/core/normalizations"
-require_relative "dnn/core/activations"
-require_relative "dnn/core/losses"
-require_relative "dnn/core/regularizers"
-require_relative "dnn/core/cnn_layers"
-require_relative "dnn/core/rnn_layers"
-require_relative "dnn/core/optimizers"
-require_relative "dnn/core/utils"
+if defined? Cumo
+  Xumo = Cumo
+else
+  require "numo/narray"
+  Xumo = Numo
+end
+
+module DNN
+  NMath = Xumo::NMath
+end
+
+require_relative "dnn/version"
+require_relative "dnn/core/error"
+require_relative "dnn/core/model"
+require_relative "dnn/core/param"
+require_relative "dnn/core/dataset"
+require_relative "dnn/core/initializers"
+require_relative "dnn/core/layers"
+require_relative "dnn/core/normalizations"
+require_relative "dnn/core/activations"
+require_relative "dnn/core/losses"
+require_relative "dnn/core/regularizers"
+require_relative "dnn/core/cnn_layers"
+require_relative "dnn/core/embedding"
+require_relative "dnn/core/rnn_layers"
+require_relative "dnn/core/optimizers"
+require_relative "dnn/core/utils"

data/lib/dnn/cifar10.rb

@@ -1,51 +1,51 @@
-require "zlib"
-require "archive/tar/minitar"
-require_relative "../../ext/cifar_loader/cifar_loader"
-require_relative "downloader"
-
-URL_CIFAR10 = "https://www.cs.toronto.edu/~kriz/cifar-10-binary.tar.gz"
-DIR_CIFAR10 = "cifar-10-batches-bin"
-
-module DNN
-  module CIFAR10
-    class DNN_CIFAR10_LoadError < DNN_Error; end
-
-    def self.downloads
-      return if Dir.exist?(__dir__ + "/downloads/" + DIR_CIFAR10)
-      Downloader.download(URL_CIFAR10)
-      cifar10_binary_file_name = __dir__ + "/downloads/" + URL_CIFAR10.match(%r`.+/(.+)`)[1]
-      begin
-        Zlib::GzipReader.open(cifar10_binary_file_name) do |gz|
-          Archive::Tar::Minitar::unpack(gz, __dir__ + "/downloads")
-        end
-      ensure
-        File.unlink(cifar10_binary_file_name)
-      end
-    end
-
-    def self.load_train
-      downloads
-      bin = ""
-      (1..5).each do |i|
-        fname = __dir__ + "/downloads/#{DIR_CIFAR10}/data_batch_#{i}.bin"
-        raise DNN_CIFAR10_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
-        bin << File.binread(fname)
-      end
-      x_bin, y_bin = CIFAR10.load_binary(bin, 50000)
-      x_train = Numo::UInt8.from_binary(x_bin).reshape(50000, 3, 32, 32).transpose(0, 2, 3, 1).clone
-      y_train = Numo::UInt8.from_binary(y_bin)
-      [x_train, y_train]
-    end
-
-    def self.load_test
-      downloads
-      fname = __dir__ + "/downloads/#{DIR_CIFAR10}/test_batch.bin"
-      raise DNN_CIFAR10_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
-      bin = File.binread(fname)
-      x_bin, y_bin = CIFAR10.load_binary(bin, 10000)
-      x_test = Numo::UInt8.from_binary(x_bin).reshape(10000, 3, 32, 32).transpose(0, 2, 3, 1).clone
-      y_test = Numo::UInt8.from_binary(y_bin)
-      [x_test, y_test]
-    end
-  end
-end
+require "zlib"
+require "archive/tar/minitar"
+require_relative "../../ext/cifar_loader/cifar_loader"
+require_relative "downloader"
+
+URL_CIFAR10 = "https://www.cs.toronto.edu/~kriz/cifar-10-binary.tar.gz"
+DIR_CIFAR10 = "cifar-10-batches-bin"
+
+module DNN
+  module CIFAR10
+    class DNN_CIFAR10_LoadError < DNN_Error; end
+
+    def self.downloads
+      return if Dir.exist?(__dir__ + "/downloads/" + DIR_CIFAR10)
+      Downloader.download(URL_CIFAR10)
+      cifar10_binary_file_name = __dir__ + "/downloads/" + URL_CIFAR10.match(%r`.+/(.+)`)[1]
+      begin
+        Zlib::GzipReader.open(cifar10_binary_file_name) do |gz|
+          Archive::Tar::Minitar::unpack(gz, __dir__ + "/downloads")
+        end
+      ensure
+        File.unlink(cifar10_binary_file_name)
+      end
+    end
+
+    def self.load_train
+      downloads
+      bin = ""
+      (1..5).each do |i|
+        fname = __dir__ + "/downloads/#{DIR_CIFAR10}/data_batch_#{i}.bin"
+        raise DNN_CIFAR10_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
+        bin << File.binread(fname)
+      end
+      x_bin, y_bin = CIFAR10.load_binary(bin, 50000)
+      x_train = Numo::UInt8.from_binary(x_bin).reshape(50000, 3, 32, 32).transpose(0, 2, 3, 1).clone
+      y_train = Numo::UInt8.from_binary(y_bin)
+      [x_train, y_train]
+    end
+
+    def self.load_test
+      downloads
+      fname = __dir__ + "/downloads/#{DIR_CIFAR10}/test_batch.bin"
+      raise DNN_CIFAR10_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
+      bin = File.binread(fname)
+      x_bin, y_bin = CIFAR10.load_binary(bin, 10000)
+      x_test = Numo::UInt8.from_binary(x_bin).reshape(10000, 3, 32, 32).transpose(0, 2, 3, 1).clone
+      y_test = Numo::UInt8.from_binary(y_bin)
+      [x_test, y_test]
+    end
+  end
+end

data/lib/dnn/cifar100.rb

@@ -1,49 +1,49 @@
-require "zlib"
-require "archive/tar/minitar"
-require_relative "../../ext/cifar_loader/cifar_loader"
-require_relative "downloader"
-
-URL_CIFAR100 = "https://www.cs.toronto.edu/~kriz/cifar-100-binary.tar.gz"
-DIR_CIFAR100 = "cifar-100-binary"
-
-module DNN
-  module CIFAR100
-    class DNN_CIFAR100_LoadError < DNN_Error; end
-
-    def self.downloads
-      return if Dir.exist?(__dir__ + "/downloads/" + DIR_CIFAR100)
-      Downloader.download(URL_CIFAR100)
-      cifar100_binary_file_name = __dir__ + "/downloads/" + URL_CIFAR100.match(%r`.+/(.+)`)[1]
-      begin
-        Zlib::GzipReader.open(cifar100_binary_file_name) do |gz|
-          Archive::Tar::Minitar::unpack(gz, __dir__ + "/downloads")
-        end
-      ensure
-        File.unlink(cifar100_binary_file_name)
-      end
-    end
-
-    def self.load_train
-      downloads
-      bin = ""
-      fname = __dir__ + "/downloads/#{DIR_CIFAR100}/train.bin"
-      raise DNN_CIFAR100_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
-      bin << File.binread(fname)
-      x_bin, y_bin = CIFAR100.load_binary(bin, 50000)
-      x_train = Numo::UInt8.from_binary(x_bin).reshape(50000, 3, 32, 32).transpose(0, 2, 3, 1).clone
-      y_train = Numo::UInt8.from_binary(y_bin).reshape(50000, 2)
-      [x_train, y_train]
-    end
-
-    def self.load_test
-      downloads
-      fname = __dir__ + "/downloads/#{DIR_CIFAR100}/test.bin"
-      raise DNN_CIFAR100_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
-      bin = File.binread(fname)
-      x_bin, y_bin = CIFAR100.load_binary(bin, 10000)
-      x_test = Numo::UInt8.from_binary(x_bin).reshape(10000, 3, 32, 32).transpose(0, 2, 3, 1).clone
-      y_test = Numo::UInt8.from_binary(y_bin).reshape(10000, 2)
-      [x_test, y_test]
-    end
-  end
-end
+require "zlib"
+require "archive/tar/minitar"
+require_relative "../../ext/cifar_loader/cifar_loader"
+require_relative "downloader"
+
+URL_CIFAR100 = "https://www.cs.toronto.edu/~kriz/cifar-100-binary.tar.gz"
+DIR_CIFAR100 = "cifar-100-binary"
+
+module DNN
+  module CIFAR100
+    class DNN_CIFAR100_LoadError < DNN_Error; end
+
+    def self.downloads
+      return if Dir.exist?(__dir__ + "/downloads/" + DIR_CIFAR100)
+      Downloader.download(URL_CIFAR100)
+      cifar100_binary_file_name = __dir__ + "/downloads/" + URL_CIFAR100.match(%r`.+/(.+)`)[1]
+      begin
+        Zlib::GzipReader.open(cifar100_binary_file_name) do |gz|
+          Archive::Tar::Minitar::unpack(gz, __dir__ + "/downloads")
+        end
+      ensure
+        File.unlink(cifar100_binary_file_name)
+      end
+    end
+
+    def self.load_train
+      downloads
+      bin = ""
+      fname = __dir__ + "/downloads/#{DIR_CIFAR100}/train.bin"
+      raise DNN_CIFAR100_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
+      bin << File.binread(fname)
+      x_bin, y_bin = CIFAR100.load_binary(bin, 50000)
+      x_train = Numo::UInt8.from_binary(x_bin).reshape(50000, 3, 32, 32).transpose(0, 2, 3, 1).clone
+      y_train = Numo::UInt8.from_binary(y_bin).reshape(50000, 2)
+      [x_train, y_train]
+    end
+
+    def self.load_test
+      downloads
+      fname = __dir__ + "/downloads/#{DIR_CIFAR100}/test.bin"
+      raise DNN_CIFAR100_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
+      bin = File.binread(fname)
+      x_bin, y_bin = CIFAR100.load_binary(bin, 10000)
+      x_test = Numo::UInt8.from_binary(x_bin).reshape(10000, 3, 32, 32).transpose(0, 2, 3, 1).clone
+      y_test = Numo::UInt8.from_binary(y_bin).reshape(10000, 2)
+      [x_test, y_test]
+    end
+  end
+end