numo-libsvm 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c0a730ce303204c97607bd8c5ce7bf6440fe3526
-  data.tar.gz: 5370997eadf0f407239763a6fc31241538f06758
+SHA256:
+  metadata.gz: f321e889c3d7a6a617f6700885d5c39f00272a4cd2aad82e2efadb6818fe78aa
+  data.tar.gz: bc8062c42b4f20cc1b6cfe11a2cebff4fc2881be180c92ca287e5f3c85b74a76
 SHA512:
-  metadata.gz: 5ba7e42f36ec3f7fff0d42c900f79500a61695efe03f4b0cd74a6f2758e92ecc80172006f3186e4567feb322572943b31332f1147263aef5f257ea960379936c
-  data.tar.gz: da34b077e7d299c0c7a760ecbf02b395f95606e4f87deb9e060de3330ad5ae507f81fe3d1b7dbbadfd4b54c3161af049a27302a5554249f7f7b17766a204f1aa
+  metadata.gz: faa13722b019804975e539f4f10a64bb602a3052529d885e168e343801a61a074af186efa6f0c8e124f03ed8b95cfc7067a7c06eda334d89a9c41f4775d18c2c
+  data.tar.gz: 28b0830bd53f280c6511013ca838bf29ed510cf8062b7f47425d15aa287418452c14ea7f98567ee459518be9aa946cee40d3401a9011169e3f51d64f64f96ca8

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.1.2
+- Remove dependent gem's type declaration file from installation files.
+
+# 1.1.1
+- Fix version specifier of runtime dependencies.
+
+# 1.1.0
+- Add type declaration file: sig/numo/libsvm.rbs
+
+# 1.0.2
+- Add GC guard to model saving and loading methods.
+- Fix size specification to memcpy function.
+
+# 1.0.1
+- Add GC guard codes.
+- Fix some configuration files.
+
 # 1.0.0
 ## Breaking change
 - For easy installation, Numo::LIBSVM bundles LIBSVM codes.

data/Gemfile

@@ -2,3 +2,10 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in numo-libsvm.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 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,9 +1,9 @@
 # Numo::Libsvm
 
-[![Build Status](https://travis-ci.org/yoshoku/numo-libsvm.svg?branch=master)](https://travis-ci.org/yoshoku/numo-libsvm)
+[![Build Status](https://github.com/yoshoku/numo-libsvm/workflows/build/badge.svg)](https://github.com/yoshoku/numo-libsvm/actions?query=workflow%3Abuild)
 [![Gem Version](https://badge.fury.io/rb/numo-libsvm.svg)](https://badge.fury.io/rb/numo-libsvm)
-[![BSD 3-Clause License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://github.com/yoshoku/numo-libsvm/blob/master/LICENSE.txt)
-[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](https://www.rubydoc.info/gems/numo-libsvm/0.4.0)
+[![BSD 3-Clause License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://github.com/yoshoku/numo-libsvm/blob/main/LICENSE.txt)
+[![Documentation](https://img.shields.io/badge/api-reference-blue.svg)](https://yoshoku.github.io/numo-libsvm/doc/)
 
 Numo::Libsvm is a Ruby gem binding to the [LIBSVM](https://github.com/cjlin1/libsvm) library.
 LIBSVM is one of the famous libraries that implemented Support Vector Machines,
@@ -197,4 +197,4 @@ The gem is available as open source under the terms of the [BSD-3-Clause License
 
 ## Code of Conduct
 
-Everyone interacting in the Numo::Libsvm project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/yoshoku/numo-libsvm/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Numo::Libsvm project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/yoshoku/numo-libsvm/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/libsvm/converter.c

@@ -28,6 +28,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;
 }
 
@@ -57,6 +59,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;
 }
 
@@ -99,6 +103,8 @@ double** nary_to_dbl_mat(VALUE mat_val)
     }
   }
 
+  RB_GC_GUARD(mat_val);
+
   return mat;
 }
 
@@ -167,6 +173,8 @@ struct svm_node** nary_to_svm_nodes(VALUE nary_val)
     support_vecs[i][n_nonzero_cols].value = 0.0;
   }
 
+  RB_GC_GUARD(nary_val);
+
   return support_vecs;
 }
 

data/ext/numo/libsvm/libsvmext.c

@@ -114,6 +114,9 @@ VALUE train(VALUE self, VALUE x_val, VALUE y_val, VALUE param_hash)
   xfree_svm_problem(problem);
   xfree_svm_parameter(param);
 
+  RB_GC_GUARD(x_val);
+  RB_GC_GUARD(y_val);
+
   return model_hash;
 }
 
@@ -229,6 +232,9 @@ VALUE cross_validation(VALUE self, VALUE x_val, VALUE y_val, VALUE param_hash, V
   xfree_svm_problem(problem);
   xfree_svm_parameter(param);
 
+  RB_GC_GUARD(x_val);
+  RB_GC_GUARD(y_val);
+
   return t_val;
 }
 
@@ -295,6 +301,8 @@ VALUE predict(VALUE self, VALUE x_val, VALUE param_hash, VALUE model_hash)
   xfree_svm_model(model);
   xfree_svm_parameter(param);
 
+  RB_GC_GUARD(x_val);
+
   return y_val;
 }
 
@@ -385,6 +393,8 @@ VALUE decision_function(VALUE self, VALUE x_val, VALUE param_hash, VALUE model_h
   xfree_svm_model(model);
   xfree_svm_parameter(param);
 
+  RB_GC_GUARD(x_val);
+
   return y_val;
 }
 
@@ -460,6 +470,8 @@ VALUE predict_proba(VALUE self, VALUE x_val, VALUE param_hash, VALUE model_hash)
   xfree_svm_model(model);
   xfree_svm_parameter(param);
 
+  RB_GC_GUARD(x_val);
+
   return y_val;
 }
 
@@ -493,6 +505,8 @@ VALUE load_svm_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;
 }
 
@@ -527,6 +541,8 @@ VALUE save_svm_model(VALUE self, VALUE filename, VALUE param_hash, VALUE model_h
     return Qfalse;
   }
 
+  RB_GC_GUARD(filename);
+
   return Qtrue;
 }
 

data/ext/numo/libsvm/svm_parameter.c

@@ -35,13 +35,13 @@ struct svm_parameter* rb_hash_to_svm_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));
   }
   return param;
 }

