onnxruntime 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec7b632678142610395254db0a898c300e23169f822d352e718076959cac20d1
-  data.tar.gz: bdb36f003d7285fb95b8e962c168dd9d0a639811e118c67fd5d5c29179755d02
+  metadata.gz: 1a31036492f6ad4f0ab17a2534a69f17ca05058267447089868f2ac5bf2c5e79
+  data.tar.gz: 6cd8be229992a0ea4c9fdb8529a229e31a777321e0971f0123bc2680ca828be3
 SHA512:
-  metadata.gz: 98bc00958bdf3f38a1c33a118850a57edfffc06d7da82ef0d2aa305a625ac1d0aae57b2c5314f10868d04a41c7de8adc981de03f3c8367d1b05c6ad308d12d79
-  data.tar.gz: 948dec286c981fcd623e3252ef51ccf6b33a275c7019896a68869895643741d5c6f4bb534b505687acc3f717f5da5962f484c24f9ec2938821f003aa2d0e4174
+  metadata.gz: 9bb61d56c9c4ddb17e0e085381226ab0c91e72de592deb6519bf6840ffb1a00eaa0fb9382eb0cba1d563165fb9d0528034da1f2ea9b6b3cb76b780813750ad21
+  data.tar.gz: b94b0b2772728ead241a0d16c3ca2db099cbf7ab6f3994384e3107f69d9aa2cdaa31ed4ba08bd4d3d9fae2eef0b13ea84aa70823be0ff2d24b921e8fb390246b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.3.0 (2020-03-11)
+
+- Updated ONNX Runtime to 1.2.0
+- Added model metadata
+- Added `end_profiling` method
+- Added support for loading from IO objects
+- Improved `input` and `output` for `seq` and `map` types
+
 ## 0.2.3 (2020-01-23)
 
 - Updated ONNX Runtime to 1.1.1

data/README.md

@@ -37,10 +37,16 @@ Get outputs
 model.outputs
 ```
 
+Get metadata
+
+```ruby
+model.metadata
+```
+
 Load a model from a string
 
 ```ruby
