onnxruntime 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe15097b48e0c08cc25878384b74239ff9a462a23ac99ba26331aff7d9315dd8
-  data.tar.gz: 94bbc725a419d5e4712d0c0fefb46e30acd3d9c675d0a0e156b2356b490a2617
+  metadata.gz: d37fddde85ef4715dc9c74d37f3465b9ba773ecfe491789ea7f07476c9078842
+  data.tar.gz: 7898982a8b0070a8b85467fe0c496c1713ac79f7505887425e1b72120ff471a1
 SHA512:
-  metadata.gz: 9e1970fbf2430692e875b0ce450b16ac6930ba4fea3a7c686604f37ec3eca7e526209fb9df3be18cce26a24c50e59fafb98c3ca5b054d6a5b47c430b3316a450
-  data.tar.gz: c2c57c89b52aa70acde18dca516adcdbb51a53d31d979aa498a16636b841b1f83aa0156e948150628f2663a52c2c0562e0837bf8edc70d4380220f2b548d1fee
+  metadata.gz: 4f78f1cf39a22280c1d3cfb385cbc27d527a909e8281eb9681328b963f391b3343b8b093687665479d673a4a865fa449ea7555bd2d4b45e49764716a253699cf
+  data.tar.gz: 52f7481494f15a22110c52dbe83947282db4da193804d79b3ebd22a194f0adda8e3a4ae69b96211bd0ea72f937670a5876d70271f7716bafd18d6c94ff23120d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.2
+
+- Added support for Numo::NArray
+- Made thread-safe
+- Fixed error with JRuby
+
 ## 0.1.1
 
 - Packaged ONNX Runtime with gem

data/README.md

@@ -2,6 +2,8 @@
 
 :fire: [ONNX Runtime](https://github.com/Microsoft/onnxruntime) - the high performance scoring engine for ML models - for Ruby
 
+Check out [an example](https://ankane.org/tensorflow-ruby)
+
 [![Build Status](https://travis-ci.org/ankane/onnxruntime.svg?branch=master)](https://travis-ci.org/ankane/onnxruntime) [![Build status](https://ci.appveyor.com/api/projects/status/f2bq6ruqjf4jx671/branch/master?svg=true)](https://ci.appveyor.com/project/ankane/onnxruntime/branch/master)
 
 ## Installation
@@ -21,6 +23,8 @@ model = OnnxRuntime::Model.new("model.onnx")
 model.predict(x: [1, 2, 3])
 ```
 
+> Download pre-trained models from the [ONNX Model Zoo](https://github.com/onnx/models)
+
 Get inputs
 
 ```ruby

data/lib/onnxruntime/inference_session.rb

@@ -33,7 +33,7 @@ module OnnxRuntime
       # input
       num_input_nodes = ::FFI::MemoryPointer.new(:size_t)
       check_status FFI.OrtSessionGetInputCount(read_pointer, num_input_nodes)
-      num_input_nodes.read(:size_t).times do |i|
+      read_size_t(num_input_nodes).times do |i|
         name_ptr = ::FFI::MemoryPointer.new(:string)
         check_status FFI.OrtSessionGetInputName(read_pointer, i, @allocator.read_pointer, name_ptr)
         typeinfo = ::FFI::MemoryPointer.new(:pointer)
@@ -44,7 +44,7 @@ module OnnxRuntime
       # output
       num_output_nodes = ::FFI::MemoryPointer.new(:size_t)
       check_status FFI.OrtSessionGetOutputCount(read_pointer, num_output_nodes)
-      num_output_nodes.read(:size_t).times do |i|
+      read_size_t(num_output_nodes).times do |i|
         name_ptr = ::FFI::MemoryPointer.new(:string)
         check_status FFI.OrtSessionGetOutputName(read_pointer, i, allocator.read_pointer, name_ptr)
         typeinfo = ::FFI::MemoryPointer.new(:pointer)
@@ -77,6 +77,8 @@ module OnnxRuntime
       input_tensor = ::FFI::MemoryPointer.new(:pointer, input_feed.size)
 
       input_feed.each_with_index do |(input_name, input), idx|
+        input = input.to_a unless input.is_a?(Array)
+
         shape = []
         s = input
         while s.is_a?(Array)
@@ -146,7 +148,7 @@ module OnnxRuntime
 
         out_size = ::FFI::MemoryPointer.new(:size_t)
         output_tensor_size = FFI.OrtGetTensorShapeElementCount(typeinfo.read_pointer, out_size)
-        output_tensor_size = out_size.read(:size_t)
+        output_tensor_size = read_size_t(out_size)
 
         # TODO support more types
         type = FFI::TensorElementDataType[type]
@@ -165,7 +167,7 @@ module OnnxRuntime
         out = ::FFI::MemoryPointer.new(:size_t)
         check_status FFI.OrtGetValueCount(out_ptr, out)
 
-        out.read(:size_t).times.map do |i|
+        read_size_t(out).times.map do |i|
           seq = ::FFI::MemoryPointer.new(:pointer)
           check_status FFI.OrtGetValue(out_ptr, i, @allocator.read_pointer, seq)
           create_from_onnx_value(seq.read_pointer)
@@ -252,7 +254,7 @@ module OnnxRuntime
 
       num_dims_ptr = ::FFI::MemoryPointer.new(:size_t)
       check_status FFI.OrtGetDimensionsCount(tensor_info.read_pointer, num_dims_ptr)
-      num_dims = num_dims_ptr.read(:size_t)
+      num_dims = read_size_t(num_dims_ptr)
 
       node_dims = ::FFI::MemoryPointer.new(:int64, num_dims)
       check_status FFI.OrtGetDimensions(tensor_info.read_pointer, node_dims, num_dims)
@@ -264,14 +266,24 @@ module OnnxRuntime
       raise "Unsupported #{name} type: #{type}"
     end
 
-    # share env
-    # TODO mutex around creation?
+    # read(:size_t) not supported in FFI JRuby
+    def read_size_t(ptr)
+      if RUBY_PLATFORM == "java"
+        ptr.read_long
+      else
+        ptr.read(:size_t)
+      end
+    end
+
     def env
-      @@env ||= begin
-        env = ::FFI::MemoryPointer.new(:pointer)
-        check_status FFI.OrtCreateEnv(3, "Default", env)
-        at_exit { FFI.OrtReleaseEnv(env.read_pointer) }
-        env
+      # use mutex for thread-safety
+      Utils.mutex.synchronize do
+        @@env ||= begin
+          env = ::FFI::MemoryPointer.new(:pointer)
+          check_status FFI.OrtCreateEnv(3, "Default", env)
+          at_exit { FFI.OrtReleaseEnv(env.read_pointer) }
+          env
+        end
       end
     end
   end

data/lib/onnxruntime/utils.rb

@@ -1,6 +1,12 @@
 module OnnxRuntime
   module Utils
+    class << self
+      attr_accessor :mutex
+    end
+    self.mutex = Mutex.new
+
     def self.reshape(arr, dims)
+      arr = arr.flatten
       dims[1..-1].reverse.each do |dim|
         arr = arr.each_slice(dim)
       end

data/lib/onnxruntime/version.rb

@@ -1,3 +1,3 @@
 module OnnxRuntime
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onnxruntime
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi