tomoto 0.6.1-x86_64-linux → 0.6.2-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b680ef4cc26d8777f8bd285ffcd2149c7f99c43250e7178bb7e34d5722d21be
-  data.tar.gz: 7b50a8486a9bb3b1725dd0b75122ec8c9ae350baf496300b2d507199d1a0ff2d
+  metadata.gz: 961deef7a8d1d338dc292a00e3a038d8fe78ca0366e3ca6a02852ffa56dd55b6
+  data.tar.gz: d89063de9b6295faf286bab77d0cc2985e6db9790b621cf978670fc26ee81485
 SHA512:
-  metadata.gz: b7e0b43889c43db1310b6c403f1c050268f3e7a7e9bc3115b9689f1635a2e1f3495bc700aab3c7d4fbae80f6d03f650ef035a0278c71f34827404a699031bb94
-  data.tar.gz: f75a0fab4ee72bed17aa8a8e1ab6458cf9e047068b2303f226c9e0cab7ccfafde18aa0db04eb2e0ae38c7ef836fe90c022271f706c01c8fe108cc87ee5e2fa1c
+  metadata.gz: f5e6811100a82d51880afe9de5fbe38e8d8b1b92a7d93a7f575c38e19c665e6503b0bca0cbbd2228b0ce209867cc9084bf05ae6683d231bb516be4276c5fac8a
+  data.tar.gz: 2a46c0a219c7af171eb3526e178652bedd834c47b3804df05eabda82db0e69617645d4289896c9bfe9f77bc5a31e29a1c01f4653fad5fb168c86e41df9b8e55a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.2 (2026-02-21)
+
+- Updated tomoto to 0.14.0
+- Fixed memory leak with `make_doc` method
+
 ## 0.6.1 (2026-01-01)
 
 - Added support for Ruby 4.0

data/ext/tomoto/ct.cpp

