ruby-dnn 0.15.3 → 0.16.0

data/lib/dnn/core/utils.rb

@@ -23,7 +23,7 @@ module DNN
 
     # Return the result of the sigmoid function.
     def self.sigmoid(x)
-      Layers::Sigmoid.new.forward(x)
+      Losses::SigmoidCrossEntropy.sigmoid(x)
     end
 
     # Return the result of the softmax function.

data/lib/dnn/datasets/cifar10.rb

@@ -1,6 +1,5 @@
 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"
@@ -28,23 +27,25 @@ module DNN
       bin = ""
       (1..5).each do |i|
         fname = DOWNLOADS_PATH + "/downloads/#{DIR_CIFAR10}/data_batch_#{i}.bin"
-        raise DNN_CIFAR10_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
+        raise DNN_CIFAR10_LoadError, %`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)
+      datas = Numo::UInt8.from_binary(bin).reshape(50000, 3073)
+      x_train = datas[true, 1...3073]
+      x_train = x_train.reshape(50000, 3, 32, 32).transpose(0, 2, 3, 1).clone
+      y_train = datas[true, 0]
       [x_train, y_train]
     end
 
     def self.load_test
       downloads
       fname = DOWNLOADS_PATH + "/downloads/#{DIR_CIFAR10}/test_batch.bin"
-      raise DNN_CIFAR10_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
+      raise DNN_CIFAR10_LoadError, %`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)
+      datas = Numo::UInt8.from_binary(bin).reshape(10000, 3073)
+      x_test = datas[true, 1...3073]
+      x_test = x_test.reshape(10000, 3, 32, 32).transpose(0, 2, 3, 1).clone
+      y_test = datas[true, 0]
       [x_test, y_test]
     end
   end

data/lib/dnn/datasets/cifar100.rb

@@ -1,6 +1,5 @@
 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"
@@ -27,22 +26,24 @@ module DNN
       downloads
       bin = ""
       fname = DOWNLOADS_PATH + "/downloads/#{DIR_CIFAR100}/train.bin"
-      raise DNN_CIFAR100_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
+      raise DNN_CIFAR100_LoadError, %`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)
+      datas = Numo::UInt8.from_binary(bin).reshape(50000, 3074)
+      x_train = datas[true, 2...3074]
+      x_train = x_train.reshape(50000, 3, 32, 32).transpose(0, 2, 3, 1).clone
+      y_train = datas[true, 0...2]
       [x_train, y_train]
     end
 
     def self.load_test
       downloads
       fname = DOWNLOADS_PATH + "/downloads/#{DIR_CIFAR100}/test.bin"
-      raise DNN_CIFAR100_LoadError.new(%`file "#{fname}" is not found.`) unless File.exist?(fname)
+      raise DNN_CIFAR100_LoadError, %`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)
+      datas = Numo::UInt8.from_binary(bin).reshape(10000, 3074)
+      x_test = datas[true, 2...3074]
+      x_test = x_test.reshape(10000, 3, 32, 32).transpose(0, 2, 3, 1).clone
+      y_test = datas[true, 0...2]
       [x_test, y_test]
     end
   end

data/lib/dnn/datasets/downloader.rb

@@ -1,11 +1,7 @@
 require "net/http"
 
 module DNN
-  if ENV["RUBY_DNN_DOWNLOADS_PATH"]
-    DOWNLOADS_PATH = ENV["RUBY_DNN_DOWNLOADS_PATH"]
-  else
-    DOWNLOADS_PATH = __dir__
-  end
+  DOWNLOADS_PATH = ENV["RUBY_DNN_DOWNLOADS_PATH"] || __dir__
 
   class DNN_DownloadError < DNN_Error; end
 

data/lib/dnn/datasets/fashion-mnist.rb

@@ -32,12 +32,8 @@ module DNN
       downloads
       train_images_file_path = get_file_path(TRAIN_IMAGES_FILE_NAME)
       train_labels_file_path = get_file_path(TRAIN_LABELS_FILE_NAME)
-      unless File.exist?(train_images_file_path)
-        raise DNN_MNIST_LoadError.new(%`file "#{train_images_file_path}" is not found.`)
-      end
-      unless File.exist?(train_labels_file_path)
-        raise DNN_MNIST_LoadError.new(%`file "#{train_labels_file_path}" is not found.`)
-      end
+      raise DNN_MNIST_LoadError, %`file "#{train_images_file_path}" is not found.` unless File.exist?(train_images_file_path)
+      raise DNN_MNIST_LoadError, %`file "#{train_labels_file_path}" is not found.` unless File.exist?(train_labels_file_path)
       images = load_images(train_images_file_path)
       labels = load_labels(train_labels_file_path)
       [images, labels]
@@ -47,12 +43,8 @@ module DNN
       downloads
       test_images_file_path = get_file_path(TEST_IMAGES_FILE_NAME)
       test_labels_file_path = get_file_path(TEST_LABELS_FILE_NAME)
