onnxruntime 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 319aa838b46ffb8d022e015d2f6d1162f7d553cc2bec76d7c34f78e1738a1584
-  data.tar.gz: 576b30458a43140c30382c5ae7a05075664c31d4fb30a5918d463cfff1c2bb2c
+  metadata.gz: b9de7cf3676f398f47f5b8c36d7e74af3d61dc2b1d0f45f37b14f509ec8ceac3
+  data.tar.gz: 2d464d13f784d423a57f8a27222462a9dc90501e24243621d2615dc267e2cab5
 SHA512:
-  metadata.gz: 176f2290a9ccade813725237fb326780dd8640823c463065da7b9c259ec5754b712a37a5028527e987de35ac40b261aee2a34fab35384eb27e62e30407b88f52
-  data.tar.gz: 0a2cb5ccb5aa10389d92205e01e6ba222099bc38aca3cc457058fdf06c8f5b9134111cae57eba1f6ba7d9583c19e252b78cb3aa5da9766335b370981ae1a077b
+  metadata.gz: a384bcd9d6eb8c95583a4f97d48ba5ae63a22bc1b0fa71bd90f530f9227a129864f1a97570c5ecb8b3beb06cb48d935b7d23cd351f414626b73d0c0ea072b271
+  data.tar.gz: 479f8dc3b4b8973e1aea6e8758a76714d94fa4a5699e8025fe6bf55710584b4fe7ab0f1e2b23b4929ef4c3ce3b55ff12f62626480c653fcb25b765c06faea5ff

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.7.5 (2023-02-11)
+
+- Updated ONNX Runtime to 1.14.0
+
+## 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/LICENSE.txt

@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) Microsoft Corporation
-Copyright (c) 2019-2022 Andrew Kane
+Copyright (c) 2019-2023 Andrew Kane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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.5"
 end