onnxruntime 0.7.3-x64-mingw → 0.7.4-x64-mingw

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8ec1a3fef4dce07d9b39f242436d62679ce5abb59778afdcdb9caa21d5d7440
-  data.tar.gz: 97ab3d7402f59079aee3f9ae855639563510b2528aeac84602660186248ccbf5
+  metadata.gz: 4c44019c47502ac712bc8d4d74af7460c0cb06f7b100687e76b4be1ac418a625
+  data.tar.gz: 8918d76a60d462a8e0891755a5ca13c010170e22db9d7ca69d1a1da74fb8f75c
 SHA512:
-  metadata.gz: e23924a1799e9f8cd3806ef11af4ba9c40ca098404d792ad4c99959548ff5e5b07e59dac8b130a136ab0a960b940870d19187fcc73bc9b1113aade7725c090b1
-  data.tar.gz: 2c39f4b86e3fd39947a1952511837440e1bd7aa9cd1774f76c7e733ac7ddcba92a904e827ca55c690482b2820b935f8e9649a7a6d3027dbc2c1a1bfe9c2ae49d
+  metadata.gz: c3bfa945be000a8aeb8268a292944caaaded0b256d4f19d851c9130dd4878c4c72214f4afce4abfac24ceb71f41b2671a3932d31cbe6a278daebba1537816210
+  data.tar.gz: e389afa94808062476f9b64a41250d7464ec807393ba3a29e8645f5679b0d074e00684ba6357862ef20416f5f0caedddd0f17e723389fa092d727a921b821bb5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.4 (2022-10-30)
+
+- Updated ONNX Runtime to 1.13.1
+
 ## 0.7.3 (2022-07-23)
 
 - Updated ONNX Runtime to 1.12.0

data/README.md

@@ -43,11 +43,11 @@ Get metadata
 model.metadata
 ```
 
-Load a model from a string
+Load a model from a string or other `IO` object
 
 ```ruby
-byte_str = StringIO.new("...")
-model = OnnxRuntime::Model.new(byte_str)
+io = StringIO.new("...")
+model = OnnxRuntime::Model.new(io)
 ```
 
 Get specific outputs
@@ -59,7 +59,7 @@ model.predict({x: [1, 2, 3]}, output_names: ["label"])
 ## Session Options
 
 ```ruby
