faiss 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67b63e8dcaa5dcd8c8d08f823c3e1e063906b4a20ad70b28c2fd396e8cccdf48
-  data.tar.gz: 7e9fddc693db40a58c71b5a5ca6b89638b5cc1db708b30ea32a897519d48b970
+  metadata.gz: f3306dbb81c9168dcd82435c99d3404ab8501ac9b948adb2db7238ab89c01003
+  data.tar.gz: b14a120e9cc67baba96816b52cf34388aae79fa690fc511918543921b64380d5
 SHA512:
-  metadata.gz: 10b9b0efa35ab53fefd3cea964339c856b67af1f7c773f421952f247d16fbd50d76b29cf59eec9e3b77b1a091e96fccb58c1f24afde7d233f298f06ecc90b3b3
-  data.tar.gz: 70037e0611a6f6adddf30f95710b0e1f1c17ffadfe561c3010db8e66265692da17b49a07756ee946d70eed6602ddfbd2107248c01be353d58d3544b6bbc2b15e
+  metadata.gz: b7af3f6540d283d886301137e5fed5dff32b0c0659e9c46d6c45808439e94a0a91f8c953d5897b480568169ec23cacc4224db523d6ab9b3737d7f0df1ce8190c
+  data.tar.gz: fbe44473d9e3c61427aee597fed40264ba83a8184c0fe5280b6bf181d9bcc396583f033a69e8d3ec643ee0d41ef435dfeef4aa4441ade67703cbd8259326cb81

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.5.0 (2025-11-12)
+
+- Updated Faiss to 1.13.0
+- Added support for releasing GVL
+
+## 0.4.3 (2025-10-26)
+
+- Fixed error with Rice 4.7
+
 ## 0.4.2 (2025-08-13)
 
 - Updated Faiss to 1.12.0

data/ext/faiss/index.cpp

@@ -29,7 +29,7 @@ namespace Rice::detail {
   public:
     From_Ruby() = default;
 
-    From_Ruby(Arg* arg) : arg_(arg) {}
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
 
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
@@ -49,7 +49,7 @@ namespace Rice::detail {
     }
 
   private:
-    Arg* arg_;
+    Arg* arg_ = nullptr;
   };
 
   template<>
