menoh 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe56775dcbde74f64fdeed4fa59bf6fcc539803
-  data.tar.gz: cc676fe5e5d2f2a2e591125fc6dcdfc9c4054962
+  metadata.gz: b5e483ff5c77e451a7e6384898da3460c098a098
+  data.tar.gz: 5277658d6ba5c471a6aee27c3c78afd0c6967018
 SHA512:
-  metadata.gz: 6b1fb84c56bf469d76f97c86e0a0b0b0a832f146ff3ca52224d4983c429720c6dcb3c0191ca87fc1fb925234ea2d04bda2960a280265e52b7d790e270d73df4d
-  data.tar.gz: 62f09585697c3d536d55fef32f0477b289cb0593786e97ae7820759b87fc749d72446d8434abf23550c626e5737fc5e999c4375a4fa46807c31d85ddeeea3b14
+  metadata.gz: 5c230e3d4524c1568c9e50be0fc6043a6ddc7f8d92b55db353e16a86dc69734d3d6e589ca023e62575620c60ccddfa25cfd8b06c90d4ba61ac55f9d4d1267072
+  data.tar.gz: a3849a57262ac65c9df11cd0faaa598bcb3926588546f2b27bd1a8546bfe5a1d09c24135b5f4fec70974f1f71d15bd51e5cfe1bafc3997d38fbd8bc7943b95b6

data/README.md

@@ -77,4 +77,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the OnnxInstant project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/pfnet-research/menoh-ruby/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Menoh Ruby project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/pfnet-research/menoh-ruby/blob/master/CODE_OF_CONDUCT.md).

data/docs/tutorial.md

@@ -45,8 +45,8 @@ model_opt = {
       dims: [
         image_list.length,
         input_shape[:channel_num],
+        input_shape[:height],
         input_shape[:width],
-        input_shape[:height]
       ]
     }
   ],

data/example/example_mnist.rb

@@ -36,8 +36,8 @@ model_opt = {
       dims: [
         image_list.length,
         input_shape[:channel_num],
+        input_shape[:height],
         input_shape[:width],
-        input_shape[:height]
       ]
     }
   ],

data/example/example_mnist_with_block.rb

@@ -33,8 +33,8 @@ model_opt = {
       dims: [
         image_list.length,
         input_shape[:channel_num],
+        input_shape[:height],
         input_shape[:width],
-        input_shape[:height]
       ]
     }
   ],

data/example/example_vgg16.rb

@@ -1,7 +1,7 @@
 require 'open-uri'
 require 'rmagick'
 require 'menoh'
-# TODO revise api
+
 # download dependencies
 def download_file(url, output)
   return if File.exist? output
@@ -45,8 +45,8 @@ model_opt = {
       dims: [
         image_list.length,
         input_shape[:channel_num],
+        input_shape[:height],
         input_shape[:width],
-        input_shape[:height]
       ]
     }
   ],

data/ext/menoh_native/menoh_ruby.c

@@ -164,57 +164,57 @@ static VALUE wrap_model_init(VALUE self, VALUE vonnx, VALUE option) {
         rb_raise(rb_eStandardError, "invalid dimension length");
         return Qnil;
     }
+  }
 
-    // build variable provile table
-    ERROR_CHECK(menoh_build_variable_profile_table(
-                    getModel(self)->vpt_builder, getModel(self)->model_data,
-                    &(getModel(self)->variable_profile_table)),
-                rb_eStandardError);
+  // build variable provile table
+  ERROR_CHECK(menoh_build_variable_profile_table(
+                  getModel(self)->vpt_builder, getModel(self)->model_data,
+                  &(getModel(self)->variable_profile_table)),
+              rb_eStandardError);
 
-    // optimize
-    ERROR_CHECK(
-        menoh_model_data_optimize(getModel(self)->model_data,
-                                  getModel(self)->variable_profile_table),
-        rb_eStandardError);
+  // optimize
+  ERROR_CHECK(
+      menoh_model_data_optimize(getModel(self)->model_data,
+                                getModel(self)->variable_profile_table),
+      rb_eStandardError);
 
-    // get model buildler
-    ERROR_CHECK(menoh_make_model_builder(getModel(self)->variable_profile_table,
-                                         &(getModel(self)->model_builder)),
-                rb_eStandardError);
+  // get model buildler
+  ERROR_CHECK(menoh_make_model_builder(getModel(self)->variable_profile_table,
+                                        &(getModel(self)->model_builder)),
+              rb_eStandardError);
 
