ruby-dnn 0.10.1 → 0.10.2

data/lib/dnn/core/utils.rb

@@ -1,34 +1,34 @@
-module DNN
-  # This module provides utility functions.
-  module Utils
-    # Categorize labels into "num_classes" classes.
-    def self.to_categorical(y, num_classes, narray_type = nil)
-      narray_type ||= y.class
-      y2 = narray_type.zeros(y.shape[0], num_classes)
-      y.shape[0].times do |i|
-        y2[i, y[i]] = 1
-      end
-      y2
-    end
-
-    # Convert hash to an object.
-    def self.from_hash(hash)
-      return nil if hash == nil
-      dnn_class = DNN.const_get(hash[:class])
-      if dnn_class.respond_to?(:from_hash)
-        return dnn_class.from_hash(hash)
-      end
-      dnn_class.new
-    end
-
-    # Return the result of the sigmoid function.
-    def self.sigmoid(x)
-      Sigmoid.new.forward(x)
-    end
-
-    # Return the result of the softmax function.
-    def self.softmax(x)
-      SoftmaxCrossEntropy.softmax(x)
-    end
-  end
-end
+module DNN
+  # This module provides utility functions.
+  module Utils
+    # Categorize labels into "num_classes" classes.
+    def self.to_categorical(y, num_classes, narray_type = nil)
+      narray_type ||= y.class
+      y2 = narray_type.zeros(y.shape[0], num_classes)
+      y.shape[0].times do |i|
+        y2[i, y[i]] = 1
+      end
+      y2
+    end
+
+    # Convert hash to an object.
+    def self.from_hash(hash)
+      return nil if hash == nil
+      dnn_class = DNN.const_get(hash[:class])
+      if dnn_class.respond_to?(:from_hash)
+        return dnn_class.from_hash(hash)
+      end
+      dnn_class.new
+    end
+
+    # Return the result of the sigmoid function.
+    def self.sigmoid(x)
+      Sigmoid.new.forward(x)
+    end
+
+    # Return the result of the softmax function.
+    def self.softmax(x)
+      SoftmaxCrossEntropy.softmax(x)
+    end
+  end
+end

data/lib/dnn/downloader.rb

@@ -1,50 +1,50 @@
-require "net/http"
-
-module DNN
-
-  class DNN_DownloadError < DNN_Error; end
-
-  class Downloader
-    def self.download(url, dir_path = nil)
-      unless dir_path
-        Dir.mkdir("#{__dir__}/downloads") unless Dir.exist?("#{__dir__}/downloads")
-        dir_path = "#{__dir__}/downloads"
-      end
-      Downloader.new(url).download(dir_path)
-    rescue => ex
-      raise DNN_DownloadError.new(ex.message)
-    end
-
-    def initialize(url)
-      @url = url
-      *, @fqdn, @path = *url.match(%r`https?://(.+?)(/.+)`)
-    end
-
-    def download(dir_path)
-      puts %`download "#{@url}"`
-      buf = ""
-      Net::HTTP.start(@fqdn) do |http|
-        content_length = http.head(@path).content_length
-        http.get(@path) do |body_segment|
-          buf << body_segment
-          log = "\r"
-          40.times do |i|
-            if i < buf.size * 40 / content_length
-              log << "="
-            elsif i == buf.size * 40 / content_length
-              log << ">"
-            else
-              log << "_"
-            end
-          end
-          log << "  #{buf.size}/#{content_length}"
-          print log
-        end
-        puts ""
-      end
-      file_name = @path.match(%r`.+/(.+)`)[1]
-      File.binwrite("#{dir_path}/#{file_name}", buf)
-    end
-  end
-
-end
+require "net/http"
+
+module DNN
+
+  class DNN_DownloadError < DNN_Error; end
+
+  class Downloader
+    def self.download(url, dir_path = nil)
+      unless dir_path
+        Dir.mkdir("#{__dir__}/downloads") unless Dir.exist?("#{__dir__}/downloads")
+        dir_path = "#{__dir__}/downloads"
+      end
+      Downloader.new(url).download(dir_path)
+    rescue => ex
+      raise DNN_DownloadError.new(ex.message)
+    end
+
+    def initialize(url)
+      @url = url
+      *, @fqdn, @path = *url.match(%r`https?://(.+?)(/.+)`)
+    end
+
+    def download(dir_path)
+      puts %`download "#{@url}"`
+      buf = ""
+      Net::HTTP.start(@fqdn) do |http|
+        content_length = http.head(@path).content_length
+        http.get(@path) do |body_segment|
+          buf << body_segment
+          log = "\r"
+          40.times do |i|
+            if i < buf.size * 40 / content_length
+              log << "="
+            elsif i == buf.size * 40 / content_length
+              log << ">"
+            else
+              log << "_"
+            end
+          end
+          log << "  #{buf.size}/#{content_length}"
+          print log
+        end
+        puts ""
+      end
+      file_name = @path.match(%r`.+/(.+)`)[1]
+      File.binwrite("#{dir_path}/#{file_name}", buf)
+    end
+  end
+
+end

