ruby-dnn 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8475052a51f8b81f176c8b3a77c953d116fb1098b7f24fe8a2ad9135b2f2a33b
-  data.tar.gz: f291c99be16b9a35fee59a09cefda3b9aece1bbaef5d6b482fad6d238043e68b
+  metadata.gz: 0155251f4bb07fe6ed61f27102f8ef9b251fcc2cfba72fafaab7819072c28e69
+  data.tar.gz: 8fce285715f424cf5d78f38c81b0d653e281cd21ebaa04702e1cd38ce2de6c2b
 SHA512:
-  metadata.gz: '08f061510f73297b12b53cd3da5748dd47e67605d1b40c35388779a94e023e37450d2c9ebd9ec1bf0970c1580c7481f46c6cef05d54af5748fe175522b198c5e'
-  data.tar.gz: fdfe99ac9b5a63e4914aaab4f71a37e56b097c6b00560245a82438c6fd70ab658683de95c1ddef0283f4cc2f0b9e261dda798158cd374cf19cc17966ed338b16
+  metadata.gz: b1ec453443c1713323263b0d6b9086eca1978bd6ed9102956cc4ad6098b2698248eedced6851fbf0d2d49223277eff369532e96a53c6df8351b016fdc22830f4
+  data.tar.gz: 8f41bf55e995854dfa96159197a40bf1f0e50f5cbf99eee97d835986e4aeef366ddd777ddbbe82514de22a048ca34600107bb59cbc0a2f58c7e3d5f8f1d06dd4

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.lock

data/.travis.yml

@@ -1,6 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.6.1
+  - 2.6
+  - 2.7
 script:
   - rake test

data/README.md

@@ -1,6 +1,7 @@
 # ruby-dnn
