libffm 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d83d396ee32f053d336ee05dd5eb5091f5c45e2638efb5accd6968cf95cab1b0
-  data.tar.gz: 7417b2812bce94a06a92f580d2aca82b34e4298c23c548a5ba6a556d7d148c96
+  metadata.gz: 5f1d48f6ab534406f57b25e461c3dadda4811b058c4ece588b27670eef6313b6
+  data.tar.gz: 3991527073b513ce0104861539cd7f62200282891fd1b7631648936572b9adc6
 SHA512:
-  metadata.gz: 6a73888faced817a7c4b6d3095611ea42f711853d19c3edb43688a7b39b7aad144b1ee27efe13683834569dbcfc564a49a7ceafbb86d5246e9f8fdb5a038e7a6
-  data.tar.gz: 12196508c774adc8b25bf91755dacf4208537a3aa1c19695a1b9f4405790c989291903a5402a59ed9650614173a551f306439f15aae69477d15bd148eaf91441
+  metadata.gz: 1939d2d1cbb8180cb4ebc351c3f831da8204e07ee073bbb84e8e50c80b71cde01ae48e1d6a67c2ade3a32b05e003b2a0ad9295645eeaf918b0f76ac19f0cfd59
+  data.tar.gz: d4717dae8844e43a2e3c2cc8889713de452f7e9e9781e1647072033336b03ee52ffd869e5e5a98c2c1d098fc35d6e0e34e41de9db80a20abcda11e14afefb67d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.0 (2021-05-17)
+
+- Updated to Rice 4
+- Dropped support for Ruby < 2.6
+
 ## 0.1.1 (2020-11-28)
 
 - Fixed installation on Linux

data/LICENSE.txt

@@ -1,6 +1,6 @@
 
 Copyright (c) 2017 The LIBFFM Project.
-Copyright (c) 2020 Andrew Kane.
+Copyright (c) 2020-2021 Andrew Kane.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/ext/libffm/ext.cpp

@@ -5,10 +5,8 @@
 #include <ffm.h>
 
 // rice
-#include <rice/Array.hpp>
-#include <rice/Class.hpp>
-#include <rice/Module.hpp>
-#include <rice/Object.hpp>
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using Rice::Array;
 using Rice::Class;
@@ -28,14 +26,14 @@ void Init_ext()
   define_class_under<ffm::ffm_model>(rb_mExt, "Model");
 
   rb_mExt
-    .define_singleton_method(
+    .define_singleton_function(
       "release_model",
-      *[](ffm::ffm_model& model) {
+      [](ffm::ffm_model& model) {
         model.release();
       })
-    .define_singleton_method(
+    .define_singleton_function(
       "fit",
-      *[](std::string tr_path, std::string va_path, std::string tmp_prefix, ffm::ffm_float eta, ffm::ffm_float lambda, ffm::ffm_int nr_iters, ffm::ffm_int k, bool normalization, bool auto_stop) {
+      [](const std::string& tr_path, const std::string& va_path, const std::string& tmp_prefix, ffm::ffm_float eta, ffm::ffm_float lambda, ffm::ffm_int nr_iters, ffm::ffm_int k, bool normalization, bool auto_stop) {
         // quiet
         ffm::cout.setstate(ffm::ios_base::badbit);
 
@@ -58,9 +56,9 @@ void Init_ext()
 
         return ffm::ffm_train_on_disk(tr_bin_path, va_bin_path, param);
       })
-    .define_singleton_method(
+    .define_singleton_function(
       "predict",
-      *[](ffm::ffm_model& model, std::string test_path) {
+      [](ffm::ffm_model& model, const std::string& test_path) {
         int const kMaxLineSize = 1000000;
 
         FILE *f_in = fopen(test_path.c_str(), "r");
@@ -97,14 +95,14 @@ void Init_ext()
 
         return ret;
       })
-    .define_singleton_method(
+    .define_singleton_function(
       "save_model",
-      *[](ffm::ffm_model& model, std::string path) {
+      [](ffm::ffm_model& model, const std::string& path) {
         ffm::ffm_save_model(model, path);
       })
-    .define_singleton_method(
+    .define_singleton_function(
       "load_model",
-      *[](std::string path) {
+      [](const std::string& path) {
         return ffm::ffm_load_model(path);
       });
 }

data/ext/libffm/extconf.rb

@@ -2,7 +2,7 @@ require "mkmf-rice"
 
 # -DUSESSE requires sse3
 # TODO test for it or update fork to use __SSE3__
-$CXXFLAGS += " -std=c++11 -march=native"
+$CXXFLAGS += " -std=c++17 -march=native"
 
 apple_clang = RbConfig::CONFIG["CC_VERSION_MESSAGE"] =~ /apple clang/i
 

data/lib/libffm/version.rb

@@ -1,3 +1,3 @@
 module Libffm
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/vendor/libffm/ffm.cpp

@@ -569,13 +569,23 @@ ffm_model ffm_train_on_disk(string tr_path, string va_path, ffm_parameter param)
 
         vector<ffm_int> outer_order(prob.meta.num_blocks);
         iota(outer_order.begin(), outer_order.end(), 0);
+        #if __cplusplus >= 201703L
+        std::random_device rd;
+        std::mt19937 g(rd());
+        std::shuffle(outer_order.begin(), outer_order.end(), g);
+        #else
         random_shuffle(outer_order.begin(), outer_order.end());
+        #endif
         for(auto blk : outer_order) {
             ffm_int l = prob.load_block(blk);
 
             vector<ffm_int> inner_order(l);
             iota(inner_order.begin(), inner_order.end(), 0);
+            #if __cplusplus >= 201703L
+            std::shuffle(inner_order.begin(), inner_order.end(), g);
+            #else
             random_shuffle(inner_order.begin(), inner_order.end());
+            #endif
 
 #if defined USEOMP
 #pragma omp parallel for schedule(static) reduction(+: loss)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libffm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -16,18 +16,19 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 4.0.2
 description:
-email: andrew@chartkick.com
+email: andrew@ankane.org
 executables: []
-extensions: []
+extensions:
+- ext/libffm/extconf.rb
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
@@ -60,14 +61,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Field-aware factorization machines for Ruby