data/lib/dnn/image.rb

@@ -1,41 +1,41 @@
-require "numo/narray"
-require_relative "../../ext/rb_stb_image/rb_stb_image"
-
-module DNN
-  module Image
-    def self.read(file_name)
-      raise Image::ReadError.new("#{file_name} is not found.") unless File.exist?(file_name)
-      bin, w, h, n = Stb.stbi_load(file_name, 3)
-      img = Numo::UInt8.from_binary(bin)
-      img.reshape(h, w, 3)
-    end
-
-    def self.write(file_name, img, quality: 100)
-      if img.shape.length == 2
-        img = Numo::UInt8[img, img, img].transpose(1, 2, 0).clone
-      elsif img.shape[2] == 1
-        img = img.reshape(img.shape[0], img.shape[1])
-        img = Numo::UInt8[img, img, img].transpose(1, 2, 0).clone
-      end
-      h, w, ch = img.shape
-      bin = img.to_binary
-      case file_name
-      when /\.png$/i
-        stride_in_bytes = w * ch
-        Stb.stbi_write_png(file_name, w, h, ch, bin, stride_in_bytes)
-      when /\.bmp$/i
-        Stb.stbi_write_bmp(file_name, w, h, ch, bin)
-      when /\.jpg$/i, /\.jpeg/i
-        Stb.stbi_write_jpg(file_name, w, h, ch, bin, quality)
-      end
-    rescue => ex
-      raise Image::WriteError.new(ex.message)
-    end
-  end
-
-  class Image::Error < StandardError; end
-
-  class Image::ReadError < Image::Error; end
-
-  class Image::WriteError < Image::Error; end
-end
+require "numo/narray"
+require_relative "../../ext/rb_stb_image/rb_stb_image"
+
+module DNN
+  module Image
+    def self.read(file_name)
+      raise Image::ReadError.new("#{file_name} is not found.") unless File.exist?(file_name)
+      bin, w, h, n = Stb.stbi_load(file_name, 3)
+      img = Numo::UInt8.from_binary(bin)
+      img.reshape(h, w, 3)
+    end
+
+    def self.write(file_name, img, quality: 100)
+      if img.shape.length == 2
+        img = Numo::UInt8[img, img, img].transpose(1, 2, 0).clone
+      elsif img.shape[2] == 1
+        img = img.reshape(img.shape[0], img.shape[1])
+        img = Numo::UInt8[img, img, img].transpose(1, 2, 0).clone
+      end
+      h, w, ch = img.shape
+      bin = img.to_binary
+      case file_name
+      when /\.png$/i
+        stride_in_bytes = w * ch
+        Stb.stbi_write_png(file_name, w, h, ch, bin, stride_in_bytes)
+      when /\.bmp$/i
+        Stb.stbi_write_bmp(file_name, w, h, ch, bin)
+      when /\.jpg$/i, /\.jpeg/i
+        Stb.stbi_write_jpg(file_name, w, h, ch, bin, quality)
+      end
+    rescue => ex
+      raise Image::WriteError.new(ex.message)
+    end
+  end
+
+  class Image::Error < StandardError; end
+
+  class Image::ReadError < Image::Error; end
+
+  class Image::WriteError < Image::Error; end
+end

