numo-liblinear 1.1.2 → 2.0.0

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.2
+  version: 2.0.0
 platform: ruby
 authors:
 - yoshoku
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2022-01-09 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,42 +35,26 @@ extensions:
 - ext/numo/liblinear/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/workflows/build.yml"
-- ".gitignore"
-- ".gitmodules"
-- ".rspec"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- 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
-- ext/numo/liblinear/model.h
-- ext/numo/liblinear/parameter.c
-- ext/numo/liblinear/parameter.h
-- ext/numo/liblinear/problem.c
-- ext/numo/liblinear/problem.h
-- ext/numo/liblinear/solver_type.c
-- ext/numo/liblinear/solver_type.h
+- ext/numo/liblinear/liblinearext.cpp
+- ext/numo/liblinear/liblinearext.hpp
+- ext/numo/liblinear/src/COPYRIGHT
+- ext/numo/liblinear/src/blas/blas.h
+- ext/numo/liblinear/src/blas/blasp.h
+- ext/numo/liblinear/src/blas/daxpy.c
+- ext/numo/liblinear/src/blas/ddot.c
+- ext/numo/liblinear/src/blas/dnrm2.c
+- ext/numo/liblinear/src/blas/dscal.c
+- ext/numo/liblinear/src/linear.cpp
+- ext/numo/liblinear/src/linear.h
+- ext/numo/liblinear/src/newton.cpp
+- ext/numo/liblinear/src/newton.h
 - 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
@@ -149,7 +77,7 @@ 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: Numo::Liblinear is a Ruby gem binding to the LIBLINEAR library. Numo::Liblinear

data/.github/workflows/build.yml

@@ -1,27 +0,0 @@
-name: build
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [ '2.5', '2.6', '2.7' ]
-    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: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Build and test with Rake
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-          bundle exec rake

data/.gitignore

@@ -1,20 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/bin/
-
-# rspec failure tracking
-.rspec_status
-
-*.swp
-*.bundle
-mkmf.log
-tags
-.DS_Store
-.ruby-version

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "ext/numo/liblinear/liblinear"]
-	path = ext/numo/liblinear/liblinear
-	url = https://github.com/cjlin1/liblinear

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at yoshoku@outlook.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in numo-liblinear.gemspec
-gemspec

data/Rakefile

@@ -1,15 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-require 'rake/extensiontask'
-
-task :build => :compile
-
-Rake::ExtensionTask.new('liblinearext') do |ext|
-  ext.ext_dir = 'ext/numo/liblinear'
-  ext.lib_dir = 'lib/numo/liblinear'
-end
-
-task :default => [:clobber, :compile, :spec]

data/ext/numo/liblinear/converter.c

@@ -1,133 +0,0 @@
-#include "converter.h"
-
-VALUE int_vec_to_nary(int* const arr, int const size)
-{
-  int i;
-  size_t shape[1] = { size };
-  VALUE v = rb_narray_new(numo_cInt32, 1, shape);
-  int32_t* vp = (int32_t*)na_get_pointer_for_write(v);
-  for (i = 0; i < size; i++) { vp[i] = (int32_t)arr[i]; }
-  return v;
-}
-
-int* nary_to_int_vec(VALUE vec_val)
-{
-  int i;
-  int n_elements;
-  narray_t* vec_nary;
-  int32_t* vec_pt;
-  int* vec;
-
-  if (vec_val == Qnil) return NULL;
-
-  GetNArray(vec_val, vec_nary);
-  n_elements = (int)NA_SHAPE(vec_nary)[0];
-
-  vec = ALLOC_N(int, n_elements);
-  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;
-}
-
-VALUE dbl_vec_to_nary(double* const arr, int const size)
-{
-  int i;
-  size_t shape[1] = { size };
-  VALUE v = rb_narray_new(numo_cDFloat, 1, shape);
-  double* vp = (double*)na_get_pointer_for_write(v);
-  for (i = 0; i < size; i++) { vp[i] = arr[i]; }
-  return v;
-}
-
-double* nary_to_dbl_vec(VALUE vec_val)
-{
-  int n_elements;
-  narray_t* vec_nary;
-  double* vec_pt;
-  double* vec;
-
-  if (vec_val == Qnil) return NULL;
-
-  GetNArray(vec_val, vec_nary);
-  n_elements = (int)NA_SHAPE(vec_nary)[0];
-
-  vec = ALLOC_N(double, n_elements);
-  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;
-}
-
-VALUE dbl_mat_to_nary(double** const mat, int const n_rows, int const n_cols)
-{
-  int i, j;
-  size_t shape[2] = { n_rows, n_cols };
-  VALUE v = rb_narray_new(numo_cDFloat, 2, shape);
-  double* vp = (double*)na_get_pointer_for_write(v);
-
-  for (i = 0; i < n_rows; i++) {
-    for (j = 0; j < n_cols; j++) {
-      vp[i * n_cols + j] = mat[i][j];
-    }
-  }
-
-  return v;
-}
-
-double** nary_to_dbl_mat(VALUE mat_val)
-{
-  int i, j;
-  int n_rows, n_cols;
-  narray_t* mat_nary;
-  double* mat_pt;
-  double** mat;
-
-  if (mat_val == Qnil) return NULL;
-
-  GetNArray(mat_val, mat_nary);
-  n_rows = (int)NA_SHAPE(mat_nary)[0];
-  n_cols = (int)NA_SHAPE(mat_nary)[1];
-
-  mat_pt = (double*)na_get_pointer_for_read(mat_val);
-  mat = ALLOC_N(double*, n_rows);
-  for (i = 0; i < n_rows; i++) {
-    mat[i] = ALLOC_N(double, n_cols);
-    for (j = 0; j < n_cols; j++) {
-      mat[i][j] = mat_pt[i * n_cols + j];
-    }
-  }
-
-  RB_GC_GUARD(mat_val);
-
-  return mat;
-}
-
-struct feature_node* dbl_vec_to_node(double* const arr, int const size)
-{
-  int i, j;
-  int n_nonzero_elements;
-  struct feature_node* node;
-
-  n_nonzero_elements = 0;
-  for (i = 0; i < size; i++) {
-    if (arr[i] != 0.0) n_nonzero_elements++;
-  }
-
-  node = ALLOC_N(struct feature_node, n_nonzero_elements + 1);
-  for (i = 0, j = 0; i < size; i++) {
-    if (arr[i] != 0.0) {
-      node[j].index = i + 1;
-      node[j].value = arr[i];
-      j++;
-    }
-  }
-  node[n_nonzero_elements].index = -1;
-  node[n_nonzero_elements].value = 0.0;
-
-  return node;
-}

data/ext/numo/liblinear/converter.h

@@ -1,18 +0,0 @@
-#ifndef NUMO_LIBLINEAR_CONVERTER_H
-#define NUMO_LIBLINEAR_CONVERTER_H 1
-
-#include <string.h>
-#include <ruby.h>
-#include <linear.h>
-#include <numo/narray.h>
-#include <numo/template.h>
-
-VALUE int_vec_to_nary(int* const arr, int const size);
-int* nary_to_int_vec(VALUE vec_val);
-VALUE dbl_vec_to_nary(double* const arr, int const size);
-double* nary_to_dbl_vec(VALUE vec_val);
-VALUE dbl_mat_to_nary(double** const mat, int const n_rows, int const n_cols);
-double** nary_to_dbl_mat(VALUE mat_val);
-struct feature_node* dbl_vec_to_node(double* const arr, int const size);
-
-#endif /* NUMO_LIBLINEAR_CONVERTER_H */