ruby-dnn 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55dea04f1d2a6bb4806c3f029086474b46b8a225f7168e4c72af92e0f7d69f71
-  data.tar.gz: 2522778ffabbce31315b48ad3abfedd2dea2e9dba0d09af4e9700cb9c588393b
+  metadata.gz: 6b3228eaf257e50c55bdd51b348e71dcc45d74a7cc14668231c4a5e1c9fed318
+  data.tar.gz: ae3a1217cb1aa0a3d0f50ad2b042fd255385a713c7787ad318f34410170dbb83
 SHA512:
-  metadata.gz: 05056e7619f52dd8efac34c6aeae1e1652e3635257baf302f15908131d6908d7ee49e892040514b0ea3011c46148eb3c0fedd3857b85ab0cf271c521bb907349
-  data.tar.gz: 41828ada6a07129fdfc4ed5aff6af9c6dc7d934dd0f39eec8792d77a7b2fc5769b2f3d278ced6b5def360db58a7a34c014a0876e65ca7525d35a67219285aab7
+  metadata.gz: 977ddba86307314f9af523643e151f397705600f2aa244980dfefbda8af7c74114dd4b17d515c64d30e412d8e6aa3de8a127ba085dd8666e03a99ac2cb1fd573
+  data.tar.gz: 80e1d0a963e066aa74f0e9e9e786113ea8505112990de217b6d3a7b7b9f60b06f5ee777e94fb95fb7f006fd92f7ef4b11b3aaa87f605ae66115c30d007055657

data/examples/judge-number/README.md

@@ -0,0 +1,29 @@
+# Prepare
+This example use to sinatra.
+
+```
+$ gem install sinatra
+$ gem install sinatra-contrib
+```
+
+# Let's try
+This example prepared weights that have already been trained.
+If you want to try it immediately, skip steps (1) and (2).
+
+### (1) Training MNIST
+```
+$ ruby mnist_train.rb
+```
+
+### (2) Make weights
+```
+$ ruby make_weights.rb
+```
+
+### (3) Launch sinatra server
+```
+$ ruby server.rb
+```
+
+### (4) Access 127.0.0.1:4567 with your browser
+![](capture.PNG)

data/examples/judge-number/convnet8.rb

@@ -0,0 +1,70 @@
+require "dnn"
+require "numo/linalg/autoloader"
+
+include DNN::Models
+include DNN::Layers
+include DNN::Optimizers
+include DNN::Losses
+
+class ConvNet < Model
+  def self.create(input_shape)
+    convnet = ConvNet.new(input_shape, 32)
+    convnet.setup(Adam.new, SoftmaxCrossEntropy.new)
+    convnet
+  end
+
+  def initialize(input_shape, base_filter_size)
+    super()
+    @input_shape = input_shape
+    @cv1 = Conv2D.new(base_filter_size, 3, padding: true)
+    @cv2 = Conv2D.new(base_filter_size, 3, padding: true)
+    @cv3 = Conv2D.new(base_filter_size * 2, 3, padding: true)
+    @cv4 = Conv2D.new(base_filter_size * 2, 3, padding: true)
+    @cv5 = Conv2D.new(base_filter_size * 4, 3, padding: true)
+    @cv6 = Conv2D.new(base_filter_size * 4, 3, padding: true)
+    @bn1 = BatchNormalization.new
+    @bn2 = BatchNormalization.new
+    @bn3 = BatchNormalization.new
+    @bn4 = BatchNormalization.new
+    @d1 = Dense.new(512)
+    @d2 = Dense.new(10)
+  end
+
+  def forward(x)
+    x = InputLayer.new(@input_shape).(x)
+
+    x = @cv1.(x)
+    x = ReLU.(x)
+    x = Dropout.(x, 0.25)
+
+    x = @cv2.(x)
+    x = @bn1.(x)
+    x = ReLU.(x)
+    x = MaxPool2D.(x, 2)
+
+    x = @cv3.(x)
+    x = ReLU.(x)
+    x = Dropout.(x, 0.25)
+
+    x = @cv4.(x)
+    x = @bn2.(x)
+    x = ReLU.(x)
+    x = MaxPool2D.(x, 2)
+
+    x = @cv5.(x)
+    x = ReLU.(x)
+    x = Dropout.(x, 0.25)
+
+    x = @cv6.(x)
+    x = @bn3.(x)
+    x = ReLU.(x)
+    x = MaxPool2D.(x, 2)
+
+    x = Flatten.(x)
+    x = @d1.(x)
+    x = @bn4.(x)
+    x = ReLU.(x)
+    x = @d2.(x)
+    x
+  end
+end