data/lib/dnn/iris.rb

@@ -1,60 +1,60 @@
-require "csv"
-require_relative "downloader"
-
-module DNN
-  class DNN_Iris_LoadError < DNN_Error; end
-
-  module Iris
-    URL_CSV = "https://archive.ics.uci.edu/ml/machine-learning-databases/iris/iris.data"
-
-    # Iris-setosa
-    SETOSA = 0
-    # Iris-versicolor
-    VERSICOLOR = 1
-    # Iris-virginica
-    VIRGINICA = 2
-
-    def self.downloads
-      return if File.exist?(url_to_file_name(URL_CSV))
-      Downloader.download(URL_CSV)
-    end
-
-    def self.load(shuffle = false, shuffle_seed = rand(1 << 31))
-      downloads
-      csv_array = CSV.read(url_to_file_name(URL_CSV)).select { |a| a.length > 0 }
-      x = Numo::SFloat.zeros(csv_array.length, 4)
-      y = Numo::SFloat.zeros(csv_array.length)
-      csv_array.each.with_index do |(sepal_length, sepal_width, petal_length, petal_width, classes), i|
-        x[i, 0] = sepal_length.to_f
-        x[i, 1] = sepal_width.to_f
-        x[i, 2] = petal_length.to_f
-        x[i, 3] = petal_width.to_f
-        y[i] = case classes
-        when "Iris-setosa"
-          SETOSA
-        when "Iris-versicolor"
-          VERSICOLOR
-        when "Iris-virginica"
-          VIRGINICA
-        else
-          raise DNN_Iris_LoadError.new("Unknown class name '#{classes}' for iris")
-        end
-      end
-      if shuffle
-        orig_seed = Random::DEFAULT.seed
-        srand(shuffle_seed)
-        indexs = (0...csv_array.length).to_a.shuffle
-        x[indexs, true] = x
-        y[indexs] = y
-        srand(orig_seed)
-      end
-      [x, y]
-    end
-
-    private_class_method
-
-    def self.url_to_file_name(url)
-      __dir__ + "/downloads/" + url.match(%r`.+/(.+)$`)[1]
-    end
-  end
-end
+require "csv"
+require_relative "downloader"
+
+module DNN
+  class DNN_Iris_LoadError < DNN_Error; end
+
+  module Iris
+    URL_CSV = "https://archive.ics.uci.edu/ml/machine-learning-databases/iris/iris.data"
+
+    # Iris-setosa
+    SETOSA = 0
+    # Iris-versicolor
+    VERSICOLOR = 1
+    # Iris-virginica
+    VIRGINICA = 2
+
+    def self.downloads
+      return if File.exist?(url_to_file_name(URL_CSV))
+      Downloader.download(URL_CSV)
+    end
+
+    def self.load(shuffle = false, shuffle_seed = rand(1 << 31))
+      downloads
+      csv_array = CSV.read(url_to_file_name(URL_CSV)).select { |a| a.length > 0 }
+      x = Numo::SFloat.zeros(csv_array.length, 4)
+      y = Numo::SFloat.zeros(csv_array.length)
+      csv_array.each.with_index do |(sepal_length, sepal_width, petal_length, petal_width, classes), i|
+        x[i, 0] = sepal_length.to_f
+        x[i, 1] = sepal_width.to_f
+        x[i, 2] = petal_length.to_f
+        x[i, 3] = petal_width.to_f
+        y[i] = case classes
+        when "Iris-setosa"
+          SETOSA
+        when "Iris-versicolor"
+          VERSICOLOR
+        when "Iris-virginica"
+          VIRGINICA
+        else
+          raise DNN_Iris_LoadError.new("Unknown class name '#{classes}' for iris")
+        end
+      end
+      if shuffle
+        orig_seed = Random::DEFAULT.seed
+        srand(shuffle_seed)
+        indexs = (0...csv_array.length).to_a.shuffle
+        x[indexs, true] = x
+        y[indexs] = y
+        srand(orig_seed)
+      end
+      [x, y]
+    end
+
+    private_class_method
+
+    def self.url_to_file_name(url)
+      __dir__ + "/downloads/" + url.match(%r`.+/(.+)$`)[1]
+    end
+  end
+end