data/ext/numo/libsvm/svm_problem.c

@@ -83,5 +83,8 @@ struct svm_problem* dataset_to_svm_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/libsvm/version.rb

@@ -3,6 +3,6 @@
 module Numo
   module Libsvm
     # The version of Numo::Libsvm you are using.
-    VERSION = '1.0.0'
+    VERSION = '1.1.2'
   end
 end

data/numo-libsvm.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/libsvm/version'
@@ -26,12 +24,11 @@ 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, ''
+  submodule_path = `git submodule --quiet foreach pwd`.split($INPUT_RECORD_SEPARATOR).first
+  submodule_relative_path = submodule_path.sub("#{File.expand_path(__dir__)}/", '')
   spec.files << "#{submodule_relative_path}/svm.cpp"
   spec.files << "#{submodule_relative_path}/svm.h"
 
@@ -46,10 +43,5 @@ Gem::Specification.new do |spec|
     'documentation_uri' => 'https://yoshoku.github.io/numo-libsvm/doc/'
   }
 
-  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'
+  spec.add_runtime_dependency 'numo-narray', '>= 0.9.1'
 end

data/sig/numo/libsvm.rbs

@@ -0,0 +1,65 @@
+module Numo
+  module Libsvm
+    module SvmType
+      C_SVC: Integer
+      NU_SVC: Integer
+      ONE_CLASS: Integer
+      EPSILON_SVR: Integer
+      NU_SVR: Integer
+    end
+
+    module KenelType
+      LINEAR: Integer
+      POLY: Integer
+      RBF: Integer
+      SIGMOID: Integer
+      PRECOMPUTED: Integer
+    end
+
+    LIBSVM_VERSION: Integer
+    VERSION: String
+
+    type model = {
+      nr_class: Integer,
+      l: Integer,
+      SV: Numo::DFloat,
+      sv_coef: Numo::DFloat,
+      rho: Numo::DFloat,
+      probA: Numo::DFloat,
+      probB: Numo::DFloat,
+      sv_indices: Numo::Int32,
+      label: Numo::Int32,
+      nSV: Numo::Int32,
+      free_sv: Integer
+    }
+
+    type param = {
+      svm_type: Integer?,
+      kernel_type: Integer?,
+      degree: Integer?,
+      gamma: Float?,
+      coef0: Float?,
+      cache_size: Float?,
+      eps: Float?,
+      C: Float?,
+      nr_weight: Integer?,
+      weight_label: Numo::Int32?,
+      weight: Numo::DFloat?,
+      nu: Float?,
+      p: Float?,
+      shrinking: bool?,
+      probability: bool?,
+      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_svm_model: (String filename, param, model) -> bool
+    def self?.load_svm_model: (String filename) -> [param, model]
+  end
+end
+

metadata

@@ -1,85 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: numo-libsvm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.2
 platform: ruby
 authors:
 - yoshoku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-12 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: '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::Libsvm is a Ruby gem binding to the LIBSVM library.
   LIBSVM is one of the famous libraries that implemented Support Vector Machines,
@@ -92,16 +36,17 @@ extensions:
 - ext/numo/libsvm/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/libsvm/converter.c
 - ext/numo/libsvm/converter.h
 - ext/numo/libsvm/extconf.rb
@@ -122,6 +67,7 @@ files:
 - lib/numo/libsvm.rb
 - lib/numo/libsvm/version.rb
 - numo-libsvm.gemspec
+- sig/numo/libsvm.rbs
 homepage: https://github.com/yoshoku/numo-libsvm
 licenses:
 - BSD-3-Clause
@@ -144,8 +90,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.2.21
 signing_key: 
 specification_version: 4
 summary: Numo::Libsvm is a Ruby gem binding to the LIBSVM library. Numo::Libsvm makes

data/.travis.yml

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