numo-liblinear 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e69ca89df0a86fdc4be7d1a3074a4722ead3997a6f7ba2fff84b48c6d1c36ea
-  data.tar.gz: 992d8f8606dbf272ac18c1f6502e923d69ce3242d6cb35a460b3856cace29671
+  metadata.gz: e01c76e5ada65d064a521c29a11e1ad18644ca60a5f79119b552ad6732fc6ab2
+  data.tar.gz: d73b0a4e48ca51053ba162783c6dc128ef20b49ef3ecb7f06654ed9eba4c8a55
 SHA512:
-  metadata.gz: 46f453f5b9ee23640a7131d92d3f666806e182265654cec321ebae22c97ae6af06a5b35726e4ab0cfde96407d0fb828391a2c5578c3e27644c487df66432cce8
-  data.tar.gz: d1e0fc15d4227491823fe4ed8f631c491e6cd4c8fb9c078ccf230785e2881fa12134dbfca9e84069bd8d995c140523bfc0572cbaa38761b114d162015dea5be1
+  metadata.gz: 27188ec56a5956df8acebf89384d901aab38b24f6f98cf5b877b4f70be8172b107e05021f9d637761cdf23e3578daf1c1a50f009129e2f556b6d963cd30ebe28
+  data.tar.gz: 3bf342d11db29b36a05cd0f345ae98376547a25e3920d7937f1974ed625fa8c4dfbe23be8e7910207090084f2c23cd2b65cf5f999e162d6f1ae35c5d18667df7

data/.github/workflows/build.yml

@@ -0,0 +1,29 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.7', '3.0' ]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Checkout submodule
+        shell: bash
+        run: |
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Build and test with Rake
+        run: |
+          gem install --no-document bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# 1.2.2
+- Remove dependent gem's type declaration file from installation files.
+
+# 1.2.1
+- Fix version specifier of runtime dependencies.
+
+# 1.2.0
+- Add type declaration file: sig/numo/liblinear.rbs
+
+# 1.1.2
+- Add GC guard to model saving and loading methods.
+- Fix size specification to memcpy function.
+
+# 1.1.1
+- Add GC guard codes.
+- Fix some configuration files.
+
 # 1.1.0
 - Update bundled LIBLINEAR version to 2.4.1.
 - Support one-class SVM implemented on LIBLINEAR ver. 2.4.0.

data/Gemfile

@@ -2,3 +2,10 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in numo-liblinear.gemspec
 gemspec
+
+gem 'bundler', '~> 2.0'
+gem 'rake', '~> 13.0'
+gem 'rake-compiler', '~> 1.0'
+gem 'rspec', '~> 3.0'
+gem 'rbs', '~> 1.2'
+gem 'steep', '~> 0.44'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019-2020 Atsushi Tatsuma
+Copyright (c) 2019-2021 Atsushi Tatsuma
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -1,8 +1,8 @@
 # Numo::Liblinear
 
