ngt 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94ae9612ba58d3e5aa3fecdea4ccb93e6ecaa8086c7b5e5e64a626962a3c7dbf
-  data.tar.gz: 6bf8e3fc92f83994e47caf230027199a2da2c0464b5cce0cdaf0f861ce2b05e2
+  metadata.gz: 51b1abeb2e5e028a0481de31deef2b037d71ad718e3a498b9a98eff6dcb4162f
+  data.tar.gz: c1f81fac7b48002a1718a9259e2594ac5ff1bfb204cf56e3badb163d567e6df0
 SHA512:
-  metadata.gz: 8580f88ad7c6fa1527445aeeba274e67bcf76612cf3aa2c100afe53ca62628df59237119d1878b3244517bd8c01a75cfc5015176c2baf9e2d6eb9617876d4fd1
-  data.tar.gz: 92e66568528c8cc76fe38efdb2795106bea0e50ca1263bf659ef52e26b4f4c36e192e5180a304acd186c746f3b02a3cf2488c2e95c786d024174b8411e5f8fba
+  metadata.gz: 854abeff08d395907fe40042b123e95b8622733098ade14b9f9c47a8afd8e3856c78e40659521ee7853586ba6ab5208c37fd97bb7c7e028cb768f1c7b541335d
+  data.tar.gz: e0dd9ef7c8e2c298e8a07d98993a8b2ec0c651f960361b341ae3c49d613b10708e00e9256d454ef7a72bcc1ba03461233de1339447b744f3e4a16204f9910a15

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.5.0 (2024-10-23)
+
+- Updated NGT to 2.2.4
+- Dropped support for Ruby < 3.1
+
+## 0.4.2 (2023-07-24)
+
+- Fixed error with `dup` and `clone`
+
 ## 0.4.1 (2022-12-08)
 
 - Added support for `:float16` object type

data/README.md

@@ -2,7 +2,7 @@
 
 [NGT](https://github.com/yahoojapan/NGT) - high-speed approximate nearest neighbors - for Ruby
 
-[![Build Status](https://github.com/ankane/ngt-ruby/workflows/build/badge.svg?branch=master)](https://github.com/ankane/ngt-ruby/actions)
+[![Build Status](https://github.com/ankane/ngt-ruby/actions/workflows/build.yml/badge.svg)](https://github.com/ankane/ngt-ruby/actions)
 
 ## Installation
 

data/lib/ngt/ffi.rb

@@ -76,5 +76,14 @@ module Ngt
     attach_function :ngt_optimizer_execute, %i[pointer string string pointer], :bool
     attach_function :ngt_optimizer_set, %i[pointer int int int float float float float double double pointer], :bool
     attach_function :ngt_destroy_optimizer, %i[pointer], :void
+
+    def self.add_finalizer(pointer, method)
+      ObjectSpace.define_finalizer(pointer, finalize(pointer.to_i, method))
+    end
+
+    def self.finalize(addr, method)
+      # must use proc instead of stabby lambda
+      proc { FFI.send(method, ::FFI::Pointer.new(:pointer, addr)) }
+    end
   end
 end

data/lib/ngt/index.rb

@@ -9,10 +9,11 @@ module Ngt
       @path = path
 
       @error = FFI.ngt_create_error_object
+      FFI.add_finalizer(@error, :ngt_destroy_error_object)
+
       @property = ffi(:ngt_create_property)
+      FFI.add_finalizer(@property, :ngt_destroy_property)
       ffi(:ngt_get_property, @index, @property)
-
-      ObjectSpace.define_finalizer(self, self.class.finalize(@error, @index, @property))
     end
 
     def dimensions
@@ -177,6 +178,8 @@ module Ngt
           end
       end
 
+      FFI.add_finalizer(index, :ngt_close_index)
+
       super(index, path)
     ensure
       FFI.ngt_destroy_error_object(error) if error
@@ -197,15 +200,6 @@ module Ngt
       Utils.ffi(*args)
     end
 
-    def self.finalize(error, index, property)
-      # must use proc instead of stabby lambda
-      proc do
-        FFI.ngt_destroy_error_object(error)
-        FFI.ngt_close_index(index)
-        FFI.ngt_destroy_property(property)
-      end
-    end
-
     private
 
     def narray?(data)

data/lib/ngt/optimizer.rb

@@ -4,12 +4,13 @@ module Ngt
 
     def initialize(outgoing: 10, incoming: 120, queries: 100, low_accuracy_from: 0.3, low_accuracy_to: 0.5, high_accuracy_from: 0.8, high_accuracy_to: 0.9, gt_epsilon: 0.1, merge: 0.2)
       @error = FFI.ngt_create_error_object
+      FFI.add_finalizer(@error, :ngt_destroy_error_object)
+
       @optimizer = ffi(:ngt_create_optimizer, true)
+      FFI.add_finalizer(@optimizer, :ngt_destroy_optimizer)
 
       ffi(:ngt_optimizer_set, @optimizer, outgoing, incoming, queries, low_accuracy_from,
         low_accuracy_to, high_accuracy_from, high_accuracy_to, gt_epsilon, merge)
-
-      ObjectSpace.define_finalizer(self, self.class.finalize(@optimizer, @error))
     end
 
     def execute(in_index_path, out_index_path)
@@ -20,14 +21,6 @@ module Ngt
       ffi(:ngt_optimizer_adjust_search_coefficients, @optimizer, path(index_path))
     end
 
-    def self.finalize(optimizer, error)
-      # must use proc instead of stabby lambda
-      proc do
-        FFI.ngt_destroy_optimizer(optimizer)
-        FFI.ngt_destroy_error_object(error)
-      end
-    end
-
     private
 
     def path(obj)

data/lib/ngt/version.rb

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

data/lib/ngt.rb

@@ -5,10 +5,10 @@ require "ffi"
 require "tmpdir"
 
 # modules
-require "ngt/utils"
-require "ngt/index"
-require "ngt/optimizer"
-require "ngt/version"
+require_relative "ngt/utils"
+require_relative "ngt/index"
+require_relative "ngt/optimizer"
+require_relative "ngt/version"
 
 module Ngt
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ngt
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -64,14 +64,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: High-speed approximate nearest neighbors for Ruby