-      unless File.exist?(test_images_file_path)
-        raise DNN_MNIST_LoadError.new(%`file "#{test_images_file_path}" is not found.`)
-      end
-      unless File.exist?(test_labels_file_path)
-        raise DNN_MNIST_LoadError.new(%`file "#{test_labels_file_path}" is not found.`)
-      end
+      raise DNN_MNIST_LoadError, %`file "#{test_images_file_path}" is not found.` unless File.exist?(test_images_file_path)
+      raise DNN_MNIST_LoadError, %`file "#{test_labels_file_path}" is not found.` unless File.exist?(test_labels_file_path)
       images = load_images(test_images_file_path)
       labels = load_labels(test_labels_file_path)
       [images, labels]

data/lib/dnn/datasets/iris.rb

@@ -21,7 +21,7 @@ module DNN
 
     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 }
+      csv_array = CSV.read(url_to_file_name(URL_CSV)).reject(&:empty?)
       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|
@@ -30,14 +30,14 @@ module DNN
         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")
+               when "Iris-setosa"
+                 SETOSA
+               when "Iris-versicolor"
+                 VERSICOLOR
+               when "Iris-virginica"
+                 VIRGINICA
+               else
+                 raise DNN_Iris_LoadError, "Unknown class name '#{classes}' for iris"
         end
       end
       if shuffle

data/lib/dnn/datasets/mnist.rb

@@ -31,12 +31,8 @@ module DNN
       downloads
       train_images_file_path = get_file_path(TRAIN_IMAGES_FILE_NAME)
       train_labels_file_path = get_file_path(TRAIN_LABELS_FILE_NAME)
-      unless File.exist?(train_images_file_path)
-        raise DNN_MNIST_LoadError.new(%`file "#{train_images_file_path}" is not found.`)
-      end
-      unless File.exist?(train_labels_file_path)
-        raise DNN_MNIST_LoadError.new(%`file "#{train_labels_file_path}" is not found.`)
-      end
+      raise DNN_MNIST_LoadError, %`file "#{train_images_file_path}" is not found.` unless File.exist?(train_images_file_path)
+      raise DNN_MNIST_LoadError, %`file "#{train_labels_file_path}" is not found.` unless File.exist?(train_labels_file_path)
       images = load_images(train_images_file_path)
       labels = load_labels(train_labels_file_path)
       [images, labels]
@@ -46,12 +42,8 @@ module DNN
       downloads
       test_images_file_path = get_file_path(TEST_IMAGES_FILE_NAME)
       test_labels_file_path = get_file_path(TEST_LABELS_FILE_NAME)
-      unless File.exist?(test_images_file_path)
-        raise DNN_MNIST_LoadError.new(%`file "#{test_images_file_path}" is not found.`)
-      end
-      unless File.exist?(test_labels_file_path)
-        raise DNN_MNIST_LoadError.new(%`file "#{test_labels_file_path}" is not found.`)
-      end
+      raise DNN_MNIST_LoadError, %`file "#{test_images_file_path}" is not found.` unless File.exist?(test_images_file_path)
+      raise DNN_MNIST_LoadError, %`file "#{test_labels_file_path}" is not found.` unless File.exist?(test_labels_file_path)
       images = load_images(test_images_file_path)
       labels = load_labels(test_labels_file_path)
       [images, labels]

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

@@ -25,9 +25,9 @@ module DNN
     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)
+      raise DNN_STL10_LoadError, %`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)
+      raise DNN_STL10_LoadError, %`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
@@ -38,9 +38,9 @@ module DNN
     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)
+      raise DNN_STL10_LoadError, %`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)
+      raise DNN_STL10_LoadError, %`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
@@ -49,12 +49,10 @@ module DNN
     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
+      raise DNN_Error, "Range must between 0 and 100000. (But the end is excluded)" unless range.begin >= 0 && range.end <= 100000
       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)