-byte_str = File.binread("model.onnx")
+byte_str = StringIO.new("...")
 model = OnnxRuntime::Model.new(byte_str)
 ```
 

data/lib/onnxruntime/ffi.rb

@@ -119,7 +119,24 @@ module OnnxRuntime
         :ReleaseTypeInfo, callback(%i[pointer], :void),
         :ReleaseTensorTypeAndShapeInfo, callback(%i[pointer], :void),
         :ReleaseSessionOptions, callback(%i[pointer], :void),
-        :ReleaseCustomOpDomain, callback(%i[pointer], :void)
+        :ReleaseCustomOpDomain, callback(%i[pointer], :void),
+        :GetDenotationFromTypeInfo, callback(%i[], :pointer),
+        :CastTypeInfoToMapTypeInfo, callback(%i[pointer pointer], :pointer),
+        :CastTypeInfoToSequenceTypeInfo, callback(%i[pointer pointer], :pointer),
+        :GetMapKeyType, callback(%i[pointer pointer], :pointer),
+        :GetMapValueType, callback(%i[pointer pointer], :pointer),
+        :GetSequenceElementType, callback(%i[pointer pointer], :pointer),
+        :ReleaseMapTypeInfo, callback(%i[pointer], :void),
+        :ReleaseSequenceTypeInfo, callback(%i[pointer], :void),
+        :SessionEndProfiling, callback(%i[pointer pointer pointer], :pointer),
+        :SessionGetModelMetadata, callback(%i[pointer pointer], :pointer),
+        :ModelMetadataGetProducerName, callback(%i[pointer pointer pointer], :pointer),
+        :ModelMetadataGetGraphName, callback(%i[pointer pointer pointer], :pointer),
+        :ModelMetadataGetDomain, callback(%i[pointer pointer pointer], :pointer),
+        :ModelMetadataGetDescription, callback(%i[pointer pointer pointer], :pointer),
+        :ModelMetadataLookupCustomMetadataMap, callback(%i[pointer pointer pointer pointer], :pointer),
+        :ModelMetadataGetVersion, callback(%i[pointer pointer], :pointer),
+        :ReleaseModelMetadata, callback(%i[pointer], :void)
     end
 
     class ApiBase < ::FFI::Struct

data/lib/onnxruntime/inference_session.rb

@@ -31,14 +31,22 @@ module OnnxRuntime
 
       # session
       @session = ::FFI::MemoryPointer.new(:pointer)
-      path_or_bytes = path_or_bytes.to_str
+      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
 
       # fix for Windows "File doesn't exist"
-      if Gem.win_platform? && path_or_bytes.encoding != Encoding::BINARY
+      if Gem.win_platform? && !from_memory
         path_or_bytes = File.binread(path_or_bytes)
+        from_memory = true
       end
 
-      if path_or_bytes.encoding == Encoding::BINARY
+      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, path_or_bytes, session_options.read_pointer, @session)
@@ -100,6 +108,40 @@ module OnnxRuntime
       end
     end
 
+    def modelmeta
+      description = ::FFI::MemoryPointer.new(:string)
+      domain = ::FFI::MemoryPointer.new(:string)
+      graph_name = ::FFI::MemoryPointer.new(:string)
+      producer_name = ::FFI::MemoryPointer.new(:string)
+      version = ::FFI::MemoryPointer.new(:int64_t)
+
+      metadata = ::FFI::MemoryPointer.new(:pointer)
+      check_status api[:SessionGetModelMetadata].call(read_pointer, metadata)
+      check_status api[:ModelMetadataGetDescription].call(metadata.read_pointer, @allocator.read_pointer, description)
+      check_status api[:ModelMetadataGetDomain].call(metadata.read_pointer, @allocator.read_pointer, domain)
+      check_status api[:ModelMetadataGetGraphName].call(metadata.read_pointer, @allocator.read_pointer, graph_name)
+      check_status api[:ModelMetadataGetProducerName].call(metadata.read_pointer, @allocator.read_pointer, producer_name)
+      check_status api[:ModelMetadataGetVersion].call(metadata.read_pointer, version)
+      api[:ReleaseModelMetadata].call(metadata.read_pointer)
+
+      # TODO add custom_metadata_map
+      # need a way to get keys
+
+      {
+        description: description.read_pointer.read_string,
+        domain: domain.read_pointer.read_string,
+        graph_name: graph_name.read_pointer.read_string,
+        producer_name: producer_name.read_pointer.read_string,
+        version: version.read(:int64_t)
+      }
+    end
+
+    def end_profiling
+      out = ::FFI::MemoryPointer.new(:string)
+      check_status api[:SessionEndProfiling].call(read_pointer, @allocator.read_pointer, out)
+      out.read_pointer.read_string
+    end
+
     private
 
     def create_input_tensor(input_feed)
@@ -261,15 +303,32 @@ module OnnxRuntime
           shape: shape
         }
       when :sequence
-        # TODO show nested
+        sequence_type_info = ::FFI::MemoryPointer.new(:pointer)
+        check_status api[:CastTypeInfoToSequenceTypeInfo].call(typeinfo.read_pointer, sequence_type_info)
+        nested_type_info = ::FFI::MemoryPointer.new(:pointer)
+        check_status api[:GetSequenceElementType].call(sequence_type_info.read_pointer, nested_type_info)
+        v = node_info(nested_type_info)[:type]
+
         {
-          type: "seq",
+          type: "seq(#{v})",
           shape: []
         }
       when :map
-        # TODO show nested
+        map_type_info = ::FFI::MemoryPointer.new(:pointer)
+        check_status api[:CastTypeInfoToMapTypeInfo].call(typeinfo.read_pointer, map_type_info)
+
+        # key
+        key_type = ::FFI::MemoryPointer.new(:int)
+        check_status api[:GetMapKeyType].call(map_type_info.read_pointer, key_type)
+        k = FFI::TensorElementDataType[key_type.read_int]
+
+        # value
+        value_type_info = ::FFI::MemoryPointer.new(:pointer)
+        check_status api[:GetMapValueType].call(map_type_info.read_pointer, value_type_info)
+        v = node_info(value_type_info)[:type]
+
         {
-          type: "map",
+          type: "map(#{k},#{v})",
           shape: []
         }
       else

data/lib/onnxruntime/model.rb

@@ -22,5 +22,9 @@ module OnnxRuntime
     def outputs
       @session.outputs
     end
+
+    def metadata
+      @session.modelmeta
+    end
   end
 end

data/lib/onnxruntime/version.rb

@@ -1,3 +1,3 @@
 module OnnxRuntime
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onnxruntime
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi