ngt 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 056e77fc31169b9c0402c1460eebe72aa3a40ec105d3b7974dcef2b5846c6ed5
-  data.tar.gz: cf99943c13969f7529a6b4371d38f139479bb24015a68382a091bb7446d25a1f
+  metadata.gz: 94ae9612ba58d3e5aa3fecdea4ccb93e6ecaa8086c7b5e5e64a626962a3c7dbf
+  data.tar.gz: 6bf8e3fc92f83994e47caf230027199a2da2c0464b5cce0cdaf0f861ce2b05e2
 SHA512:
-  metadata.gz: d5a0a3760d14a415e1c16adec206063fd60f3bc0957ccf470e3b588bae4f331d9f9ab7ab80da117e44e25ae6a384d8873228856582f8da6804cce8b72c696188
-  data.tar.gz: 0e78ecd9a477c76a2f77c3ae2242a6886e02daf6ce8c6af99b9e1a50745a38b4f51a91472a936611b383db3f1e176798d4472393250c4d2cd334d8692ddd58ff
+  metadata.gz: 8580f88ad7c6fa1527445aeeba274e67bcf76612cf3aa2c100afe53ca62628df59237119d1878b3244517bd8c01a75cfc5015176c2baf9e2d6eb9617876d4fd1
+  data.tar.gz: 92e66568528c8cc76fe38efdb2795106bea0e50ca1263bf659ef52e26b4f4c36e192e5180a304acd186c746f3b02a3cf2488c2e95c786d024174b8411e5f8fba

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.1 (2022-12-08)
+
+- Added support for `:float16` object type
+- Fixed error with `object` method
+
 ## 0.4.0 (2022-06-14)
 
 - Updated NGT to 1.14.6

data/lib/ngt/ffi.rb

@@ -36,8 +36,10 @@ module Ngt
     attach_function :ngt_set_property_edge_size_for_creation, %i[pointer int16_t pointer], :bool
     attach_function :ngt_set_property_edge_size_for_search, %i[pointer int16_t pointer], :bool
     attach_function :ngt_is_property_object_type_float, %i[int32_t], :bool
+    attach_function :ngt_is_property_object_type_float16, %i[int32_t], :bool
     attach_function :ngt_get_property_object_type, %i[pointer pointer], :int32_t
     attach_function :ngt_set_property_object_type_float, %i[pointer pointer], :bool
+    attach_function :ngt_set_property_object_type_float16, %i[pointer pointer], :bool
     attach_function :ngt_set_property_object_type_integer, %i[pointer pointer], :bool
     attach_function :ngt_set_property_distance_type_l1, %i[pointer pointer], :bool
     attach_function :ngt_set_property_distance_type_l2, %i[pointer pointer], :bool
@@ -67,6 +69,7 @@ module Ngt
     attach_function :ngt_get_property_distance_type, %i[pointer pointer], :distance_type
     attach_function :ngt_create_error_object, %i[], :pointer
     attach_function :ngt_get_error_string, %i[pointer], :string
+    attach_function :ngt_clear_error_string, %i[pointer], :void
     attach_function :ngt_destroy_error_object, %i[pointer], :void
     attach_function :ngt_create_optimizer, %i[bool pointer], :pointer
     attach_function :ngt_optimizer_adjust_search_coefficients, %i[pointer string pointer], :bool

data/lib/ngt/index.rb

@@ -34,22 +34,34 @@ module Ngt
     def object_type
       @object_type ||= begin
         object_type = ffi(:ngt_get_property_object_type, @property)
-        FFI.ngt_is_property_object_type_float(object_type) ? :float : :integer
+        if FFI.ngt_is_property_object_type_float(object_type)
+          :float
+        elsif FFI.ngt_is_property_object_type_float16(object_type)
+          :float16
+        else
+          :integer
+        end
       end
     end
 
     def insert(object)
-      ffi(:ngt_insert_index, @index, c_object(object.to_a), dimensions)
+      object = object.to_a
+      ffi(:ngt_insert_index, @index, c_object(object), object.size)
     end
 
     def batch_insert(objects, num_threads: 8)
       if narray?(objects)
+        check_dimensions(objects.shape[1])
+
         objects = objects.cast_to(Numo::SFloat) unless objects.is_a?(Numo::SFloat)
         count = objects.shape[0]
         obj = ::FFI::MemoryPointer.new(:char, objects.byte_size)
         obj.write_bytes(objects.to_binary)
       else
         objects = objects.to_a
+        objects.each do |object|
+          check_dimensions(object.size)
+        end
         count = objects.size
         flat_objects = objects.flatten
         obj = ::FFI::MemoryPointer.new(:float, flat_objects.size)
@@ -70,11 +82,13 @@ module Ngt
 
     def object(id)
       if object_type == :float
-        res = ffi(:ngt_get_object_as_float, @object_space, id)
+        res = ffi(:ngt_get_object_as_float, object_space, id)
         res.read_array_of_float(dimensions)
-      else
-        res = ffi(:ngt_get_object_as_integer, @object_space, id)
+      elsif object_type == :integer
+        res = ffi(:ngt_get_object_as_integer, object_space, id)
         res.read_array_of_uint8(dimensions)
+      else
+        raise Error, "Method not supported for this object type"
       end
     end
 
@@ -85,7 +99,8 @@ module Ngt
     def search(query, size: 20, epsilon: 0.1, radius: nil)
       radius ||= -1.0
       results = ffi(:ngt_create_empty_results)
-      ffi(:ngt_search_index, @index, c_object(query.to_a), dimensions, size, epsilon, radius, results)
+      query = query.to_a
+      ffi(:ngt_search_index, @index, c_object(query), query.size, size, epsilon, radius, results)
       result_size = ffi(:ngt_get_result_size, results)
       ret = []
       result_size.times do |i|
@@ -125,6 +140,8 @@ module Ngt
         case object_type.to_s.downcase
         when "float"
           ffi(:ngt_set_property_object_type_float, property, error)
+        when "float16"
+          ffi(:ngt_set_property_object_type_float16, property, error)
         when "integer"
           ffi(:ngt_set_property_object_type_integer, property, error)
         else
@@ -196,9 +213,18 @@ module Ngt
     end
 
     def c_object(object)
+      check_dimensions(object.size)
       c_object = ::FFI::MemoryPointer.new(:double, object.size)
       c_object.write_array_of_double(object)
       c_object
     end
+
+    def check_dimensions(d)
+      raise ArgumentError, "Bad dimensions" if d != dimensions
+    end
+
+    def object_space
+      @object_space ||= ffi(:ngt_get_object_space, @index)
+    end
   end
 end

data/lib/ngt/utils.rb

@@ -4,7 +4,10 @@ module Ngt
     def self.ffi(method, *args)
       res = FFI.send(method, *args)
       message = FFI.ngt_get_error_string(args.last)
-      raise Error, message unless message.empty?
+      unless message.empty?
+        FFI.ngt_clear_error_string(args.last)
+        raise Error, message
+      end
       res
     end
 

data/lib/ngt/version.rb

@@ -1,3 +1,3 @@
 module Ngt
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ngt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi