ruby-dnn 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd3d1988c50c875fa619ab6c525fd604c8f264731c965f31725dd80ca8b17d72
-  data.tar.gz: 7149096f7222c5a4d42bfa69121a99c5df97ca054ae90de7f7c7fc9a294e7c53
+  metadata.gz: cfe06541a0afe5fd3465839f02865efe7105c7635003840f60fd46e2976b0c26
+  data.tar.gz: d0f2150f86fe1ee423231c410af8809cecf9d412ecefebb0a3bee1ea14abeee7
 SHA512:
-  metadata.gz: 4ba83b8274994a9b90be17231791d1935de015dc2963ec4cc47f98f12782c8f4ac342aa220492c4e43d4a5d7780dae2011ba1b6fc967a23538b22318890bbb5a
-  data.tar.gz: 5374ea0e296ba510ce13d602daa4ffbc31757800ba9a83003f4795f195e4917511935d1bd7279ba8ce7204e78e73c7d2f918789452f329177fbd80eee981df3c
+  metadata.gz: 65ad242e2647f2035409432b6568a72d73b95a10b096d863938f9e0cef3bc07aac9a770a9d900d021af2afc3f912a9a3ed4725ba6488411c758b5f5a717a8964
+  data.tar.gz: d4102ded5ade667087736ecea6f897f1136b138682c93a53869e68b3fa70683a3bc8570e3ef3eb840c0a5f13ceb38a7f41b6c9a6f6b4d9bee9543b52ead2a95a

data/lib/dnn/core/models.rb

@@ -8,9 +8,12 @@ module DNN
 
       # Load marshal model.
       # @param [String] file_name File name of marshal model to load.
+      # @return [DNN::Models::Model] Return the loaded model.
       def self.load(file_name)
-        loader = Loaders::MarshalLoader.new(self.new)
+        model = self.new
+        loader = Loaders::MarshalLoader.new(model)
         loader.load(file_name)
+        model
       end
 
       def initialize

data/lib/dnn/datasets/cifar10.rb

@@ -11,12 +11,12 @@ module DNN
     class DNN_CIFAR10_LoadError < DNN_Error; end
 
     def self.downloads
-      return if Dir.exist?(__dir__ + "/downloads/" + DIR_CIFAR10)
+      return if Dir.exist?(DOWNLOADS_PATH + "/downloads/" + DIR_CIFAR10)
       Downloader.download(URL_CIFAR10)
-      cifar10_binary_file_name = __dir__ + "/downloads/" + URL_CIFAR10.match(%r`.+/(.+)`)[1]
+      cifar10_binary_file_name = DOWNLOADS_PATH + "/downloads/" + URL_CIFAR10.match(%r`.+/(.+)`)[1]
       begin
         Zlib::GzipReader.open(cifar10_binary_file_name) do |gz|
-          Archive::Tar::Minitar.unpack(gz, __dir__ + "/downloads")
+          Archive::Tar::Minitar.unpack(gz, DOWNLOADS_PATH + "/downloads")
         end
       ensure
         File.unlink(cifar10_binary_file_name)
@@ -27,7 +27,7 @@ module DNN
       downloads
       bin = ""
       (1..5).each do |i|
-        fname = __dir__ + "/downloads/#{DIR_CIFAR10}/data_batch_#{i}.bin"
+        fname = DOWNLOADS_PATH + "/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
@@ -39,7 +39,7 @@ module DNN
 
     def self.load_test
       downloads
-      fname = __dir__ + "/downloads/#{DIR_CIFAR10}/test_batch.bin"
+      fname = DOWNLOADS_PATH + "/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)

data/lib/dnn/datasets/cifar100.rb

@@ -11,12 +11,12 @@ module DNN
     class DNN_CIFAR100_LoadError < DNN_Error; end
 
     def self.downloads
-      return if Dir.exist?(__dir__ + "/downloads/" + DIR_CIFAR100)
+      return if Dir.exist?(DOWNLOADS_PATH + "/downloads/" + DIR_CIFAR100)
       Downloader.download(URL_CIFAR100)
-      cifar100_binary_file_name = __dir__ + "/downloads/" + URL_CIFAR100.match(%r`.+/(.+)`)[1]
+      cifar100_binary_file_name = DOWNLOADS_PATH + "/downloads/" + URL_CIFAR100.match(%r`.+/(.+)`)[1]
       begin
         Zlib::GzipReader.open(cifar100_binary_file_name) do |gz|
