ruby-dnn 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf955bc9993a8c9495b144659cedc0cc97c1bde3bc1521be2453847d9d3afd91
-  data.tar.gz: b64395b3976619575ded55fd7ab508d09a8f0cde0dd0ab8a7d611dd7ae76f169
+  metadata.gz: 5c2ef751fa76ea2918c5f706e1828eba514385b831dc042fa561a08d38da977a
+  data.tar.gz: b906f6a9c63620378b284a2be3ca3bb8e007534b945493b9f8323f77c012cd0f
 SHA512:
-  metadata.gz: 8dca44e876a1403b8b02e94936ce46f98a7dfa14a47874976c88fad12544f447481959cec6d563c6af6cfe9fa643f37a18c016b39e1da955f915f18027580f11
-  data.tar.gz: ad647ff01b6f9d9afe9a7dde002e68dce80dc1de57570d160e684f2a54fc635c9a0f6661fc563adbbe8196bd517f7c86f546302b185bac557209773f8d832da0
+  metadata.gz: 94e7af50f4cdc556b252e3afed0703aa7d9e9d519f2e1e24253a1a27b388fe9d00444edfc271343365dc39e8a02d326df27e923216834509cb639986576664de
+  data.tar.gz: 5fc8acfeed67fff5b41247ab6c3f03b68f96f48bdda877951e23d1fb12f2cc6c113a6102b8b531cd41d1c596d2ab6fa96a243607d38182d804ab1f5396e5439c

data/lib/dnn/core/layers.rb

@@ -19,10 +19,12 @@ module DNN
       end
 
       # Forward propagation.
-      def forward() end
+      # Classes that inherit from this class must implement this method.
+      # def forward() end
 
       # Backward propagation.
-      def backward() end
+      # Classes that inherit from this class must implement this method.
+      # def backward() end
     
       # Get the shape of the layer.
       def shape
@@ -102,11 +104,12 @@ module DNN
     end
 
 
+    # It is a superclass of all connection layers.
     class Connection < HasParamLayer
       include Initializers
 