@@ -60,6 +60,10 @@ namespace Rice::detail {
   template<>
   class From_Ruby<faiss::ScalarQuantizer::QuantizerType> {
   public:
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
     faiss::ScalarQuantizer::QuantizerType convert(VALUE x) {
@@ -82,6 +86,9 @@ namespace Rice::detail {
         throw Rice::Exception(rb_eArgError, "Invalid quantizer type: %s", s.c_str());
       }
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 } // namespace Rice::detail
 
@@ -104,19 +111,28 @@ void init_index(Rice::Module& m) {
       })
     .define_method(
       "train",
-      [](faiss::Index &self, numo::SFloat objects) {
+      [](Rice::Object rb_self, numo::SFloat objects) {
+        rb_check_frozen(rb_self.value());
+
+        auto &self = *Rice::Data_Object<faiss::Index>{rb_self};
         auto n = check_shape(objects, self.d);
         self.train(n, objects.read_ptr());
       })
     .define_method(
       "add",
-      [](faiss::Index &self, numo::SFloat objects) {
+      [](Rice::Object rb_self, numo::SFloat objects) {
+        rb_check_frozen(rb_self.value());
+
+        auto &self = *Rice::Data_Object<faiss::Index>{rb_self};
         auto n = check_shape(objects, self.d);
         self.add(n, objects.read_ptr());
       })
     .define_method(
       "add_with_ids",
-      [](faiss::Index &self, numo::SFloat objects, numo::Int64 ids) {
+      [](Rice::Object rb_self, numo::SFloat objects, numo::Int64 ids) {
+        rb_check_frozen(rb_self.value());
+
+        auto &self = *Rice::Data_Object<faiss::Index>{rb_self};
         auto n = check_shape(objects, self.d);
         if (ids.ndim() != 1 || ids.shape()[0] != n) {
           throw Rice::Exception(rb_eArgError, "expected ids to be 1d array with size %d", n);
@@ -125,22 +141,32 @@ void init_index(Rice::Module& m) {
       })
     .define_method(
       "search",
-      [](faiss::Index &self, numo::SFloat objects, size_t k) {
+      [](Rice::Object rb_self, numo::SFloat objects, size_t k) {
+        auto &self = *Rice::Data_Object<faiss::Index>{rb_self};
         auto n = check_shape(objects, self.d);
 
         auto distances = numo::SFloat({n, k});
         auto labels = numo::Int64({n, k});
 
-        self.search(n, objects.read_ptr(), k, distances.write_ptr(), labels.write_ptr());
+        if (rb_self.is_frozen()) {
+          Rice::detail::no_gvl([&] {
+            self.search(n, objects.read_ptr(), k, distances.write_ptr(), labels.write_ptr());
+          });
+        } else {
+          self.search(n, objects.read_ptr(), k, distances.write_ptr(), labels.write_ptr());
+        }
 
         Rice::Array ret;
-        ret.push(distances);
-        ret.push(labels);
+        ret.push(std::move(distances), false);
+        ret.push(std::move(labels), false);
         return ret;
       })
     .define_method(
       "nprobe=",
-      [](faiss::Index &self, double val) {
+      [](Rice::Object rb_self, double val) {
+        rb_check_frozen(rb_self.value());
+
+        auto &self = *Rice::Data_Object<faiss::Index>{rb_self};
         faiss::ParameterSpace().set_index_parameter(&self, "nprobe", val);
       })
     .define_method(

data/ext/faiss/index_binary.cpp

@@ -27,29 +27,42 @@ void init_index_binary(Rice::Module& m) {
       })
     .define_method(
       "train",
-      [](faiss::IndexBinary &self, numo::UInt8 objects) {
+      [](Rice::Object rb_self, numo::UInt8 objects) {
+        rb_check_frozen(rb_self.value());
+
+        auto &self = *Rice::Data_Object<faiss::IndexBinary>{rb_self};
         auto n = check_shape(objects, self.d / 8);
         self.train(n, objects.read_ptr());
       })
     .define_method(
       "add",
-      [](faiss::IndexBinary &self, numo::UInt8 objects) {
+      [](Rice::Object rb_self, numo::UInt8 objects) {
+        rb_check_frozen(rb_self.value());
+
+        auto &self = *Rice::Data_Object<faiss::IndexBinary>{rb_self};
         auto n = check_shape(objects, self.d / 8);
         self.add(n, objects.read_ptr());
       })
     .define_method(
       "search",
-      [](faiss::IndexBinary &self, numo::UInt8 objects, size_t k) {
+      [](Rice::Object rb_self, numo::UInt8 objects, size_t k) {
+        auto &self = *Rice::Data_Object<faiss::IndexBinary>{rb_self};
         auto n = check_shape(objects, self.d / 8);
 
         auto distances = numo::Int32({n, k});
         auto labels = numo::Int64({n, k});
 
-        self.search(n, objects.read_ptr(), k, distances.write_ptr(), labels.write_ptr());
+        if (rb_self.is_frozen()) {
+          Rice::detail::no_gvl([&] {
+            self.search(n, objects.read_ptr(), k, distances.write_ptr(), labels.write_ptr());
+          });
+        } else {
+          self.search(n, objects.read_ptr(), k, distances.write_ptr(), labels.write_ptr());
+        }
 
         Rice::Array ret;
-        ret.push(distances);
-        ret.push(labels);
+        ret.push(std::move(distances), false);
+        ret.push(std::move(labels), false);
         return ret;
       })
     .define_method(

data/ext/faiss/kmeans.cpp

@@ -32,11 +32,11 @@ void init_kmeans(Rice::Module& m) {
       })
     .define_method(
       "train",
-      [](Rice::Object self, numo::SFloat objects) {
-        auto self_ptr = Rice::detail::From_Ruby<faiss::Clustering*>().convert(self.value());
-        auto n = check_shape(objects, self_ptr->d);
-        auto index = faiss::IndexFlatL2(self_ptr->d);
-        self.iv_set("@index", Rice::Object(Rice::detail::To_Ruby<faiss::IndexFlatL2>().convert(index)));
-        self_ptr->train(n, objects.read_ptr(), index);
+      [](Rice::Object rb_self, numo::SFloat objects) {
+        auto &self = *Rice::Data_Object<faiss::Clustering>{rb_self};
+        auto n = check_shape(objects, self.d);
+        auto index = faiss::IndexFlatL2(self.d);
+        rb_self.iv_set("@index", index);
+        self.train(n, objects.read_ptr(), index);
       });
 }