-[![Build Status](https://travis-ci.org/yoshoku/numo-liblinear.svg?branch=master)](https://travis-ci.org/yoshoku/numo-liblinear)
+[![Build Status](https://github.com/yoshoku/numo-liblinear/workflows/build/badge.svg)](https://github.com/yoshoku/numo-liblinear/actions?query=workflow%3Abuild)
 [![Gem Version](https://badge.fury.io/rb/numo-liblinear.svg)](https://badge.fury.io/rb/numo-liblinear)
-[![BSD 3-Clause License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://github.com/yoshoku/numo-liblinear/blob/master/LICENSE.txt)
+[![BSD 3-Clause License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://github.com/yoshoku/numo-liblinear/blob/main/LICENSE.txt)
 [![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](https://yoshoku.github.io/numo-liblinear/doc/)
 
 Numo::Liblinear is a Ruby gem binding to the [LIBLINEAR](https://www.csie.ntu.edu.tw/~cjlin/liblinear/) library.
@@ -162,17 +162,12 @@ param = {
   weight:                         # [Numo::DFloat] Weight values
     Numo::DFloat[0.4, 0.4, 0.2],
   p: 0.1,                         # [Float] Sensitiveness of loss of support vector regression
+  nu: 0.5,                        # [Float] one-class SVM approximates the fraction of data as outliers
   verbose: false,                 # [Boolean] Whether to output learning process message
   random_seed: 1                  # [Integer/Nil] Random seed
 }
 ```
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/yoshoku/numo-liblinear.
@@ -181,4 +176,4 @@ This project is intended to be a safe, welcoming space for collaboration, and co
 ## Code of Conduct
 
 Everyone interacting in the Numo::Liblinear project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow
-the [code of conduct](https://github.com/yoshoku/numo-liblinear/blob/master/CODE_OF_CONDUCT.md).
+the [code of conduct](https://github.com/yoshoku/numo-liblinear/blob/main/CODE_OF_CONDUCT.md).

data/Steepfile

@@ -0,0 +1,20 @@
+target :lib do
+  signature "sig", "sig-deps"
+#
+  check "lib"                       # Directory name
+#   check "Gemfile"                   # File name
+#   check "app/models/**/*.rb"        # Glob
+#   # ignore "lib/templates/*.rb"
+#
+#   # library "pathname", "set"       # Standard libraries
+#   library "numo-narray"           # Gems
+end
+
+# target :spec do
+#   signature "sig", "sig-private"
+#
+#   check "spec"
+#
+#   # library "pathname", "set"       # Standard libraries
+#   # library "rspec"
+# end

data/ext/numo/liblinear/converter.c

@@ -27,6 +27,8 @@ int* nary_to_int_vec(VALUE vec_val)
   vec_pt = (int32_t*)na_get_pointer_for_read(vec_val);
   for (i = 0; i < n_elements; i++) { vec[i] = (int)vec_pt[i]; }
 
+  RB_GC_GUARD(vec_val);
+
   return vec;
 }
 
@@ -56,6 +58,8 @@ double* nary_to_dbl_vec(VALUE vec_val)
   vec_pt = (double*)na_get_pointer_for_read(vec_val);
   memcpy(vec, vec_pt, n_elements * sizeof(double));
 
+  RB_GC_GUARD(vec_val);
+
   return vec;
 }
 
@@ -98,6 +102,8 @@ double** nary_to_dbl_mat(VALUE mat_val)
     }
   }
 
+  RB_GC_GUARD(mat_val);
+
   return mat;
 }
 

data/ext/numo/liblinear/liblinearext.c

@@ -112,6 +112,9 @@ VALUE numo_liblinear_train(VALUE self, VALUE x_val, VALUE y_val, VALUE param_has
   xfree_problem(problem);
   xfree_parameter(param);
 
+  RB_GC_GUARD(x_val);
+  RB_GC_GUARD(y_val);
+
   return model_hash;
 }
 
@@ -225,6 +228,9 @@ VALUE numo_liblinear_cross_validation(VALUE self, VALUE x_val, VALUE y_val, VALU
   xfree_problem(problem);
   xfree_parameter(param);
 
+  RB_GC_GUARD(x_val);
+  RB_GC_GUARD(y_val);
+
   return t_val;
 }
 
@@ -291,6 +297,8 @@ VALUE numo_liblinear_predict(VALUE self, VALUE x_val, VALUE param_hash, VALUE mo
   xfree_model(model);
   xfree_parameter(param);
 
+  RB_GC_GUARD(x_val);
+
   return y_val;
 }
 
@@ -381,6 +389,8 @@ VALUE numo_liblinear_decision_function(VALUE self, VALUE x_val, VALUE param_hash
   xfree_model(model);
   xfree_parameter(param);
 
+  RB_GC_GUARD(x_val);
+
   return y_val;
 }
 
@@ -457,6 +467,8 @@ VALUE numo_liblinear_predict_proba(VALUE self, VALUE x_val, VALUE param_hash, VA
   xfree_model(model);
   xfree_parameter(param);
 
+  RB_GC_GUARD(x_val);
+
   return y_val;
 }
 
@@ -492,6 +504,8 @@ VALUE numo_liblinear_load_model(VALUE self, VALUE filename)
   rb_ary_store(res, 0, param_hash);
   rb_ary_store(res, 1, model_hash);
 
+  RB_GC_GUARD(filename);
+
   return res;
 }
 
@@ -526,6 +540,8 @@ VALUE numo_liblinear_save_model(VALUE self, VALUE filename, VALUE param_hash, VA
     return Qfalse;
   }
 
+  RB_GC_GUARD(filename);
+
   return Qtrue;
 }
 

data/ext/numo/liblinear/parameter.c

@@ -46,13 +46,13 @@ 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;

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/lib/numo/liblinear/version.rb

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

data/numo-liblinear.gemspec

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'numo/liblinear/version'
@@ -25,13 +23,13 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sig-deps)/}) }
   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]
+  submodule_path = `git submodule --quiet foreach pwd`.split($INPUT_RECORD_SEPARATOR).first
+  submodule_relative_path = submodule_path.sub("#{File.expand_path(__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'
@@ -45,10 +43,5 @@ Gem::Specification.new do |spec|
     'documentation_uri' => 'https://yoshoku.github.io/numo-liblinear/doc/'
   }
 
-  spec.add_runtime_dependency 'numo-narray', '~> 0.9.1'
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rake-compiler', '~> 1.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_runtime_dependency 'numo-narray', '>= 0.9.1'
 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
+

metadata

@@ -1,85 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: numo-liblinear
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - yoshoku
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !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: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.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,16 +35,17 @@ 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
@@ -127,6 +72,7 @@ files:
 - lib/numo/liblinear.rb
 - lib/numo/liblinear/version.rb
 - numo-liblinear.gemspec
+- sig/numo/liblinear.rbs
 homepage: https://github.com/yoshoku/numo-liblinear
 licenses:
 - BSD-3-Clause
@@ -134,7 +80,7 @@ metadata:
   homepage_uri: https://github.com/yoshoku/numo-liblinear
   source_code_uri: https://github.com/yoshoku/numo-liblinear
   documentation_uri: https://yoshoku.github.io/numo-liblinear/doc/
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.2.21
+signing_key: 
 specification_version: 4
 summary: Numo::Liblinear is a Ruby gem binding to the LIBLINEAR library. Numo::Liblinear
   makes to use the LIBLINEAR functions with dataset represented by Numo::NArray.

data/.travis.yml

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