@@ -16,7 +16,7 @@ void init_ct(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::ICTModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::ICTModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "_correlations",

data/ext/tomoto/dmr.cpp

@@ -22,7 +22,7 @@ void init_dmr(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::IDMRModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::IDMRModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "_add_doc",

data/ext/tomoto/dt.cpp

@@ -27,7 +27,7 @@ void init_dt(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::IDTModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::IDTModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "_add_doc",

data/ext/tomoto/extconf.rb

@@ -19,25 +19,21 @@ end
 apple_clang = RbConfig::CONFIG["CC_VERSION_MESSAGE"] =~ /apple clang/i
 
 if apple_clang
-  # silence rice warnings
-  $CXXFLAGS += " -Wno-deprecated-declarations"
+  # silence tomoto warnings
+  $CXXFLAGS += " -Wno-switch -Wno-unqualified-std-cast-call -Wno-inconsistent-missing-override"
 else
   # silence eigen warnings
-  $CXXFLAGS += " -Wno-ignored-attributes -Wno-deprecated-copy"
+  $CXXFLAGS += " -Wno-ignored-attributes"
 end
 
-# silence tomoto warnings
-$CXXFLAGS += " -Wno-unused-variable -Wno-switch -Wno-unqualified-std-cast-call"
-
 ext = File.expand_path(".", __dir__)
 tomoto = File.expand_path("../../vendor/tomotopy/src/TopicModel", __dir__)
 tomoto_utils = File.expand_path("../../vendor/tomotopy/src/Utils", __dir__)
 eigen = File.expand_path("../../vendor/eigen", __dir__)
 eigen_rand = File.expand_path("../../vendor/EigenRand", __dir__)
-variant = File.expand_path("../../vendor/variant/include", __dir__)
 
 $srcs = Dir["{#{ext},#{tomoto},#{tomoto_utils}}/*.cpp"]
-$INCFLAGS += " -I#{tomoto} -I#{eigen} -I#{eigen_rand} -I#{variant}"
+$INCFLAGS += " -I#{tomoto} -I#{eigen} -I#{eigen_rand}"
 $VPATH << tomoto
 $VPATH << tomoto_utils
 

data/ext/tomoto/gdmr.cpp

@@ -24,7 +24,7 @@ void init_gdmr(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::IGDMRModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::IGDMRModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "_add_doc",

data/ext/tomoto/hdp.cpp

@@ -17,7 +17,7 @@ void init_hdp(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::IHDPModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::IHDPModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "alpha",

data/ext/tomoto/hlda.cpp

@@ -17,7 +17,7 @@ void init_hlda(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::IHLDAModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::IHLDAModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "alpha",

data/ext/tomoto/hpa.cpp

@@ -17,7 +17,7 @@ void init_hpa(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::IHPAModel::create((tomoto::TermWeight)tw, false, args);
+        return tomoto::IHPAModel::create((tomoto::TermWeight)tw, false, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "alpha",

data/ext/tomoto/lda.cpp

@@ -12,10 +12,36 @@
 
 class DocumentObject {
 public:
-  DocumentObject(const tomoto::DocumentBase* _doc, const tomoto::ITopicModel* _tm) : doc{ _doc }, tm{ _tm } {}
+  DocumentObject(const tomoto::DocumentBase* _doc, const tomoto::ITopicModel* _tm, bool _owner = false) : doc{ _doc }, tm{ _tm }, owner{ _owner } {}
+
+  ~DocumentObject() {
+    if (owner && doc) {
+      delete doc;
+      doc = NULL;
+    }
+  }
+
+  // prevent copy
+  DocumentObject(const DocumentObject&) = delete;
+  DocumentObject& operator=(const DocumentObject&) = delete;
+
+  DocumentObject(DocumentObject&& other) noexcept {
+    *this = std::move(other);
+  }
+
+  DocumentObject& operator=(DocumentObject&& other) noexcept {
+    if (this != &other) {
+      doc = other.doc;
+      tm = other.tm;
+      owner = other.owner;
+      other.owner = false;
+    }
+    return *this;
+  }
 
   const tomoto::DocumentBase* doc;
   const tomoto::ITopicModel* tm;
+  bool owner;
 };
 
 void init_lda(Rice::Module& m) {
@@ -42,7 +68,7 @@ void init_lda(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::ILDAModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::ILDAModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "_add_doc",
@@ -52,7 +78,7 @@ void init_lda(Rice::Module& m) {
     .define_method(
       "_make_doc",
       [](tomoto::ILDAModel& self, std::vector<std::string> words) {
-        return DocumentObject(self.makeDoc(buildDoc(words)).release(), &self);
+        return DocumentObject(self.makeDoc(buildDoc(words)).release(), &self, true);
       })
     .define_method(
       "_infer",

data/ext/tomoto/llda.cpp

@@ -20,7 +20,7 @@ void init_llda(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::ILLDAModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::ILLDAModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "_add_doc",

data/ext/tomoto/mglda.cpp

@@ -23,7 +23,7 @@ void init_mglda(Rice::Module& m) {
         args.alphaML = alpha_ml;
         args.eta = eta_g;
         // TODO more args
-        return tomoto::IMGLDAModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::IMGLDAModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "_add_doc",

data/ext/tomoto/pa.cpp

@@ -17,7 +17,7 @@ void init_pa(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::IPAModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::IPAModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "k1",

data/ext/tomoto/plda.cpp

@@ -20,7 +20,7 @@ void init_plda(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::IPLDAModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::IPLDAModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "_add_doc",

data/ext/tomoto/slda.cpp

@@ -29,7 +29,7 @@ void init_slda(Rice::Module& m) {
         if (seed >= 0) {
           args.seed = seed;
         }
-        return tomoto::ISLDAModel::create((tomoto::TermWeight)tw, args);
+        return tomoto::ISLDAModel::create((tomoto::TermWeight)tw, args).release();
       }, Rice::Return().takeOwnership())
     .define_method(
       "_add_doc",

data/lib/tomoto/lda.rb

@@ -11,6 +11,7 @@ module Tomoto
     def self.load(filename)
       model = new
       model._load(filename)
+      model.instance_variable_set(:@prepared, true)
       model
     end
 

data/lib/tomoto/version.rb

@@ -1,3 +1,3 @@
 module Tomoto
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/vendor/EigenRand/EigenRand/EigenRand

@@ -2,10 +2,10 @@
  * @file EigenRand
  * @author bab2min (bab2min@gmail.com)
  * @brief 
- * @version 0.4.1
- * @date 2022-08-13
- * 
- * @copyright Copyright (c) 2020-2021
+ * @version 0.5.1
+ * @date 2024-09-08
+ *
+ * @copyright Copyright (c) 2020-2024
  * 
  */