+      raise DNN_STL10_LoadError, %`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

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.15.3"
+  VERSION = "0.16.0"
 end

data/ruby-dnn.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{ruby-dnn is a ruby deep learning library.}
   spec.homepage      = "https://github.com/unagiootoro/ruby-dnn.git"
   spec.license       = "MIT"
-  spec.extensions    = ["ext/cifar_loader/extconf.rb", "ext/rb_stb_image/extconf.rb"]
+  spec.extensions    = ["ext/rb_stb_image/extconf.rb"]
 
   spec.add_dependency "numo-narray"
   spec.add_dependency "archive-tar-minitar"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.16.0
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -85,7 +85,6 @@ email:
 - ootoro838861@outlook.jp
 executables: []
 extensions:
-- ext/cifar_loader/extconf.rb
 - ext/rb_stb_image/extconf.rb
 extra_rdoc_files: []
 files:
@@ -112,9 +111,10 @@ files:
 - examples/mnist_define_by_run.rb
 - examples/mnist_example.rb
 - examples/mnist_lstm_example.rb
+- examples/pix2pix/dcgan.rb
+- examples/pix2pix/imgen.rb
+- examples/pix2pix/train.rb
 - examples/xor_example.rb
-- ext/cifar_loader/cifar_loader.c
-- ext/cifar_loader/extconf.rb
 - ext/rb_stb_image/extconf.rb
 - ext/rb_stb_image/rb_stb_image.c
 - lib/dnn.rb
@@ -127,12 +127,14 @@ files:
 - lib/dnn/core/layers/basic_layers.rb
 - lib/dnn/core/layers/cnn_layers.rb
 - lib/dnn/core/layers/embedding.rb
+- lib/dnn/core/layers/math_layers.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/models.rb
+- lib/dnn/core/monkey_patch.rb
 - lib/dnn/core/optimizers.rb
 - lib/dnn/core/param.rb
 - lib/dnn/core/regularizers.rb

data/ext/cifar_loader/cifar_loader.c

@@ -1,77 +0,0 @@
-#include <ruby.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define CIFAR_WIDTH 32
-#define CIFAR_HEIGHT 32
-#define CIFAR_CHANNEL 3
-
-static VALUE cifar10_load_binary(VALUE self, VALUE rb_bin, VALUE rb_num_datas) {
-  uint8_t* bin = (uint8_t*)StringValuePtr(rb_bin);
-  int32_t num_datas = FIX2INT(rb_num_datas);
-  VALUE rb_x_bin;
-  VALUE rb_y_bin;
-  int32_t i;
-  int32_t j = 0;
-  int32_t k = 0;
-  int32_t size = CIFAR_WIDTH * CIFAR_HEIGHT * CIFAR_CHANNEL;
-  int32_t x_bin_size = num_datas * size;
-  int32_t y_bin_size = num_datas;
-  uint8_t* x_bin;
-  uint8_t* y_bin;
-
-  x_bin = (uint8_t*)malloc(x_bin_size);
-  y_bin = (uint8_t*)malloc(y_bin_size);
-  for (i = 0; i < num_datas; i++) {
-    y_bin[i] = bin[j];
-    j++;
-    memcpy(&x_bin[k], &bin[j], size);
-    j += size;
-    k += size;
-  }
-  rb_x_bin = rb_str_new((char*)x_bin, x_bin_size);
-  rb_y_bin = rb_str_new((char*)y_bin, y_bin_size);
-  free(x_bin);
-  free(y_bin);
-  return rb_ary_new3(2, rb_x_bin, rb_y_bin);
-}
-
-static VALUE cifar100_load_binary(VALUE self, VALUE rb_bin, VALUE rb_num_datas) {
-  uint8_t* bin = (uint8_t*)StringValuePtr(rb_bin);
-  int32_t num_datas = FIX2INT(rb_num_datas);
-  VALUE rb_x_bin;
-  VALUE rb_y_bin;
-  int32_t i;
-  int32_t j = 0;
-  int32_t k = 0;
-  int32_t size = CIFAR_WIDTH * CIFAR_HEIGHT * CIFAR_CHANNEL;
-  int32_t x_bin_size = num_datas * size;
-  int32_t y_bin_size = num_datas * 2;
-  uint8_t* x_bin;
-  uint8_t* y_bin;
-
-  x_bin = (uint8_t*)malloc(x_bin_size);
-  y_bin = (uint8_t*)malloc(y_bin_size);
-  for (i = 0; i < num_datas; i++) {
-    y_bin[i * 2] = bin[j];
-    y_bin[i * 2 + 1] = bin[j + 1];
-    j += 2;
-    memcpy(&x_bin[k], &bin[j], size);
-    j += size;
-    k += size;
-  }
-  rb_x_bin = rb_str_new((char*)x_bin, x_bin_size);
-  rb_y_bin = rb_str_new((char*)y_bin, y_bin_size);
-  free(x_bin);
-  free(y_bin);
-  return rb_ary_new3(2, rb_x_bin, rb_y_bin);
-}
-
-void Init_cifar_loader() {
-  VALUE rb_dnn = rb_define_module("DNN");
-  VALUE rb_cifar10 = rb_define_module_under(rb_dnn, "CIFAR10");
-  VALUE rb_cifar100 = rb_define_module_under(rb_dnn, "CIFAR100");
-
-  rb_define_singleton_method(rb_cifar10, "load_binary", cifar10_load_binary, 2);
-  rb_define_singleton_method(rb_cifar100, "load_binary", cifar100_load_binary, 2);
-}

data/ext/cifar_loader/extconf.rb

@@ -1,3 +0,0 @@
-require "mkmf"
-
-create_makefile("cifar_loader")