-    // attach input buffer to model builder
-    getModel(self)->input_buffs =
-        (float **)ruby_xmalloc(sizeof(float **) * input_layer_num);
-    for (int32_t i = 0; i < input_layer_num; i++) {
-      VALUE vinput_layer = rb_ary_entry(vinput_layers, i);
-      VALUE vname =
-          rb_hash_aref(vinput_layer, rb_to_symbol(rb_str_new2("name")));
-      VALUE vdims =
-          rb_hash_aref(vinput_layer, rb_to_symbol(rb_str_new2("dims")));
-      int32_t dims_length =
-          NUM2INT(rb_funcall(vdims, rb_intern("length"), 0, NULL));
-
-      // prepare input buffer
-      int32_t buffer_length = 1;
-      for (int32_t j = 0; j < dims_length; j++)
-        buffer_length *= NUM2INT(rb_ary_entry(vdims, j));
-
-      float *input_buff = (float *)ruby_xmalloc(sizeof(float) * buffer_length);
-      getModel(self)->input_buffs[i] = input_buff;
-      ERROR_CHECK(
-          menoh_model_builder_attach_external_buffer(
-              getModel(self)->model_builder, StringValueCStr(vname), input_buff),
-          rb_eStandardError);
-    }
+  // attach input buffer to model builder
+  getModel(self)->input_buffs =
+      (float **)ruby_xmalloc(sizeof(float **) * input_layer_num);
+  for (int32_t i = 0; i < input_layer_num; i++) {
+    VALUE vinput_layer = rb_ary_entry(vinput_layers, i);
+    VALUE vname =
+        rb_hash_aref(vinput_layer, rb_to_symbol(rb_str_new2("name")));
+    VALUE vdims =
+        rb_hash_aref(vinput_layer, rb_to_symbol(rb_str_new2("dims")));
+    int32_t dims_length =
+        NUM2INT(rb_funcall(vdims, rb_intern("length"), 0, NULL));
 
-    // build model
-    ERROR_CHECK(menoh_build_model(
-                    getModel(self)->model_builder, getModel(self)->model_data,
-                    StringValueCStr(vbackend), "", &(getModel(self)->model)),
-                rb_eStandardError);
+    // prepare input buffer
+    int32_t buffer_length = 1;
+    for (int32_t j = 0; j < dims_length; j++)
+      buffer_length *= NUM2INT(rb_ary_entry(vdims, j));
 
-    return Qnil;
+    float *input_buff = (float *)ruby_xmalloc(sizeof(float) * buffer_length);
+    getModel(self)->input_buffs[i] = input_buff;
+    ERROR_CHECK(
+        menoh_model_builder_attach_external_buffer(
+            getModel(self)->model_builder, StringValueCStr(vname), input_buff),
+        rb_eStandardError);
   }
+
+  // build model
+  ERROR_CHECK(menoh_build_model(
+                  getModel(self)->model_builder, getModel(self)->model_data,
+                  StringValueCStr(vbackend), "", &(getModel(self)->model)),
+              rb_eStandardError);
+
+  return Qnil;
 }
 
 static VALUE wrap_model_run(VALUE self, VALUE dataset) {

data/ext/menoh_native/menoh_ruby.h

@@ -1,7 +1,7 @@
-#ifndef RUNX_H
-#define RUNX_H 1
+#ifndef MENOH_H
+#define MENOH_H 1
 
 #include <menoh/menoh.h>
 #include <ruby.h>
 
-#endif /* RUNX_H */
+#endif /* MENOH_H */

data/lib/menoh.rb

@@ -4,35 +4,20 @@ require 'menoh/menoh_native'
 module Menoh
   class Menoh
     def initialize(file)
-      if !File.exist?(file)
-        raise "No such file : #{file}"
-      end
+      raise "No such file : #{file}" unless File.exist?(file)
 
       native_init file
       yield self if block_given?
     end
 
     def make_model(option)
-      if option[:backend].nil?
-        raise "Required ':backend' : #{option[:backend]}"
-      end
+      raise "Required ':backend' : #{option[:backend]}" if option[:backend].nil?
       model = MenohModel.new self, option
       yield model if block_given?
       model
     end
   end
-end
-
-def transpose(buffer, shape)
-  sliced_buffer = buffer.each_slice(buffer.length / shape[0]).to_a
-  if shape.length > 2
-    next_shape = shape.slice(1, a.length)
-    sliced_buffer = sliced_buffer.map { |buf| transpose buf, next_shape }
-  end
-  sliced_buffer
-end
 
-module Menoh
   class MenohModel
     def initialize(menoh, option)
       if option[:input_layers].nil? || option[:input_layers].empty?
@@ -77,11 +62,22 @@ module Menoh
       results.map do |raw|
         buffer = raw[:data]
         shape = raw[:shape]
-        raw[:data] = transpose buffer, shape
+        raw[:data] = Util.reshape buffer, shape
       end
 
       yield results if block_given?
       results
     end
   end
+
+  module Util
+    def self.reshape(buffer, shape)
+      sliced_buffer = buffer.each_slice(buffer.length / shape[0]).to_a
+      if shape.length > 2
+        next_shape = shape.slice(1, shape.length)
+        sliced_buffer = sliced_buffer.map { |buf| reshape buf, next_shape }
+      end
+      sliced_buffer
+    end
+  end
 end

data/lib/menoh/version.rb

@@ -1,3 +1,3 @@
 module Menoh
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/menoh.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'menoh'
   spec.version       = Menoh::VERSION
   spec.authors       = ['Kunihiko MIYOSHI']
-  spec.email         = ['miyoshik@preferred.jp']
+  spec.email         = ['menoh-oss@preferred.jp']
 
   spec.summary       = "Ruby binding of ONNX runtime engine 'Menoh'"
   spec.description   = "Ruby binding of ONNX runtime engine 'Menoh'"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: menoh
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kunihiko MIYOSHI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ dependencies:
         version: '0'
 description: Ruby binding of ONNX runtime engine 'Menoh'
 email:
-- miyoshik@preferred.jp
+- menoh-oss@preferred.jp
 executables: []
 extensions:
 - ext/menoh_native/extconf.rb