data/lib/dnn/mnist.rb

@@ -1,84 +1,84 @@
-require "zlib"
-require_relative "core/error"
-require_relative "downloader"
-
-module DNN
-  module MNIST
-    class DNN_MNIST_LoadError < DNN_Error; end
-
-    URL_TRAIN_IMAGES = "http://yann.lecun.com/exdb/mnist/train-images-idx3-ubyte.gz"
-    URL_TRAIN_LABELS = "http://yann.lecun.com/exdb/mnist/train-labels-idx1-ubyte.gz"
-    URL_TEST_IMAGES = "http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz"
-    URL_TEST_LABELS = "http://yann.lecun.com/exdb/mnist/t10k-labels-idx1-ubyte.gz"
-
-    def self.downloads
-      return if Dir.exist?(mnist_dir)
-      Dir.mkdir("#{__dir__}/downloads") unless Dir.exist?("#{__dir__}/downloads")
-      Dir.mkdir(mnist_dir)
-      Downloader.download(URL_TRAIN_IMAGES, mnist_dir)
-      Downloader.download(URL_TRAIN_LABELS, mnist_dir)
-      Downloader.download(URL_TEST_IMAGES, mnist_dir)
-      Downloader.download(URL_TEST_LABELS, mnist_dir)
-    end
-
-    def self.load_train
-      downloads
-      train_images_file_name = url_to_file_name(URL_TRAIN_IMAGES)
-      train_labels_file_name = url_to_file_name(URL_TRAIN_LABELS)
-      unless File.exist?(train_images_file_name)
-        raise DNN_MNIST_LoadError.new(%`file "#{train_images_file_name}" is not found.`)
-      end
-      unless File.exist?(train_labels_file_name)
-        raise DNN_MNIST_LoadError.new(%`file "#{train_labels_file_name}" is not found.`)
-      end
-      images = load_images(train_images_file_name)
-      labels = load_labels(train_labels_file_name)
-      [images, labels]
-    end
-
-    def self.load_test
-      downloads
-      test_images_file_name = url_to_file_name(URL_TEST_IMAGES)
-      test_labels_file_name = url_to_file_name(URL_TEST_LABELS)
-      unless File.exist?(test_images_file_name)
-        raise DNN_MNIST_LoadError.new(%`file "#{train_images_file_name}" is not found.`)
-      end
-      unless File.exist?(test_labels_file_name)
-        raise DNN_MNIST_LoadError.new(%`file "#{train_labels_file_name}" is not found.`)
-      end
-      images = load_images(test_images_file_name)
-      labels = load_labels(test_labels_file_name)
-      [images, labels]
-    end
-
-    private_class_method
-
-    def self.load_images(file_name)
-      images = nil
-      Zlib::GzipReader.open(file_name) do |f|
-        magic, num_images = f.read(8).unpack("N2")
-        rows, cols = f.read(8).unpack("N2")
-        images = Numo::UInt8.from_binary(f.read)
-        images = images.reshape(num_images, cols, rows)
-      end
-      images
-    end
-
-    def self.load_labels(file_name)
-      labels = nil
-      Zlib::GzipReader.open(file_name) do |f|
-        magic, num_labels = f.read(8).unpack("N2")
-        labels = Numo::UInt8.from_binary(f.read)
-      end
-      labels
-    end
-
-    def self.mnist_dir
-      "#{__dir__}/downloads/mnist"
-    end
-
-    def self.url_to_file_name(url)
-      mnist_dir + "/" + url.match(%r`.+/(.+)$`)[1]
-    end
-  end
-end
+require "zlib"
+require_relative "core/error"
+require_relative "downloader"
+
+module DNN
+  module MNIST
+    class DNN_MNIST_LoadError < DNN_Error; end
+
+    URL_TRAIN_IMAGES = "http://yann.lecun.com/exdb/mnist/train-images-idx3-ubyte.gz"
+    URL_TRAIN_LABELS = "http://yann.lecun.com/exdb/mnist/train-labels-idx1-ubyte.gz"
+    URL_TEST_IMAGES = "http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz"
+    URL_TEST_LABELS = "http://yann.lecun.com/exdb/mnist/t10k-labels-idx1-ubyte.gz"
+
+    def self.downloads
+      return if Dir.exist?(mnist_dir)
+      Dir.mkdir("#{__dir__}/downloads") unless Dir.exist?("#{__dir__}/downloads")
+      Dir.mkdir(mnist_dir)
+      Downloader.download(URL_TRAIN_IMAGES, mnist_dir)
+      Downloader.download(URL_TRAIN_LABELS, mnist_dir)
+      Downloader.download(URL_TEST_IMAGES, mnist_dir)
+      Downloader.download(URL_TEST_LABELS, mnist_dir)
+    end
+
+    def self.load_train
+      downloads
+      train_images_file_name = url_to_file_name(URL_TRAIN_IMAGES)
+      train_labels_file_name = url_to_file_name(URL_TRAIN_LABELS)
+      unless File.exist?(train_images_file_name)
+        raise DNN_MNIST_LoadError.new(%`file "#{train_images_file_name}" is not found.`)
+      end
+      unless File.exist?(train_labels_file_name)
+        raise DNN_MNIST_LoadError.new(%`file "#{train_labels_file_name}" is not found.`)
+      end
+      images = load_images(train_images_file_name)
+      labels = load_labels(train_labels_file_name)
+      [images, labels]
+    end
+
+    def self.load_test
+      downloads
+      test_images_file_name = url_to_file_name(URL_TEST_IMAGES)
+      test_labels_file_name = url_to_file_name(URL_TEST_LABELS)
+      unless File.exist?(test_images_file_name)
+        raise DNN_MNIST_LoadError.new(%`file "#{train_images_file_name}" is not found.`)
+      end
+      unless File.exist?(test_labels_file_name)
+        raise DNN_MNIST_LoadError.new(%`file "#{train_labels_file_name}" is not found.`)
+      end
+      images = load_images(test_images_file_name)
+      labels = load_labels(test_labels_file_name)
+      [images, labels]
+    end
+
+    private_class_method
+
+    def self.load_images(file_name)
+      images = nil
+      Zlib::GzipReader.open(file_name) do |f|
+        magic, num_images = f.read(8).unpack("N2")
+        rows, cols = f.read(8).unpack("N2")
+        images = Numo::UInt8.from_binary(f.read)
+        images = images.reshape(num_images, cols, rows)
+      end
+      images
+    end
+
+    def self.load_labels(file_name)
+      labels = nil
+      Zlib::GzipReader.open(file_name) do |f|
+        magic, num_labels = f.read(8).unpack("N2")
+        labels = Numo::UInt8.from_binary(f.read)
+      end
+      labels
+    end
+
+    def self.mnist_dir
+      "#{__dir__}/downloads/mnist"
+    end
+
+    def self.url_to_file_name(url)
+      mnist_dir + "/" + url.match(%r`.+/(.+)$`)[1]
+    end
+  end
+end