tomoto 0.3.1-x86_64-darwin → 0.3.3-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3491de664af833b4524812895f15b9939976eb5014dd4812e70f2a497a666d67
-  data.tar.gz: 65b39aa5e4ff68d68a6f0d11dc3caf62b4d709d29f1f1fb24a4bb4219f3151b5
+  metadata.gz: b79fb57f7e14e6b483109a2ee2b9905b3ad30c5dc026477494d42238f6c3719d
+  data.tar.gz: 22f74746b73ad822f1fdd1cf8cabdcc28b995d1d3f18097c90ca2894dadb38f2
 SHA512:
-  metadata.gz: 2cf24cb5bca2263a28044e8fb6298cd39192f28ff7fdfe085470a45b17ebebbf69c75a12bd1d9c61766998a407bf128838419a73c7646ba4218bd6626ce192bf
-  data.tar.gz: 6cae693808f346e69f2a7817803b1fe2c2c94af936f8b8929e86f2518976949b401dec159d3ab035c4d6aedec44734521a8763a9dcb7acd83dba696888389612
+  metadata.gz: acbd74efa07f328b5326944bd836bbb55c310a9d4877f645785072bb08aaabf52453b18c2371f70573acb5806f491659460fdb7881d5733bb576b2694727275f
+  data.tar.gz: cd255e7ce35ef651c1cada54406631b9ddf71d7ee29af66a223bb12053b237e1619e294f2c6ff8a3481eac205a37e1d1e60c0b9d30cd2280c39b6f2c6c32f2ee

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.3.3 (2023-02-01)
+
+- Added `topic_label_dict` method to `LLDA`
+- Fixed error with `infer` with loaded model
+
+## 0.3.2 (2023-01-22)
+
+- Added precompiled gem for Mac ARM
+- Updated tomoto to 0.12.4
+
 ## 0.3.1 (2023-01-12)
 
 - Added support for Ruby 3.2

data/LICENSE.txt

@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) 2019, bab2min
-Copyright (c) 2020-2021 Andrew Kane
+Copyright (c) 2020-2023 Andrew Kane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -12,17 +12,15 @@ Add this line to your application’s Gemfile:
 gem "tomoto"
 ```
 
-ARM is not currently supported
-
 ## Getting Started
 
 Train a model
 
 ```ruby
 model = Tomoto::LDA.new(k: 2)
-model.add_doc("text from document one")
-model.add_doc("text from document two")
-model.add_doc("text from document three")
+model.add_doc(["tokens", "from", "document", "one"])
+model.add_doc(["tokens", "from", "document", "two"])
+model.add_doc(["tokens", "from", "document", "three"])
 model.train(100) # iterations
 ```
 
@@ -78,7 +76,7 @@ model.ll_per_word
 Perform inference for unseen documents
 
 ```ruby