data/examples/judge-number/make_weights.rb

@@ -0,0 +1,5 @@
+require "dnn"
+require_relative "convnet8"
+
+model = ConvNet.load("trained_mnist_epoch20.marshal")
+model.save_params("trained_mnist_params.marshal")

data/examples/judge-number/mnist_predict.rb

@@ -0,0 +1,20 @@
+require "dnn"
+require "dnn/image"
+require_relative "convnet8"
+
+def load_model
+  return if $model
+  $model = ConvNet.create([28, 28, 1])
+  $model.predict1(Numo::SFloat.zeros(28, 28, 1))
+  $model.load_params("trained_mnist_params.marshal")
+end
+
+def mnist_predict(img, width, height)
+  load_model
+  img = DNN::Image.from_binary(img, height, width, DNN::Image::RGBA)
+  img = img[true, true, 0...DNN::Image::RGB]
+  img = DNN::Image.to_gray_scale(img)
+  x = Numo::SFloat.cast(img) / 255
+  out = $model.predict1(x)
+  out.to_a.map { |v| v.round(4) * 100 }
+end

data/examples/judge-number/mnist_train.rb

@@ -0,0 +1,19 @@
+require "dnn"
+require "dnn/datasets/mnist"
+require_relative "convnet8"
+
+include DNN::Callbacks
+
+x_train, y_train = DNN::MNIST.load_train
+x_test, y_test = DNN::MNIST.load_test
+
+x_train = Numo::SFloat.cast(x_train) / 255
+x_test = Numo::SFloat.cast(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 = ConvNet.create([28, 28, 1])
+model.add_callback(CheckPoint.new("trained/trained_mnist", interval: 5))
+
+model.train(x_train, y_train, 20, batch_size: 128, test: [x_test, y_test])

data/examples/judge-number/public/httpRequest.js

@@ -0,0 +1,44 @@
+class HttpRequest {
+    static get(path, responseCallback) {
+        const req = new HttpRequest(path, "GET", responseCallback);
+        req.send();
+        return req;
+    }
+
+    static post(path, params, responseCallback) {
+        const req = new HttpRequest(path, "POST", responseCallback);
+        req.send(params);
+        return req;
+    }
+
+    constructor(path, method, responseCallback) {
+        this._path = path;
+        this._method = method;
+        this._responseCallback = responseCallback;
+    }
+
+    send(params = null) {
+        const xhr = new XMLHttpRequest();
+        xhr.open(this._method, this._path);
+        let json = null;
+        if (params) json = JSON.stringify(params);
+        xhr.addEventListener("load", (e) => {
+            const res = {
+                response: xhr.response,
+                event: e
+            };
+            this._responseCallback(res);
+        });
+        xhr.send(json);
+    }
+}
+
+class Base64 {
+    static encode(obj) {
+        if (typeof(obj) === "string") {
+            return btoa(obj);
+        } else if (obj instanceof Uint8Array || obj instanceof Uint8ClampedArray) {
+            return btoa(String.fromCharCode(...obj));
+        }
+    }
+}

data/examples/judge-number/public/judgeNumber.js

@@ -0,0 +1,61 @@
+const drawCanvas = document.getElementById("draw");
+const viewCanvas = document.getElementById("view");
+
+const drawContext = drawCanvas.getContext("2d");
+drawContext.fillRect(0, 0, drawCanvas.width, drawCanvas.height);
+const viewContext = viewCanvas.getContext("2d");
+viewContext.fillRect(0, 0, drawCanvas.width, drawCanvas.height);
+
+const judgeButton = document.getElementById("judge");
+const clearButton = document.getElementById("clear");
+
+const resultArea = document.getElementById("result");
+
+const updateResult = (classification) => {
+    let str = "";
+    for(let i = 0; i <= 9; i++){
+        str += `${i}: ${classification[i]}%<br>`;
+    }
+    resultArea.innerHTML = str;
+};
+
+judgeButton.addEventListener("click", () =>{
+    viewContext.drawImage(drawCanvas, 0, 0, viewCanvas.width, viewCanvas.height);
+    const data = viewContext.getImageData(0, 0, viewCanvas.width, viewCanvas.height).data;
+    params = {
+        img: Base64.encode(data),
+        width: viewCanvas.width,
+        height: viewCanvas.height,
+    }
+    HttpRequest.post("/predict", params, (res) => {
+        updateResult(JSON.parse(res.response));
+    });
+});
+
+clearButton.addEventListener("click", () =>{
+    drawContext.fillStyle = "black";
+    drawContext.fillRect(0, 0, drawCanvas.width, drawCanvas.height);
+    viewContext.fillStyle = "black";
+    viewContext.fillRect(0, 0, drawCanvas.width, drawCanvas.height);
+    result.innerHTML = "";
+});
+
+let mouseDown = false;
+
+window.addEventListener("mousedown", e =>{
+    mouseDown = true;
+});
+
+window.addEventListener("mouseup", e =>{
+    mouseDown = false;
+});
+
+drawCanvas.addEventListener("mousemove", e =>{
+    if(mouseDown){
+        let rect = e.target.getBoundingClientRect();
+        let x = e.clientX - 10 - rect.left;
+        let y = e.clientY - 10 - rect.top;
+        drawContext.fillStyle = "white";
+        drawContext.fillRect(x, y, 20, 20);
+    }
+});

data/examples/judge-number/server.rb

@@ -0,0 +1,19 @@
+require "sinatra"
+require "sinatra/reloader"
+require "json"
+require "base64"
+require_relative "mnist_predict"
+
+get "/" do
+  erb :index
+end
+
+post "/predict" do
+  json = request.body.read
+  params = JSON.parse(json, symbolize_names: true)
+  img = Base64.decode64(params[:img])
+  width = params[:width].to_i
+  height = params[:height].to_i
+  result = mnist_predict(img, width, height)
+  JSON.dump(result)
+end

data/examples/judge-number/views/index.erb

@@ -0,0 +1,7 @@
+<canvas id="draw" width=256 height=256></canvas>
+<canvas id="view" width=28 height=28></canvas>
+<button id="judge">Judge</button>
+<button id="clear">Clear</button>
+<p id="result"></p>
+<script src="judgeNumber.js"></script>
+<script src="httpRequest.js"></script>

data/lib/dnn/core/losses.rb

@@ -42,12 +42,6 @@ module DNN
         loss
       end
 
-      def regularizers_backward(layers)
-        layers.select { |layer| layer.respond_to?(:regularizers) }.each do |layer|
-          layer.regularizers.each(&:backward)
-        end
-      end
-
       def to_hash(merge_hash = nil)
         hash = { class: self.class.name }
         hash.merge!(merge_hash) if merge_hash

data/lib/dnn/core/models.rb

@@ -474,6 +474,15 @@ module DNN
         @callbacks << callback
       end
 
+      # Add lambda callback.
+      # @param [Symbol] event Event to execute callback.
+      # @yield Register the contents of the callback.
+      def add_lambda_callback(event, &block)
+        callback = Callbacks::LambdaCallback.new(event, &block)
+        callback.model = self
+        @callbacks << callback
+      end
+
       # Clear the callback function registered for each event.
       def clear_callbacks
         @callbacks = []

data/lib/dnn/image.rb

@@ -64,6 +64,19 @@ module DNN
       raise ImageWriteError, "Image write failed." if res == 0
     end
 
+    # Create an image from binary.
+    # @param [String] bin binary data.
+    # @param [Integer] height Image height.
+    # @param [Integer] width Image width.
+    # @param [Integer] channel Image channel.
+    def self.from_binary(bin, height, width, channel = DNN::Image::RGB)
+      expected_size = height * width * channel
+      unless bin.size == expected_size
+        raise ImageError, "binary size is #{bin.size}, but expected binary size is #{expected_size}"
+      end
+      Numo::UInt8.from_binary(bin).reshape(height, width, channel)
+    end
+
     # Resize the image.
     # @param [Numo::UInt8] img Image to resize.
     # @param [Integer] out_height Image height to resize.

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dnn
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -121,6 +121,17 @@ files:
 - examples/dcgan/imgen.rb
 - examples/dcgan/train.rb
 - examples/iris_example.rb
+- examples/judge-number/README.md
+- examples/judge-number/capture.PNG
+- examples/judge-number/convnet8.rb
+- examples/judge-number/make_weights.rb
+- examples/judge-number/mnist_predict.rb
+- examples/judge-number/mnist_train.rb
+- examples/judge-number/public/httpRequest.js
+- examples/judge-number/public/judgeNumber.js
+- examples/judge-number/server.rb
+- examples/judge-number/trained_mnist_params.marshal
+- examples/judge-number/views/index.erb
 - examples/mnist_conv2d_example.rb
 - examples/mnist_define_by_run.rb
 - examples/mnist_example.rb