numo-liblinear 0.5.0 → 1.2.0

data/ext/numo/liblinear/parameter.c

@@ -5,36 +5,39 @@ struct parameter* rb_hash_to_parameter(VALUE param_hash)
   VALUE el;
   struct parameter* param = ALLOC(struct parameter);
   el = rb_hash_aref(param_hash, ID2SYM(rb_intern("solver_type")));
-	param->solver_type = !NIL_P(el) ? NUM2INT(el) : L2R_L2LOSS_SVC_DUAL;
+  param->solver_type = !NIL_P(el) ? NUM2INT(el) : L2R_L2LOSS_SVC_DUAL;
   el = rb_hash_aref(param_hash, ID2SYM(rb_intern("eps")));
-	if (!NIL_P(el)) {
+  if (!NIL_P(el)) {
     param->eps = NUM2DBL(el);
-	} else {
-		switch(param->solver_type)
-		{
-			case L2R_LR:
-			case L2R_L2LOSS_SVC:
-				param->eps = 0.01;
-				break;
-			case L2R_L2LOSS_SVR:
-				param->eps = 0.0001;
-				break;
-			case L2R_L2LOSS_SVC_DUAL:
-			case L2R_L1LOSS_SVC_DUAL:
-			case MCSVM_CS:
-			case L2R_LR_DUAL:
-				param->eps = 0.1;
-				break;
-			case L1R_L2LOSS_SVC:
-			case L1R_LR:
-				param->eps = 0.01;
-				break;
-			case L2R_L1LOSS_SVR_DUAL:
-			case L2R_L2LOSS_SVR_DUAL:
-				param->eps = 0.1;
-				break;
+  } else {
+    switch(param->solver_type)
+    {
+      case L2R_LR:
+      case L2R_L2LOSS_SVC:
+        param->eps = 0.01;
+        break;
+      case L2R_L2LOSS_SVR:
+        param->eps = 0.0001;
+        break;
+      case L2R_L2LOSS_SVC_DUAL:
+      case L2R_L1LOSS_SVC_DUAL:
+      case MCSVM_CS:
+      case L2R_LR_DUAL:
+        param->eps = 0.1;
+        break;
+      case L1R_L2LOSS_SVC:
+      case L1R_LR:
+        param->eps = 0.01;
+        break;
+      case L2R_L1LOSS_SVR_DUAL:
+      case L2R_L2LOSS_SVR_DUAL:
+        param->eps = 0.1;
+        break;
+      case ONECLASS_SVM:
+        param->eps = 0.01;
+        break;
     }
-	}
+  }
   el = rb_hash_aref(param_hash, ID2SYM(rb_intern("C")));
   param->C = !NIL_P(el) ? NUM2DBL(el) : 1;
   el = rb_hash_aref(param_hash, ID2SYM(rb_intern("nr_weight")));
@@ -43,21 +46,24 @@ struct parameter* rb_hash_to_parameter(VALUE param_hash)
   param->weight_label = NULL;
   if (!NIL_P(el)) {
     param->weight_label = ALLOC_N(int, param->nr_weight);
-    memcpy(param->weight_label, (int32_t*)na_get_pointer_for_read(el), param->nr_weight);
+    memcpy(param->weight_label, (int32_t*)na_get_pointer_for_read(el), param->nr_weight * sizeof(int32_t));
   }
   el = rb_hash_aref(param_hash, ID2SYM(rb_intern("weight")));
   param->weight = NULL;
   if (!NIL_P(el)) {
     param->weight = ALLOC_N(double, param->nr_weight);
-    memcpy(param->weight, (double*)na_get_pointer_for_read(el), param->nr_weight);
+    memcpy(param->weight, (double*)na_get_pointer_for_read(el), param->nr_weight * sizeof(double));
   }
   el = rb_hash_aref(param_hash, ID2SYM(rb_intern("p")));
   param->p = !NIL_P(el) ? NUM2DBL(el) : 0.1;
+  el = rb_hash_aref(param_hash, ID2SYM(rb_intern("nu")));
+  param->nu = !NIL_P(el) ? NUM2DBL(el) : 0.5;
   el = rb_hash_aref(param_hash, ID2SYM(rb_intern("init_sol")));
   param->init_sol = NULL;
   if (!NIL_P(el)) {
     param->init_sol = nary_to_dbl_vec(el);
   }
+  param->regularize_bias = 1;
   return param;
 }
 