-      attr_reader :l1_lambda
-      attr_reader :l2_lambda
+      attr_reader :l1_lambda # L1 regularization
+      attr_reader :l2_lambda # L2 regularization
 
       def initialize(weight_initializer: nil,
                      bias_initializer: nil,

data/lib/dnn/ext/cifar10_loader/cifar10_loader.c

@@ -1,26 +1,27 @@
 #include <ruby.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #define CIFAR10_WIDTH 32
 #define CIFAR10_HEIGHT 32
 #define CIFAR10_CHANNEL 3
 
-VALUE cifar10_load_binary(VALUE self, VALUE rb_bin, VALUE rb_num_datas) {
-  char* bin = StringValuePtr(rb_bin);
-  int num_datas = FIX2INT(rb_num_datas);
+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;
-  int i;
-  int j = 0;
-  int k = 0;
-  int size = CIFAR10_WIDTH * CIFAR10_HEIGHT * CIFAR10_CHANNEL;
-  int x_bin_size = num_datas * size;
-  int y_bin_size = num_datas;
-  char* x_bin;
-  char* y_bin;
+  int32_t i;
+  int32_t j = 0;
+  int32_t k = 0;
+  int32_t size = CIFAR10_WIDTH * CIFAR10_HEIGHT * CIFAR10_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 = (char*)malloc(x_bin_size);
-  y_bin = (char*)malloc(y_bin_size);
+  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++;
@@ -28,8 +29,8 @@ VALUE cifar10_load_binary(VALUE self, VALUE rb_bin, VALUE rb_num_datas) {
     j += size;
     k += size;
   }
-  rb_x_bin = rb_str_new(x_bin, x_bin_size);
-  rb_y_bin = rb_str_new(y_bin, y_bin_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);

data/lib/dnn/ext/rb_stb_image/rb_stb_image.c

@@ -1,4 +1,5 @@
 #include <ruby.h>
+#include <stdint.h>
 
 #define STB_IMAGE_IMPLEMENTATION
 #define STB_IMAGE_WRITE_IMPLEMENTATION
@@ -6,13 +7,13 @@
 #include "stb_image.h"
 #include "stb_image_write.h"
 
-//STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp);
-VALUE rb_stbi_load(VALUE self, VALUE rb_filename, VALUE rb_req_comp) {
+// STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp);
+static VALUE rb_stbi_load(VALUE self, VALUE rb_filename, VALUE rb_req_comp) {
   char* filename = StringValuePtr(rb_filename);
-  int x, y, n;
-  int req_comp = FIX2INT(rb_req_comp);
-  unsigned char* data;
-  int ch;
+  int32_t x, y, n;
+  int32_t req_comp = FIX2INT(rb_req_comp);
+  uint8_t* data;
+  int32_t ch;
   VALUE rb_x, rb_y, rb_n;
   VALUE rb_data;
 
@@ -26,42 +27,68 @@ VALUE rb_stbi_load(VALUE self, VALUE rb_filename, VALUE rb_req_comp) {
   return rb_ary_new3(4, rb_data, rb_x, rb_y, rb_n);
 }
 
-//STBIWDEF int stbi_write_png(char const *filename, int w, int h, int comp, const void  *data, int stride_in_bytes);
-VALUE rb_stbi_write_png(VALUE self, VALUE rb_filename, VALUE rb_w, VALUE rb_h, VALUE rb_comp, VALUE rb_data, VALUE rb_stride_in_bytes) {
+// STBIWDEF int stbi_write_png(char const *filename, int w, int h, int comp, const void  *data, int stride_in_bytes);
+static VALUE rb_stbi_write_png(VALUE self, VALUE rb_filename, VALUE rb_w, VALUE rb_h, VALUE rb_comp, VALUE rb_data, VALUE rb_stride_in_bytes) {
   char* filename = StringValuePtr(rb_filename);
-  int w = FIX2INT(rb_w);
-  int h = FIX2INT(rb_h);
-  int comp = FIX2INT(rb_comp);
-  unsigned char* data = (unsigned char*)StringValuePtr(rb_data);
-  int stride_in_bytes = FIX2INT(rb_stride_in_bytes);
-  int result;
+  int32_t w = FIX2INT(rb_w);
+  int32_t h = FIX2INT(rb_h);
+  int32_t comp = FIX2INT(rb_comp);
+  uint8_t* data = (uint8_t*)StringValuePtr(rb_data);
+  int32_t stride_in_bytes = FIX2INT(rb_stride_in_bytes);
+  int32_t result;
 
   result = stbi_write_png(filename, w, h, comp, data, stride_in_bytes);
   return INT2FIX(result);
 }
 
-//STBIWDEF int stbi_write_bmp(char const *filename, int w, int h, int comp, const void  *data);
-VALUE rb_stbi_write_bmp(VALUE self, VALUE rb_filename, VALUE rb_w, VALUE rb_h, VALUE rb_comp, VALUE rb_data) {
+// STBIWDEF int stbi_write_bmp(char const *filename, int w, int h, int comp, const void  *data);
+static VALUE rb_stbi_write_bmp(VALUE self, VALUE rb_filename, VALUE rb_w, VALUE rb_h, VALUE rb_comp, VALUE rb_data) {
   char* filename = StringValuePtr(rb_filename);
-  int w = FIX2INT(rb_w);
-  int h = FIX2INT(rb_h);
-  int comp = FIX2INT(rb_comp);
-  unsigned char* data = (unsigned char*)StringValuePtr(rb_data);
-  int result;
+  int32_t w = FIX2INT(rb_w);
+  int32_t h = FIX2INT(rb_h);
+  int32_t comp = FIX2INT(rb_comp);
+  uint8_t* data = (uint8_t*)StringValuePtr(rb_data);
+  int32_t result;
 
   result = stbi_write_bmp(filename, w, h, comp, data);
   return INT2FIX(result);
 }
 
-//STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void  *data, int quality);
-VALUE rb_stbi_write_jpg(VALUE self, VALUE rb_filename, VALUE rb_w, VALUE rb_h, VALUE rb_comp, VALUE rb_data, VALUE rb_quality) {
+// STBIWDEF int stbi_write_tga(char const *filename, int w, int h, int comp, const void  *data);
+static VALUE rb_stbi_write_tga(VALUE self, VALUE rb_filename, VALUE rb_w, VALUE rb_h, VALUE rb_comp, VALUE rb_data) {
   char* filename = StringValuePtr(rb_filename);
-  int w = FIX2INT(rb_w);
-  int h = FIX2INT(rb_h);
-  int comp = FIX2INT(rb_comp);
-  unsigned char* data = (unsigned char*)StringValuePtr(rb_data);
-  int quality = FIX2INT(rb_quality);
-  int result;
+  int32_t w = FIX2INT(rb_w);
+  int32_t h = FIX2INT(rb_h);
+  int32_t comp = FIX2INT(rb_comp);
+  uint8_t* data = (uint8_t*)StringValuePtr(rb_data);
+  int32_t result;
+
+  result = stbi_write_tga(filename, w, h, comp, data);
+  return INT2FIX(result);
+}
+
+// STBIWDEF int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data);
+static VALUE rb_stbi_write_hdr(VALUE self, VALUE rb_filename, VALUE rb_w, VALUE rb_h, VALUE rb_comp, VALUE rb_data) {
+  char* filename = StringValuePtr(rb_filename);
+  int32_t w = FIX2INT(rb_w);
+  int32_t h = FIX2INT(rb_h);
+  int32_t comp = FIX2INT(rb_comp);
+  float* data = (float*)StringValuePtr(rb_data);
+  int32_t result;
+
+  result = stbi_write_hdr(filename, w, h, comp, data);
+  return INT2FIX(result);
+}
+
+// STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void  *data, int quality);
+static VALUE rb_stbi_write_jpg(VALUE self, VALUE rb_filename, VALUE rb_w, VALUE rb_h, VALUE rb_comp, VALUE rb_data, VALUE rb_quality) {
+  char* filename = StringValuePtr(rb_filename);
+  int32_t w = FIX2INT(rb_w);
+  int32_t h = FIX2INT(rb_h);
+  int32_t comp = FIX2INT(rb_comp);
+  uint8_t* data = (uint8_t*)StringValuePtr(rb_data);
+  int32_t quality = FIX2INT(rb_quality);
+  int32_t result;
 
   result = stbi_write_jpg(filename, w, h, comp, data, quality);
   return INT2FIX(result);
@@ -74,5 +101,7 @@ void Init_rb_stb_image() {
   rb_define_module_function(rb_stb, "stbi_load", rb_stbi_load, 2);
   rb_define_module_function(rb_stb, "stbi_write_png", rb_stbi_write_png, 6);
   rb_define_module_function(rb_stb, "stbi_write_bmp", rb_stbi_write_bmp, 5);
+  rb_define_module_function(rb_stb, "stbi_write_tga", rb_stbi_write_tga, 5);
+  rb_define_module_function(rb_stb, "stbi_write_hdr", rb_stbi_write_hdr, 5);
   rb_define_module_function(rb_stb, "stbi_write_jpg", rb_stbi_write_jpg, 6);
 }

data/lib/dnn/lib/cifar10.rb

@@ -1,4 +1,3 @@
-require "dnn"
 require "open-uri"
 require "zlib"
 require "archive/tar/minitar"

data/lib/dnn/version.rb

@@ -1,3 +1,3 @@
 module DNN
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

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