-[![Gem Version](https://badge.fury.io/rb/ruby-dnn.svg)](https://badge.fury.io/rb/ruby-dnn)  
+[![Gem Version](https://badge.fury.io/rb/ruby-dnn.svg)](https://badge.fury.io/rb/ruby-dnn)
 [![Build Status](https://travis-ci.org/unagiootoro/ruby-dnn.svg?branch=master)](https://travis-ci.org/unagiootoro/ruby-dnn)
+[![Docs Latest](https://img.shields.io/badge/docs-latest-blue.svg)](https://rubydoc.info/gems/ruby-dnn)
 
 ruby-dnn is a ruby deep learning library. This library supports full connected neural network and convolution neural network
 and recurrent neural network.
@@ -84,6 +85,23 @@ puts "loss: #{loss}"
 Please refer to examples for basic usage.  
 If you want to know more detailed information, please refer to the source code.
 
+## Sample
+
+* Pix2pix  
+Convert an abstract image into a building image.  
+[https://github.com/unagiootoro/facade-pix2pix](https://github.com/unagiootoro/facade-pix2pix)
+![facade-pix2pix.png](img/facade-pix2pix.png)
+
+* Cycle-GAN  
+Convert apples to oranges and oranges to apples.  
+[https://github.com/unagiootoro/apple2orange-cyclegan](https://github.com/unagiootoro/apple2orange-cyclegan)
+![cycle-gan.PNG](img/cycle-gan.PNG)
+
+* DQN  
+Learn the game so that the pole on the cart does not fall.  
+[https://github.com/unagiootoro/ruby-rl](https://github.com/unagiootoro/ruby-rl)
+![cart-pole.gif](img/cart-pole.gif)
+
 ## Implemented
 || Implemented classes |
 |:-----------|------------:|
@@ -95,32 +113,27 @@ If you want to know more detailed information, please refer to the source code.
 | Losses | MeanSquaredError, MeanAbsoluteError, Hinge, HuberLoss, SoftmaxCrossEntropy, SigmoidCrossEntropy |
 
 ## Datasets
-By setting the environment variable 'RUBY_DNN_DOWNLOADS_PATH', you can specify the path to read dataset.
-
-● Iris  
-● MNIST  
-● Fashion-MNIST  
-● CIFAR-10  
-● CIFAR-100  
-● STL-10
+By setting the environment variable `RUBY_DNN_DOWNLOADS_PATH`, you can specify the path to read dataset.
 
-## Examples
-● VAE  
-● DCGAN  
-● Pix2pix
+* Iris  
+* MNIST  
+* Fashion-MNIST  
+* CIFAR-10  
+* CIFAR-100  
+* STL-10
 
 ## Use GPU
-If you do 'require "cumo/narray"' before 'require "dnn"', you can run it on GPU.
-Or, set the environment variable 'RUBY_DNN_USE_CUMO 'to'ENABLE' to force the GPU to be used.
+If you do `require "cumo/narray"` before `require "dnn"`, you can run it on GPU.
+Or, set the environment variable `RUBY_DNN_USE_CUMO` to `ENABLE` to force the GPU to be used.
 
 ## TODO
-● Write a test.  
-● Write a document.  
-● Improve performance when using GPU.  
+* Write a test.  
+* Write a document.  
+* Improve performance when using GPU.  
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake "spec"` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake "test"` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "rake/extensiontask"
 require "yard"
 require "yard/rake/yardoc_task"
 
@@ -10,6 +11,10 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/*_test.rb", "test/layers_test/*_test.rb"]
 end
 
+Rake::ExtensionTask.new "rb_stb_image" do |ext|
+  ext.lib_dir = "lib/rb_stb_image"
+end
+
 task :build_rb_stb_image do
   sh "cd ext/rb_stb_image; ruby extconf.rb; make"
 end

data/examples/dcgan/dcgan.rb

@@ -129,7 +129,7 @@ class DCGAN < Model
     y_fake = Numo::SFloat.zeros(batch_size, 1)
     @dis.enable_training
     dis_loss = @dis.train_on_batch(x_batch, y_real)
-    dis_loss + @dis.train_on_batch(images, y_fake)
+    dis_loss += @dis.train_on_batch(images, y_fake)
 
     noise = Numo::SFloat.new(batch_size, 20).rand(-1, 1)
     label = Numo::SFloat.cast([1] * batch_size).reshape(batch_size, 1)

data/lib/dnn/core/layers/basic_layers.rb

@@ -26,8 +26,8 @@ module DNN
       attr_reader :input_shape
       attr_reader :output_shape
 
-      def self.call(x, *args)
-        new(*args).(x)
+      def self.call(x, *args, **kwargs)
+        new(*args, **kwargs).(x)
       end
 
       def self.from_hash(hash)

data/lib/dnn/core/layers/merge_layers.rb

@@ -2,8 +2,8 @@ module DNN
   module Layers
 
     class MergeLayer < Layer
-      def self.call(x1, x2, *args)
-        new(*args).call(x1, x2)
+      def self.call(x1, x2, *args, **kwargs)
+        new(*args, **kwargs).call(x1, x2)
       end
 
       def call(input1, input2)

data/lib/dnn/core/losses.rb

@@ -2,8 +2,8 @@ module DNN
   module Losses
 
     class Loss
-      def self.call(y, t, *args)
-        new(*args).(y, t)
+      def self.call(y, t, *args, **kwargs)
+        new(*args, **kwargs).(y, t)
       end
 
       def self.from_hash(hash)

data/lib/dnn/datasets/downloader.rb

@@ -1,4 +1,4 @@
-require "net/http"
+require "net/https"
 
 module DNN
   DOWNLOADS_PATH = ENV["RUBY_DNN_DOWNLOADS_PATH"] || __dir__
@@ -18,13 +18,22 @@ module DNN
 
     def initialize(url)
       @url = url
-      *, @fqdn, @path = *url.match(%r`https?://(.+?)(/.+)`)
+      *, @protocol, @fqdn, @path = *url.match(%r`(https?)://(.+?)(/.+)`)
     end
 
     def download(dir_path)
       puts %`download "#{@url}"`
       buf = ""
-      Net::HTTP.start(@fqdn) do |http|
+      if @protocol == "http"
+        port = 80
+      elsif @protocol == "https"
+        port = 443
+      else
+        raise "Protocol(#{@protocol}) is not supported."
+      end
+      http = Net::HTTP.new(@fqdn, port)
+      http.use_ssl = true if @protocol == "https"
+      http.start do |http|
         content_length = http.head(@path).content_length
         http.get(@path) do |body_segment|
           buf << body_segment

data/lib/dnn/image.rb

@@ -1,5 +1,5 @@
 require "numo/narray"
-require_relative "../../ext/rb_stb_image/rb_stb_image"
+require_relative "../rb_stb_image"
 
 module DNN
   module Image

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "1.2.1"
+  VERSION = "1.2.3"
 end

data/ruby-dnn.gemspec

@@ -17,21 +17,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "numo-narray"
   spec.add_dependency "archive-tar-minitar"
-  spec.add_dependency "yard"
+  spec.add_development_dependency "rake-compiler"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.7
-=begin
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-=end
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
@@ -39,7 +26,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", ">= 1.16", "<3.0"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "yard"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - unagiootoro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2023-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -56,16 +56,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ruby-dnn is a ruby deep learning library.
 email:
 - ootoro838861@outlook.jp
@@ -109,8 +129,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - examples/api-examples/early_stopping_example.rb
 - examples/api-examples/initializer_example.rb
 - examples/api-examples/regularizer_example.rb
@@ -144,6 +162,9 @@ files:
 - examples/xor_example.rb
 - ext/rb_stb_image/extconf.rb
 - ext/rb_stb_image/rb_stb_image.c
+- img/cart-pole.gif
+- img/cycle-gan.PNG
+- img/facade-pix2pix.png
 - lib/dnn.rb
 - lib/dnn/core/callbacks.rb
 - lib/dnn/core/error.rb
@@ -188,7 +209,7 @@ homepage: https://github.com/unagiootoro/ruby-dnn.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -203,8 +224,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: ruby deep learning library.
 test_files: []

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "dnn"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here