@@ -73,6 +79,7 @@ VALUE parameter_to_rb_hash(struct parameter* const param)
   rb_hash_aset(param_hash, ID2SYM(rb_intern("weight")),
     param->weight ? dbl_vec_to_nary(param->weight, param->nr_weight) : Qnil);
   rb_hash_aset(param_hash, ID2SYM(rb_intern("p")), DBL2NUM(param->p));
+  rb_hash_aset(param_hash, ID2SYM(rb_intern("nu")), DBL2NUM(param->nu));
   rb_hash_aset(param_hash, ID2SYM(rb_intern("init_sol")), Qnil);
   return param_hash;
 }

data/ext/numo/liblinear/problem.c

@@ -85,5 +85,8 @@ struct problem* dataset_to_problem(VALUE x_val, VALUE y_val)
     problem->y[i] = y_pt[i];
   }
 
+  RB_GC_GUARD(x_val);
+  RB_GC_GUARD(y_val);
+
   return problem;
 }

data/ext/numo/liblinear/solver_type.c

@@ -17,18 +17,20 @@ void rb_init_solver_type_module()
   rb_define_const(mSolverType, "L2R_L2LOSS_SVC", INT2NUM(L2R_L2LOSS_SVC));
   /* L2-regularized L1-loss support vector classification (dual) */
   rb_define_const(mSolverType, "L2R_L1LOSS_SVC_DUAL", INT2NUM(L2R_L1LOSS_SVC_DUAL));
-	/* support vector classification by Crammer and Singer */
+  /* support vector classification by Crammer and Singer */
   rb_define_const(mSolverType, "MCSVM_CS", INT2NUM(MCSVM_CS));
-	/* L1-regularized L2-loss support vector classification */
+  /* L1-regularized L2-loss support vector classification */
   rb_define_const(mSolverType, "L1R_L2LOSS_SVC", INT2NUM(L1R_L2LOSS_SVC));
-	/* L1-regularized logistic regression */
+  /* L1-regularized logistic regression */
   rb_define_const(mSolverType, "L1R_LR", INT2NUM(L1R_LR));
   /* L2-regularized logistic regression (dual) */
   rb_define_const(mSolverType, "L2R_LR_DUAL", INT2NUM(L2R_LR_DUAL));
-	/* L2-regularized L2-loss support vector regression (primal) */
+  /* L2-regularized L2-loss support vector regression (primal) */
   rb_define_const(mSolverType, "L2R_L2LOSS_SVR", INT2NUM(L2R_L2LOSS_SVR));
-	/* L2-regularized L2-loss support vector regression (dual) */
+  /* L2-regularized L2-loss support vector regression (dual) */
   rb_define_const(mSolverType, "L2R_L2LOSS_SVR_DUAL", INT2NUM(L2R_L2LOSS_SVR_DUAL));
-	/* L2-regularized L1-loss support vector regression (dual) */
+  /* L2-regularized L1-loss support vector regression (dual) */
   rb_define_const(mSolverType, "L2R_L1LOSS_SVR_DUAL", INT2NUM(L2R_L1LOSS_SVR_DUAL));
+  /* one-class support vector machine (dual) */
+  rb_define_const(mSolverType, "ONECLASS_SVM", INT2NUM(ONECLASS_SVM));
 }

data/lib/numo/liblinear/version.rb

@@ -3,6 +3,6 @@
 module Numo
   module Liblinear
     # The version of Numo::Liblienar you are using.
-    VERSION = '0.5.0'
+    VERSION = '1.2.0'
   end
 end

data/numo-liblinear.gemspec

@@ -27,6 +27,13 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
+
+  gem_dir = File.expand_path(__dir__) + '/'
+  submodule_path = `git submodule --quiet foreach pwd`.split($OUTPUT_RECORD_SEPARATOR).first
+  submodule_relative_path = submodule_path.sub gem_dir, ''
+  liblinear_files = %w[linear.cpp linear.h newton.cpp newton.h blas/blas.h blas/blasp.h blas/daxpy.c blas/ddot.c blas/dnrm2.c blas/dscal.c]
+  liblinear_files.each { |liblinf| spec.files << "#{submodule_relative_path}/#{liblinf}" }
+
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
@@ -39,8 +46,4 @@ Gem::Specification.new do |spec|
   }
 
   spec.add_runtime_dependency 'numo-narray', '~> 0.9.1'
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rake-compiler', '~> 1.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/sig/numo/liblinear.rbs