-          Archive::Tar::Minitar.unpack(gz, __dir__ + "/downloads")
+          Archive::Tar::Minitar.unpack(gz, DOWNLOADS_PATH + "/downloads")
         end
       ensure
         File.unlink(cifar100_binary_file_name)
@@ -26,7 +26,7 @@ module DNN
     def self.load_train
       downloads
       bin = ""
-      fname = __dir__ + "/downloads/#{DIR_CIFAR100}/train.bin"
+      fname = DOWNLOADS_PATH + "/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)
@@ -37,7 +37,7 @@ module DNN
 
     def self.load_test
       downloads
-      fname = __dir__ + "/downloads/#{DIR_CIFAR100}/test.bin"
+      fname = DOWNLOADS_PATH + "/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)

data/lib/dnn/datasets/downloader.rb

@@ -1,14 +1,19 @@
 require "net/http"
 
 module DNN
+  if ENV["RUBY_DNN_DOWNLOADS_PATH"]
+    DOWNLOADS_PATH = ENV["RUBY_DNN_DOWNLOADS_PATH"]
+  else
+    DOWNLOADS_PATH = __dir__
+  end
 
   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"
+        Dir.mkdir("#{DOWNLOADS_PATH}/downloads") unless Dir.exist?("#{DOWNLOADS_PATH}/downloads")
+        dir_path = "#{DOWNLOADS_PATH}/downloads"
       end
       Downloader.new(url).download(dir_path)
     rescue => e

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

@@ -20,7 +20,7 @@ module DNN
     URL_TEST_LABELS = URL_BASE + TEST_LABELS_FILE_NAME
 
     def self.downloads
-      Dir.mkdir("#{__dir__}/downloads") unless Dir.exist?("#{__dir__}/downloads")
+      Dir.mkdir("#{DOWNLOADS_PATH}/downloads") unless Dir.exist?("#{DOWNLOADS_PATH}/downloads")
       Dir.mkdir(mnist_dir) unless Dir.exist?(mnist_dir)
       Downloader.download(URL_TRAIN_IMAGES, mnist_dir) unless File.exist?(get_file_path(TRAIN_IMAGES_FILE_NAME))
       Downloader.download(URL_TRAIN_LABELS, mnist_dir) unless File.exist?(get_file_path(TRAIN_LABELS_FILE_NAME))
@@ -79,7 +79,7 @@ module DNN
     end
 
     private_class_method def self.mnist_dir
-      "#{__dir__}/downloads/fashion-mnist"
+      "#{DOWNLOADS_PATH}/downloads/fashion-mnist"
     end
 
     private_class_method def self.get_file_path(file_name)

data/lib/dnn/datasets/iris.rb

@@ -52,7 +52,7 @@ module DNN
     end
 
     private_class_method def self.url_to_file_name(url)
-      __dir__ + "/downloads/" + url.match(%r`.+/(.+)$`)[1]
+      DOWNLOADS_PATH + "/downloads/" + url.match(%r`.+/(.+)$`)[1]
     end
   end
 end

data/lib/dnn/datasets/mnist.rb

@@ -19,7 +19,7 @@ module DNN
     URL_TEST_LABELS = URL_BASE + TEST_LABELS_FILE_NAME
 
     def self.downloads
-      Dir.mkdir("#{__dir__}/downloads") unless Dir.exist?("#{__dir__}/downloads")
+      Dir.mkdir("#{DOWNLOADS_PATH}/downloads") unless Dir.exist?("#{DOWNLOADS_PATH}/downloads")
       Dir.mkdir(mnist_dir) unless Dir.exist?(mnist_dir)
       Downloader.download(URL_TRAIN_IMAGES, mnist_dir) unless File.exist?(get_file_path(TRAIN_IMAGES_FILE_NAME))
       Downloader.download(URL_TRAIN_LABELS, mnist_dir) unless File.exist?(get_file_path(TRAIN_LABELS_FILE_NAME))
@@ -78,7 +78,7 @@ module DNN
     end
 
     private_class_method def self.mnist_dir
-      "#{__dir__}/downloads/mnist"
+      "#{DOWNLOADS_PATH}/downloads/mnist"
     end
 
     private_class_method def self.get_file_path(file_name)

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.13.3"
+  VERSION = "0.13.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray