fasttext 0.2.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bb25234ba16e6af2a30087522d498984a933274d24719be58cd348f6f456c11
-  data.tar.gz: 2ec68073ce633dae21077be74264f686153abff5431d850c5cf87aa26304b299
+  metadata.gz: 2d8ffe46ec8c99cd82a51bae25a0459e80c0cae15cb659bdaf14bf2c2f7101db
+  data.tar.gz: 9dc3c29570f263f940b9d45e0bee85768f594283bb1b7fb1a50df2edf749cf62
 SHA512:
-  metadata.gz: '058233f6d6dcfc698b4e00f940d927962c28bef1aa51048ffdfb969accadcaf0616fbc3353c56c35e6609f1324c5d2ba469c4ba242b8a87daf60fd2b1fa7a35b'
-  data.tar.gz: e2bf6042ddc218398584b399acdde2ad89ece74e3009ac5348981e4ce958057233b10b5a5a504cb2e316c4a03fb4595fea524e3af0f30d787a1fb689885f6d5d
+  metadata.gz: 6cd42f0002111aa1a77531d514a35e7d9490e7be903a3b1051b0b4070b2da4daf8a6b28200abe4ff5c5cbc55abb4c914511c5a311e4070656d98587b660186d0
+  data.tar.gz: 8cbdf4eee1d98951222ab1e047c06d97edb0822d69b7260f7a97819b1cd3f043bc87b4dd9680907e94bd79d3ba420cddf324d46df9fe0d90e8e9a7e675e83b4d

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.2.4 (2022-01-16)
+
+- Improved ARM detection
+
+## 0.2.3 (2021-11-15)
+
+- Fixed installation error with ARM Mac
+
+## 0.2.2 (2021-10-16)
+
+- Fixed `file cannot be opened` errors
+
+## 0.2.1 (2021-05-23)
+
+- Improved performance
+
 ## 0.2.0 (2021-05-17)
 
 - Updated to Rice 4

data/LICENSE.txt

@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) 2016-present, Facebook, Inc.
-Copyright (c) 2019-2021 Andrew Kane
+Copyright (c) 2019-2022 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