-doc = model.make_doc("unseen doc")
+doc = model.make_doc(["unseen", "doc"])
 topic_dist, ll = model.infer(doc)
 ```
 
@@ -114,14 +112,6 @@ If a method or option you need isn’t supported, feel free to open an issue.
 - [LDA](examples/lda_basic.rb)
 - [HDP](examples/hdp_basic.rb)
 
-## Tokenization
-
-Documents are tokenized by whitespace by default, or you can perform your own tokenization.
-
-```ruby
-model.add_doc(["tokens", "from", "document", "one"])
-```
-
 ## Performance
 
 tomoto uses AVX2, AVX, or SSE2 instructions to increase performance on machines that support it. Check which instruction set architecture it’s using with:

data/ext/tomoto/extconf.rb

@@ -3,12 +3,17 @@ require "mkmf-rice"
 $CXXFLAGS += " -std=c++17 $(optflags) -DEIGEN_MPL2_ONLY"
 
 unless ENV["RUBY_CC_VERSION"]
-  # ARM not supported yet
-  # https://github.com/bab2min/tomotopy/issues/170
-
-  # AVX-512F not supported yet
-  # https://github.com/bab2min/tomotopy/issues/188
-  $CXXFLAGS << " " << with_config("optflags", "-march=native -mno-avx512f")
+  default_optflags =
+    if RbConfig::CONFIG["host_os"] =~ /darwin/i && RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
+      # -march=native not supported with Mac ARM
+      ""
+    else
+      # AVX-512F not supported yet
+      # https://github.com/bab2min/tomotopy/issues/188
+      "-march=native -mno-avx512f"
+    end
+
+  $CXXFLAGS << " " << with_config("optflags", default_optflags)
 end
 
 apple_clang = RbConfig::CONFIG["CC_VERSION_MESSAGE"] =~ /apple clang/i

data/ext/tomoto/llda.cpp

@@ -29,5 +29,18 @@ void init_llda(Rice::Module& m) {
       "topics_per_label",
       [](tomoto::ILLDAModel& self) {
         return self.getNumTopicsPerLabel();
+      })
+    .define_method(
+      "topic_label_dict",
+      [](tomoto::ILLDAModel& self) {
+        auto dict = self.getTopicLabelDict();
+        Array res;
+        auto utf8 = Rice::Class(rb_cEncoding).call("const_get", "UTF_8");
+        for (size_t i = 0; i < dict.size(); i++) {
+          VALUE value = Rice::detail::To_Ruby<std::string>().convert(dict.toWord(i));
+          Object obj(value);
+          res.push(obj.call("force_encoding", utf8));
+        }
+        return res;
       });
 }

data/lib/tomoto/lda.rb

@@ -24,7 +24,7 @@ module Tomoto
 
     # TODO support multiple docs
     def infer(doc, iter: 100, tolerance: -1, workers: 0, parallel: :default, together: 0)
-      raise "cannot infer with untrained model" unless defined?(@prepared)
+      raise "cannot infer with untrained model" unless trained?
       _infer(doc, iter, tolerance, workers, to_ps(parallel), together)
     end
 
@@ -86,6 +86,7 @@ module Tomoto
       end
     end
 
+    # TODO raise error if iterations < 1
     def train(iterations = 10, workers: 0, parallel: :default)
       prepare
       _train(iterations, workers, to_ps(parallel))
@@ -97,6 +98,10 @@ module Tomoto
 
     private
 
+    def trained?
+      global_step.positive?
+    end
+
     def prepare
       unless defined?(@prepared)
         _prepare(@min_cf, @min_df, @rm_top)

data/lib/tomoto/version.rb

@@ -1,3 +1,3 @@
 module Tomoto
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/vendor/EigenRand/EigenRand/EigenRand

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

data/vendor/EigenRand/README.md

@@ -385,6 +385,10 @@ MIT License
 
 ## History
 
+### 0.4.1 (2022-08-13)
+* Fixed a bug where double-type generation with std::mt19937 fails compilation.
+* Fixed a bug where `UniformIntGen` in scalar mode generates numbers in the wrong range.
+
 ### 0.4.0 alpha (2021-09-28)
 * Now EigenRand supports ARM & ARM64 NEON architecture experimentally. Please report issues about ARM & ARM64 NEON.
 * Now EigenRand has compatibility to `Eigen 3.4.0`.

data/vendor/tomotopy/README.kr.rst

@@ -305,6 +305,13 @@ tomotopy의 Python3 예제 코드는 https://github.com/bab2min/tomotopy/blob/ma
 
 역사
 -------
+* 0.12.4 (2023-01-22)
+    * New features
+        * macOS ARM64 아키텍처에 대한 지원을 추가했습니다.
+    * Bug fixes
+        * `tomotopy.Document.get_sub_topic_dist()`가 bad argument 예외를 발생시키는 문제를 해결했습니다.
+        * 예외 발생이 종종 크래시를 발생시키는 문제를 해결했습니다.
+
 * 0.12.3 (2022-07-19)
     * 기능 개선
         * 이제 `tomotopy.LDAModel.add_doc()`로 빈 문서를 삽입할 경우 예외를 발생시키는 대신 그냥 무시합니다. 새로 추가된 인자인 `ignore_empty_words`를 False로 설정할 경우 이전처럼 예외를 발생시킵니다.

data/vendor/tomotopy/README.rst

@@ -309,6 +309,13 @@ meaning you can use it for any reasonable purpose and remain in complete ownersh
 
 History
 -------
+* 0.12.4 (2023-01-22)
+    * New features
+        * Added support for macOS ARM64 architecture.
+    * Bug fixes
+        * Fixed an issue where `tomotopy.Document.get_sub_topic_dist()` raises a bad argument exception.
+        * Fixed an issue where exception raising sometimes causes crashes.
+
 * 0.12.3 (2022-07-19)
     * New features
         * Now, inserting an empty document using `tomotopy.LDAModel.add_doc()` just ignores it instead of raising an exception. If the newly added argument `ignore_empty_words` is set to False, an exception is raised as before.
@@ -514,3 +521,18 @@ Bundled Libraries and Their License
 
 * Mapbox Variant: `BSD License
   <licenses_bundled/MapboxVariant>`_
+
+Citation
+---------
+::
+
+    @software{minchul_lee_2022_6868418,
+      author       = {Minchul Lee},
+      title        = {bab2min/tomotopy: 0.12.3},
+      month        = jul,
+      year         = 2022,
+      publisher    = {Zenodo},
+      version      = {v0.12.3},
+      doi          = {10.5281/zenodo.6868418},
+      url          = {https://doi.org/10.5281/zenodo.6868418}
+    }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomoto
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: x86_64-darwin
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: andrew@ankane.org