@@ -0,0 +1,52 @@
+module Numo
+  module Liblinear
+    module SolverType
+      L2R_LR: Integer
+      L2R_L2LOSS_SVC_DUAL: Integer
+      L2R_L2LOSS_SVC: Integer
+      L2R_L1LOSS_SVC_DUAL: Integer
+      MCSVM_CS: Integer
+      L1R_L2LOSS_SVC: Integer
+      L1R_LR: Integer
+      L2R_LR_DUAL: Integer
+      L2R_L2LOSS_SVR: Integer
+      L2R_L2LOSS_SVR_DUAL: Integer
+      L2R_L1LOSS_SVR_DUAL: Integer
+      ONECLASS_SVM: Integer
+    end
+
+    LIBLINEAR_VERSION: Integer
+    VERSION: String
+
+    type model = {
+      nr_class: Integer,
+      nr_feature: Integer,
+      w: Numo::DFloat,
+      label: Numo::Int32,
+      bias: Float,
+      rho: Float
+    }
+
+    type param = {
+      solver_type: Integer?,
+      eps: Float?,
+      C: Float?,
+      nr_weight: Integer?,
+      weight_label: Numo::Int32?,
+      weight: Numo::DFloat?,
+      p: Float?,
+      nu: Float?,
+      verbose: bool?,
+      random_seed: Integer?
+    }
+
+    def self?.cv: (Numo::DFloat x, Numo::DFloat y, param, Integer n_folds) -> Numo::DFloat
+    def self?.train: (Numo::DFloat x, Numo::DFloat y, param) -> model
+    def self?.predict: (Numo::DFloat x, param, model) -> Numo::DFloat
+    def self?.predict_proba: (Numo::DFloat x, param, model) -> Numo::DFloat
+    def self?.decision_function: (Numo::DFloat x, param, model) -> Numo::DFloat
+    def self?.save_model: (String filename, param, model) -> bool
+    def self?.load_model: (String filename) -> [param, model]
+  end
+end
+

data/sig/patch.rbs

@@ -0,0 +1,8 @@
+module Numo
+  class NArray
+  end
+  class DFloat < NArray
+  end
+  class Int32 < NArray
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-liblinear
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.2.0
 platform: ruby
 authors:
 - yoshoku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -24,62 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: |
   Numo::Liblinear is a Ruby gem binding to the LIBLINEAR library.
   LIBLINEAR is one of the famous libraries for large-scale regularized linear classification and regression.
@@ -91,18 +35,30 @@ extensions:
 - ext/numo/liblinear/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- Steepfile
 - ext/numo/liblinear/converter.c
 - ext/numo/liblinear/converter.h
 - ext/numo/liblinear/extconf.rb
+- ext/numo/liblinear/liblinear/blas/blas.h
+- ext/numo/liblinear/liblinear/blas/blasp.h
+- ext/numo/liblinear/liblinear/blas/daxpy.c
+- ext/numo/liblinear/liblinear/blas/ddot.c
+- ext/numo/liblinear/liblinear/blas/dnrm2.c
+- ext/numo/liblinear/liblinear/blas/dscal.c
+- ext/numo/liblinear/liblinear/linear.cpp
+- ext/numo/liblinear/liblinear/linear.h
+- ext/numo/liblinear/liblinear/newton.cpp
+- ext/numo/liblinear/liblinear/newton.h
 - ext/numo/liblinear/liblinearext.c
 - ext/numo/liblinear/liblinearext.h
 - ext/numo/liblinear/model.c
@@ -116,6 +72,8 @@ files:
 - lib/numo/liblinear.rb
 - lib/numo/liblinear/version.rb
 - numo-liblinear.gemspec
+- sig/numo/liblinear.rbs
+- sig/patch.rbs
 homepage: https://github.com/yoshoku/numo-liblinear
 licenses:
 - BSD-3-Clause
@@ -138,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Numo::Liblinear is a Ruby gem binding to the LIBLINEAR library. Numo::Liblinear

data/.travis.yml

@@ -1,14 +0,0 @@
----
-sudo: true
-os: linux
-dist: bionic
-language: ruby
-cache: bundler
-rvm:
-  - '2.4'
-  - '2.5'
-  - '2.6'
-
-before_install:
-  - sudo apt-get install -y liblinear-dev
-  - gem install bundler -v 2.0.2