@@ -1,8 +1,8 @@
-# fastText
+# fastText Ruby
 
 [fastText](https://fasttext.cc) - efficient text classification and representation learning - for Ruby
 
-[![Build Status](https://github.com/ankane/fastText/workflows/build/badge.svg?branch=master)](https://github.com/ankane/fastText/actions)
+[![Build Status](https://github.com/ankane/fastText-ruby/workflows/build/badge.svg?branch=master)](https://github.com/ankane/fastText-ruby/actions)
 
 ## Installation
 
@@ -256,22 +256,22 @@ model.predict("bon appétit")
 
 ## History
 
-View the [changelog](https://github.com/ankane/fasttext/blob/master/CHANGELOG.md)
+View the [changelog](https://github.com/ankane/fastText-ruby/blob/master/CHANGELOG.md)
 
 ## Contributing
 
 Everyone is encouraged to help improve this project. Here are a few ways you can help:
 
-- [Report bugs](https://github.com/ankane/fasttext/issues)
-- Fix bugs and [submit pull requests](https://github.com/ankane/fasttext/pulls)
+- [Report bugs](https://github.com/ankane/fastText-ruby/issues)
+- Fix bugs and [submit pull requests](https://github.com/ankane/fastText-ruby/pulls)
 - Write, clarify, or fix documentation
 - Suggest or add new features
 
 To get started with development:
 
 ```sh
-git clone --recursive https://github.com/ankane/fastText.git
-cd fastText
+git clone --recursive https://github.com/ankane/fastText-ruby.git
+cd fastText-ruby
 bundle install
 bundle exec rake compile
 bundle exec rake test

data/ext/fasttext/ext.cpp

@@ -16,13 +16,12 @@
 #include <rice/rice.hpp>
 #include <rice/stl.hpp>
 
+using fasttext::Args;
 using fasttext::FastText;
 
 using Rice::Array;
 using Rice::Constructor;
-using Rice::Hash;
 using Rice::Module;
-using Rice::Object;
 using Rice::define_class_under;
 using Rice::define_module;
 using Rice::define_module_under;
@@ -47,107 +46,69 @@ namespace Rice::detail
   };
 }
 
-fasttext::Args buildArgs(Hash h) {
-  fasttext::Args a;
-
-  std::vector<Hash::Entry> v;
-  Hash::iterator it = h.begin();
-  Hash::iterator end = h.end();
-
-  for(; it != end; ++it)
-  {
-    std::string name = it->key.to_s().str();
-    VALUE value = (it->value).value();
-
-    if (name == "input") {
-      a.input = Rice::detail::From_Ruby<std::string>().convert(value);
-    } else if (name == "output") {
-      a.output = Rice::detail::From_Ruby<std::string>().convert(value);
-    } else if (name == "lr") {
-      a.lr = Rice::detail::From_Ruby<double>().convert(value);
-    } else if (name == "lr_update_rate") {
-      a.lrUpdateRate = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "dim") {
-      a.dim = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "ws") {
-      a.ws = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "epoch") {
-      a.epoch = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "min_count") {
-      a.minCount = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "min_count_label") {
-      a.minCountLabel = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "neg") {
-      a.neg = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "word_ngrams") {
-      a.wordNgrams = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "loss") {
-      std::string str = Rice::detail::From_Ruby<std::string>().convert(value);
-      if (str == "softmax") {
-        a.loss = fasttext::loss_name::softmax;
-      } else if (str == "ns") {
-        a.loss = fasttext::loss_name::ns;
-      } else if (str == "hs") {
-        a.loss = fasttext::loss_name::hs;
-      } else if (str == "ova") {
-        a.loss = fasttext::loss_name::ova;
-      } else {
-        throw std::invalid_argument("Unknown loss: " + str);
-      }
-    } else if (name == "model") {
-      std::string str = Rice::detail::From_Ruby<std::string>().convert(value);
-      if (str == "supervised") {
-        a.model = fasttext::model_name::sup;
-      } else if (str == "skipgram") {
-        a.model = fasttext::model_name::sg;
-      } else if (str == "cbow") {
-        a.model = fasttext::model_name::cbow;
-      } else {
-        throw std::invalid_argument("Unknown model: " + str);
-      }
-    } else if (name == "bucket") {
-      a.bucket = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "minn") {
-      a.minn = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "maxn") {
-      a.maxn = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "thread") {
-      a.thread = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "t") {
-      a.t = Rice::detail::From_Ruby<double>().convert(value);
-    } else if (name == "label_prefix") {
-      a.label = Rice::detail::From_Ruby<std::string>().convert(value);
-    } else if (name == "verbose") {
-      a.verbose = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "pretrained_vectors") {
-      a.pretrainedVectors = Rice::detail::From_Ruby<std::string>().convert(value);
-    } else if (name == "save_output") {
-      a.saveOutput = Rice::detail::From_Ruby<bool>().convert(value);
-    } else if (name == "seed") {
-      a.seed = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "autotune_validation_file") {
-      a.autotuneValidationFile = Rice::detail::From_Ruby<std::string>().convert(value);
-    } else if (name == "autotune_metric") {
-      a.autotuneMetric = Rice::detail::From_Ruby<std::string>().convert(value);
-    } else if (name == "autotune_predictions") {
-      a.autotunePredictions = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "autotune_duration") {
-      a.autotuneDuration = Rice::detail::From_Ruby<int>().convert(value);
-    } else if (name == "autotune_model_size") {
-      a.autotuneModelSize = Rice::detail::From_Ruby<std::string>().convert(value);
-    } else {
-      throw std::invalid_argument("Unknown argument: " + name);
-    }
-  }
-  return a;
-}
-
 extern "C"
 void Init_ext()
 {
   Module rb_mFastText = define_module("FastText");
   Module rb_mExt = define_module_under(rb_mFastText, "Ext");
 
+  define_class_under<Args>(rb_mExt, "Args")
+    .define_constructor(Constructor<Args>())
+    .define_attr("input", &Args::input)
+    .define_attr("output", &Args::output)
+    .define_attr("lr", &Args::lr)
+    .define_attr("lr_update_rate", &Args::lrUpdateRate)
+    .define_attr("dim", &Args::dim)
+    .define_attr("ws", &Args::ws)
+    .define_attr("epoch", &Args::epoch)
+    .define_attr("min_count", &Args::minCount)
+    .define_attr("min_count_label", &Args::minCountLabel)
+    .define_attr("neg", &Args::neg)
+    .define_attr("word_ngrams", &Args::wordNgrams)
+    .define_method(
+      "loss=",
+      [](Args& a, const std::string& str) {
+        if (str == "softmax") {
+          a.loss = fasttext::loss_name::softmax;
+        } else if (str == "ns") {
+          a.loss = fasttext::loss_name::ns;
+        } else if (str == "hs") {
+          a.loss = fasttext::loss_name::hs;
+        } else if (str == "ova") {
+          a.loss = fasttext::loss_name::ova;
+        } else {
+          throw std::invalid_argument("Unknown loss: " + str);
+        }
+      })
+    .define_method(
+      "model=",
+      [](Args& a, const std::string& str) {
+        if (str == "supervised") {
+          a.model = fasttext::model_name::sup;
+        } else if (str == "skipgram") {
+          a.model = fasttext::model_name::sg;
+        } else if (str == "cbow") {
+          a.model = fasttext::model_name::cbow;
+        } else {
+          throw std::invalid_argument("Unknown model: " + str);
+        }
+      })
+    .define_attr("bucket", &Args::bucket)
+    .define_attr("minn", &Args::minn)
+    .define_attr("maxn", &Args::maxn)
+    .define_attr("thread", &Args::thread)
+    .define_attr("t", &Args::t)
+    .define_attr("label_prefix", &Args::label)
+    .define_attr("verbose", &Args::verbose)
+    .define_attr("pretrained_vectors", &Args::pretrainedVectors)
+    .define_attr("save_output", &Args::saveOutput)
+    .define_attr("seed", &Args::seed)
+    .define_attr("autotune_validation_file", &Args::autotuneValidationFile)
+    .define_attr("autotune_metric", &Args::autotuneMetric)
+    .define_attr("autotune_predictions", &Args::autotunePredictions)
+    .define_attr("autotune_duration", &Args::autotuneDuration)
+    .define_attr("autotune_model_size", &Args::autotuneModelSize);
+
   define_class_under<FastText>(rb_mExt, "Model")
     .define_constructor(Constructor<FastText>())
     .define_method(
@@ -235,13 +196,12 @@ void Init_ext()
     .define_method(
       "word_vector",
       [](FastText& m, const std::string& word) {
-        int dimension = m.getDimension();
+        auto dimension = m.getDimension();
         fasttext::Vector vec = fasttext::Vector(dimension);
         m.getWordVector(vec, word);
-        float* data = vec.data();
         Array ret;
-        for (int i = 0; i < dimension; i++) {
-          ret.push(data[i]);
+        for (size_t i = 0; i < vec.size(); i++) {
+          ret.push(vec[i]);
         }
         return ret;
       })
@@ -263,20 +223,18 @@ void Init_ext()
       "sentence_vector",
       [](FastText& m, const std::string& text) {
         std::istringstream in(text);
-        int dimension = m.getDimension();
+        auto dimension = m.getDimension();
         fasttext::Vector vec = fasttext::Vector(dimension);
         m.getSentenceVector(in, vec);
-        float* data = vec.data();
         Array ret;
-        for (int i = 0; i < dimension; i++) {
-          ret.push(data[i]);
+        for (size_t i = 0; i < vec.size(); i++) {
+          ret.push(vec[i]);
         }
         return ret;
       })
     .define_method(
       "train",
-      [](FastText& m, Hash h) {
-        auto a = buildArgs(h);
+      [](FastText& m, Args& a) {
         if (a.hasAutotune()) {
           fasttext::Autotune autotune(std::shared_ptr<fasttext::FastText>(&m, [](fasttext::FastText*) {}));
           autotune.train(a);
@@ -286,8 +244,8 @@ void Init_ext()
       })
     .define_method(
       "quantize",
-      [](FastText& m, Hash h) {
-        m.quantize(buildArgs(h));
+      [](FastText& m, Args& a) {
+        m.quantize(a);
       })
     .define_method(
       "supervised?",

data/ext/fasttext/extconf.rb

@@ -1,7 +1,9 @@
 require "mkmf-rice"
 
+# -march=native not supported with ARM Mac
+default_optflags = RbConfig::CONFIG["host_os"] =~ /darwin/i && RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i ? "" : "-march=native"
 # -pthread and -O3 set by default
-$CXXFLAGS << " -std=c++17 -funroll-loops " << with_config("optflags", "-march=native")
+$CXXFLAGS << " -std=c++17 $(optflags) -funroll-loops " << with_config("optflags", default_optflags)
 
 ext = File.expand_path(".", __dir__)
 fasttext = File.expand_path("../../vendor/fastText/src", __dir__)

data/lib/fasttext/classifier.rb

@@ -30,14 +30,16 @@ module FastText
     }
 
     def fit(x, y = nil, autotune_set: nil)
-      input = input_path(x, y)
+      input, _ref = input_path(x, y)
       @m ||= Ext::Model.new
-      opts = DEFAULT_OPTIONS.merge(@options).merge(input: input, model: "supervised")
+      a = build_args(DEFAULT_OPTIONS)
+      a.input = input
+      a.model = "supervised"
       if autotune_set
         x, y = autotune_set
-        opts.merge!(autotune_validation_file: input_path(x, y))
+        a.autotune_validation_file, _autotune_ref = input_path(x, y)
       end
-      m.train(opts)
+      m.train(a)
     end
 
     def predict(text, k: 1, threshold: 0.0)
@@ -47,16 +49,16 @@ module FastText
       # TODO predict multiple in C++ for performance
       result =
         text.map do |t|
-          m.predict(prep_text(t), k, threshold).map do |v|
+          m.predict(prep_text(t), k, threshold).to_h do |v|
             [remove_prefix(v[1]), v[0]]
-          end.to_h
+          end
         end
 
       multiple ? result : result.first
     end
 
     def test(x, y = nil, k: 1)
-      input = input_path(x, y)
+      input, _ref = input_path(x, y)
       res = m.test(input, k)
       {
         examples: res[0],
@@ -67,7 +69,8 @@ module FastText
 
     # TODO support options
     def quantize
-      m.quantize({})
+      a = Ext::Args.new
+      m.quantize(a)
     end
 
     def labels(include_freq: false)
@@ -85,7 +88,7 @@ module FastText
     def input_path(x, y)
       if x.is_a?(String)
         raise ArgumentError, "Cannot pass y with file" if y
-        x
+        [x, nil]
       else
         tempfile = Tempfile.new("fasttext")
         x.zip(y) do |xi, yi|
@@ -95,7 +98,7 @@ module FastText
           tempfile.write("\n")
         end
         tempfile.close
-        tempfile.path
+        [tempfile.path, tempfile]
       end
     end
 

data/lib/fasttext/model.rb

@@ -56,5 +56,15 @@ module FastText
     def m
       @m || (raise Error, "Not fit")
     end
+
+    def build_args(default_options)
+      a = Ext::Args.new
+      opts = @options.dup
+      default_options.each do |k, v|
+        a.send("#{k}=", opts.delete(k) || v)
+      end
+      raise ArgumentError, "Unknown argument: #{opts.keys.first}" if opts.any?
+      a
+    end
   end
 end

data/lib/fasttext/vectorizer.rb

@@ -29,9 +29,10 @@ module FastText
     }
 
     def fit(x)
-      input = input_path(x)
       @m ||= Ext::Model.new
-      m.train(DEFAULT_OPTIONS.merge(@options).merge(input: input))
+      a = build_args(DEFAULT_OPTIONS)
+      a.input, _ref = input_path(x)
+      m.train(a)
     end
 
     def nearest_neighbors(word, k: 10)
@@ -48,7 +49,7 @@ module FastText
     # https://github.com/facebookresearch/fastText/issues/518
     def input_path(x)
       if x.is_a?(String)
-        x
+        [x, nil]
       else
         tempfile = Tempfile.new("fasttext")
         x.each do |xi|
@@ -56,7 +57,7 @@ module FastText
           tempfile.write("\n")
         end
         tempfile.close
-        tempfile.path
+        [tempfile.path, tempfile]
       end
     end
   end

data/lib/fasttext/version.rb

@@ -1,3 +1,3 @@
 module FastText
-  VERSION = "0.2.0"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fasttext
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -71,7 +71,7 @@ files:
 - vendor/fastText/src/utils.h
 - vendor/fastText/src/vector.cc
 - vendor/fastText/src/vector.h
-homepage: https://github.com/ankane/fastText
+homepage: https://github.com/ankane/fastText-ruby
 licenses:
 - MIT
 metadata: {}
@@ -90,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
-summary: fastText - efficient text classification and representation learning - for
-  Ruby
+summary: Efficient text classification and representation learning for Ruby
 test_files: []