-OnnxRuntime::Model.new(path_or_bytes, {
+OnnxRuntime::Model.new(path_or_io, {
   enable_cpu_mem_arena: true,
   enable_mem_pattern: true,
   enable_profiling: false,
@@ -93,7 +93,7 @@ model.predict(input_feed, {
 
 ## Inference Session API
 
-You can also use the Inference Session API, which follows the [Python API](https://microsoft.github.io/onnxruntime/python/api_summary.html).
+You can also use the Inference Session API, which follows the [Python API](https://onnxruntime.ai/docs/api/python/api_summary.html).
 
 ```ruby
 session = OnnxRuntime::InferenceSession.new("model.onnx")

data/lib/onnxruntime/inference_session.rb

@@ -55,58 +55,12 @@ module OnnxRuntime
         end
       end
 
-      # session
-      @session = ::FFI::MemoryPointer.new(:pointer)
-      from_memory =
-        if path_or_bytes.respond_to?(:read)
-          path_or_bytes = path_or_bytes.read
-          true
-        else
-          path_or_bytes = path_or_bytes.to_str
-          path_or_bytes.encoding == Encoding::BINARY
-        end
-
-      if from_memory
-        check_status api[:CreateSessionFromArray].call(env.read_pointer, path_or_bytes, path_or_bytes.bytesize, session_options.read_pointer, @session)
-      else
-        check_status api[:CreateSession].call(env.read_pointer, ort_string(path_or_bytes), session_options.read_pointer, @session)
-      end
+      @session = load_session(path_or_bytes, session_options)
       ObjectSpace.define_finalizer(self, self.class.finalize(@session))
 
-      # input info
-      # don't free allocator
-      allocator = ::FFI::MemoryPointer.new(:pointer)
-      check_status api[:GetAllocatorWithDefaultOptions].call(allocator)
-      @allocator = allocator
-
-      @inputs = []
-      @outputs = []
-
-      # input
-      num_input_nodes = ::FFI::MemoryPointer.new(:size_t)
-      check_status api[:SessionGetInputCount].call(read_pointer, num_input_nodes)
-      num_input_nodes.read(:size_t).times do |i|
-        name_ptr = ::FFI::MemoryPointer.new(:string)
-        check_status api[:SessionGetInputName].call(read_pointer, i, @allocator.read_pointer, name_ptr)
-        # freed in node_info
-        typeinfo = ::FFI::MemoryPointer.new(:pointer)
-        check_status api[:SessionGetInputTypeInfo].call(read_pointer, i, typeinfo)
-        @inputs << {name: name_ptr.read_pointer.read_string}.merge(node_info(typeinfo))
-        allocator_free name_ptr
-      end
-
-      # output
-      num_output_nodes = ::FFI::MemoryPointer.new(:size_t)
-      check_status api[:SessionGetOutputCount].call(read_pointer, num_output_nodes)
-      num_output_nodes.read(:size_t).times do |i|
-        name_ptr = ::FFI::MemoryPointer.new(:string)
-        check_status api[:SessionGetOutputName].call(read_pointer, i, allocator.read_pointer, name_ptr)
-        # freed in node_info
-        typeinfo = ::FFI::MemoryPointer.new(:pointer)
-        check_status api[:SessionGetOutputTypeInfo].call(read_pointer, i, typeinfo)
-        @outputs << {name: name_ptr.read_pointer.read_string}.merge(node_info(typeinfo))
-        allocator_free name_ptr
-      end
+      @allocator = load_allocator
+      @inputs = load_inputs
+      @outputs = load_outputs
     ensure
       release :SessionOptions, session_options
     end
@@ -223,6 +177,64 @@ module OnnxRuntime
 
     private
 
+    def load_session(path_or_bytes, session_options)
+      session = ::FFI::MemoryPointer.new(:pointer)
+      from_memory =
+        if path_or_bytes.respond_to?(:read)
+          path_or_bytes = path_or_bytes.read
+          true
+        else
+          path_or_bytes = path_or_bytes.to_str
+          # TODO remove ability to load byte string directly in 0.8.0
+          path_or_bytes.encoding == Encoding::BINARY
+        end
+
+      if from_memory
+        check_status api[:CreateSessionFromArray].call(env.read_pointer, path_or_bytes, path_or_bytes.bytesize, session_options.read_pointer, session)
+      else
+        check_status api[:CreateSession].call(env.read_pointer, ort_string(path_or_bytes), session_options.read_pointer, session)
+      end
+      session
+    end
+
+    def load_allocator
+      allocator = ::FFI::MemoryPointer.new(:pointer)
+      check_status api[:GetAllocatorWithDefaultOptions].call(allocator)
+      allocator
+    end
+
+    def load_inputs
+      inputs = []
+      num_input_nodes = ::FFI::MemoryPointer.new(:size_t)
+      check_status api[:SessionGetInputCount].call(read_pointer, num_input_nodes)
+      num_input_nodes.read(:size_t).times do |i|
+        name_ptr = ::FFI::MemoryPointer.new(:string)
+        check_status api[:SessionGetInputName].call(read_pointer, i, @allocator.read_pointer, name_ptr)
+        # freed in node_info
+        typeinfo = ::FFI::MemoryPointer.new(:pointer)
+        check_status api[:SessionGetInputTypeInfo].call(read_pointer, i, typeinfo)
+        inputs << {name: name_ptr.read_pointer.read_string}.merge(node_info(typeinfo))
+        allocator_free name_ptr
+      end
+      inputs
+    end
+
+    def load_outputs
+      outputs = []
+      num_output_nodes = ::FFI::MemoryPointer.new(:size_t)
+      check_status api[:SessionGetOutputCount].call(read_pointer, num_output_nodes)
+      num_output_nodes.read(:size_t).times do |i|
+        name_ptr = ::FFI::MemoryPointer.new(:string)
+        check_status api[:SessionGetOutputName].call(read_pointer, i, @allocator.read_pointer, name_ptr)
+        # freed in node_info
+        typeinfo = ::FFI::MemoryPointer.new(:pointer)
+        check_status api[:SessionGetOutputTypeInfo].call(read_pointer, i, typeinfo)
+        outputs << {name: name_ptr.read_pointer.read_string}.merge(node_info(typeinfo))
+        allocator_free name_ptr
+      end
+      outputs
+    end
+
     def create_input_tensor(input_feed, refs)
       allocator_info = ::FFI::MemoryPointer.new(:pointer)
       check_status api[:CreateCpuMemoryInfo].call(1, 0, allocator_info)
@@ -325,7 +337,7 @@ module OnnxRuntime
         check_status api[:GetTensorMutableData].call(out_ptr, tensor_data)
 
         out_size = ::FFI::MemoryPointer.new(:size_t)
-        output_tensor_size = api[:GetTensorShapeElementCount].call(typeinfo.read_pointer, out_size)
+        check_status api[:GetTensorShapeElementCount].call(typeinfo.read_pointer, out_size)
         output_tensor_size = out_size.read(:size_t)
 
         release :TensorTypeAndShapeInfo, typeinfo

data/lib/onnxruntime/version.rb

@@ -1,3 +1,3 @@
 module OnnxRuntime
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onnxruntime
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: x64-mingw
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-23 00:00:00.000000000 Z
+date: 2022-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi