rumale-linear_model 0.29.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cc6c5d320ed04274b92e393a66f5b40ac24ce1889191aa9c19602c98e944b265
4
- data.tar.gz: 44746c38b9c4caf13e625fa91a2d62800698d11f90fa09f060a51066998c19e2
3
+ metadata.gz: d94e100047d62ff2e77327ad220d2eade27698c7d4e844cef67e90e5662441c9
4
+ data.tar.gz: 4227244698e1d342b24caf5d05fdb3078673dff51b35f4d5c7ba84b797a9edb1
5
5
  SHA512:
6
- metadata.gz: aa76f6bf953a5b426881183aafef7608c1b49573e86d415e3c81194773544066dcc51ffcd9675bd8f203833261bc402ea1468d2ce19ff95b817c1f846179c79e
7
- data.tar.gz: d7875bd2808b7180217c51ac7f0250d8bc702b27ea2409f3f7b1862fdae4cb377175b62a264ebd6233d65cdf9b0c1e79fac325bcc3fb62c1c01f1fb6f4b82e13
6
+ metadata.gz: d2ebdfe5f5b781901f781c8cb76079673bef6319390cb96278918e7847be26325f30d5dbcd2a629607be7afbc98a42271a7b6fd844505daa9b65ad63481506c4
7
+ data.tar.gz: b61a81ed75ff2063cd269bbaa664b661e02ded313983edb4871277db75ff889397eae0b7fa50082890bb590442648918a23831a2a78ac6b884d64e526b64109e
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'lbfgsb'
3
+ require 'numo/optimize'
4
4
 
5
5
  require 'rumale/base/estimator'
6
6
  require 'rumale/base/regressor'
@@ -116,9 +116,9 @@ module Rumale
116
116
  n_outputs = single_target?(base_y) ? 1 : base_y.shape[1]
117
117
  w_init = Numo::DFloat.zeros(n_outputs * n_features)
118
118
 
119
- res = Lbfgsb.minimize(
119
+ res = Numo::Optimize.minimize(
120
120
  fnc: fnc, jcb: true, x_init: w_init, args: [base_x, base_y],
121
- maxiter: @params[:max_iter], factr: @params[:tol] / Lbfgsb::DBL_EPSILON,
121
+ maxiter: @params[:max_iter], factr: @params[:tol] / Numo::Optimize::Lbfgsb::DBL_EPSILON,
122
122
  verbose: @params[:verbose] ? 1 : -1
123
123
  )
124
124
 
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'lbfgsb'
3
+ require 'numo/optimize'
4
4
 
5
5
  require 'rumale/utils'
6
6
  require 'rumale/validation'
@@ -44,7 +44,7 @@ module Rumale
44
44
  # If zero or less is given, it becomes equal to the number of processors.
45
45
  # This parameter is ignored if the Parallel gem is not loaded.
46
46
  # @param verbose [Boolean] The flag indicating whether to output loss during iteration.
47
- # 'iterate.dat' file is generated by lbfgsb.rb.
47
+ # 'iterate.dat' file is generated by numo-optimize.
48
48
  def initialize(reg_param: 1.0, fit_bias: true, bias_scale: 1.0, max_iter: 1000, tol: 1e-4, n_jobs: nil, verbose: false)
49
49
  super()
50
50
  @params = {
@@ -144,9 +144,9 @@ module Rumale
144
144
  n_features = base_x.shape[1]
145
145
  w_init = Numo::DFloat.zeros(n_classes * n_features)
146
146
 
147
- res = Lbfgsb.minimize(
147
+ res = Numo::Optimize.minimize(
148
148
  fnc: fnc, jcb: true, x_init: w_init, args: [base_x, onehot_y, @params[:reg_param]],
149
- maxiter: @params[:max_iter], factr: @params[:tol] / Lbfgsb::DBL_EPSILON,
149
+ maxiter: @params[:max_iter], factr: @params[:tol] / Numo::Optimize::Lbfgsb::DBL_EPSILON,
150
150
  verbose: @params[:verbose] ? 1 : -1
151
151
  )
152
152
 
@@ -165,9 +165,9 @@ module Rumale
165
165
  n_features = base_x.shape[1]
166
166
  w_init = Numo::DFloat.zeros(n_features)
167
167
 
168
- res = Lbfgsb.minimize(
168
+ res = Numo::Optimize.minimize(
169
169
  fnc: fnc, jcb: true, x_init: w_init, args: [base_x, bin_y, @params[:reg_param]],
170
- maxiter: @params[:max_iter], factr: @params[:tol] / Lbfgsb::DBL_EPSILON,
170
+ maxiter: @params[:max_iter], factr: @params[:tol] / Numo::Optimize::Lbfgsb::DBL_EPSILON,
171
171
  verbose: @params[:verbose] ? 1 : -1
172
172
  )
173
173
 
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'lbfgsb'
3
+ require 'numo/optimize'
4
4
 
5
5
  require 'rumale/base/regressor'
6
6
  require 'rumale/validation'
@@ -67,9 +67,10 @@ module Rumale
67
67
  bounds = Numo::DFloat.zeros(n_outputs * n_features, 2)
68
68
  bounds.shape[0].times { |n| bounds[n, 1] = Float::INFINITY }
69
69
 
70
- res = Lbfgsb.minimize(
70
+ res = Numo::Optimize.minimize(
71
71
  fnc: method(:nnls_fnc), jcb: true, x_init: w_init, args: [x, y, @params[:reg_param]], bounds: bounds,
72
- maxiter: @params[:max_iter], factr: @params[:tol] / Lbfgsb::DBL_EPSILON, verbose: @params[:verbose] ? 1 : -1
72
+ maxiter: @params[:max_iter], factr: @params[:tol] / Numo::Optimize::Lbfgsb::DBL_EPSILON,
73
+ verbose: @params[:verbose] ? 1 : -1
73
74
  )
74
75
 
75
76
  @n_iter = res[:n_iter]
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'lbfgsb'
3
+ require 'numo/optimize'
4
4
 
5
5
  require 'rumale/base/regressor'
6
6
  require 'rumale/validation'
@@ -119,9 +119,9 @@ module Rumale
119
119
  n_outputs = single_target?(base_y) ? 1 : base_y.shape[1]
120
120
  w_init = Numo::DFloat.zeros(n_outputs * n_features)
121
121
 
122
- res = Lbfgsb.minimize(
122
+ res = Numo::Optimize.minimize(
123
123
  fnc: fnc, jcb: true, x_init: w_init, args: [base_x, base_y, @params[:reg_param]],
124
- maxiter: @params[:max_iter], factr: @params[:tol] / Lbfgsb::DBL_EPSILON,
124
+ maxiter: @params[:max_iter], factr: @params[:tol] / Numo::Optimize::Lbfgsb::DBL_EPSILON,
125
125
  verbose: @params[:verbose] ? 1 : -1
126
126
  )
127
127
 
@@ -191,7 +191,7 @@ module Rumale
191
191
  class SGDEstimator < Rumale::LinearModel::BaseEstimator
192
192
  # Create an initial linear model with SGD.
193
193
  def initialize
194
- super()
194
+ super
195
195
  @params = {
196
196
  learning_rate: 0.01,
197
197
  decay: nil,
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'lbfgsb'
3
+ require 'numo/optimize'
4
4
 
5
5
  require 'rumale/base/classifier'
6
6
  require 'rumale/probabilistic_output'
@@ -46,7 +46,7 @@ module Rumale
46
46
  # If zero or less is given, it becomes equal to the number of processors.
47
47
  # This parameter is ignored if the Parallel gem is not loaded.
48
48
  # @param verbose [Boolean] The flag indicating whether to output loss during iteration.
49
- # 'iterate.dat' file is generated by lbfgsb.rb.
49
+ # 'iterate.dat' file is generated by numo-optimize.
50
50
  def initialize(reg_param: 1.0, fit_bias: true, bias_scale: 1.0, max_iter: 1000, tol: 1e-4, probability: false,
51
51
  n_jobs: nil, verbose: false)
52
52
  super()
@@ -176,9 +176,9 @@ module Rumale
176
176
  n_features = base_x.shape[1]
177
177
  w_init = Numo::DFloat.zeros(n_features)
178
178
 
179
- res = Lbfgsb.minimize(
179
+ res = Numo::Optimize.minimize(
180
180
  fnc: fnc, jcb: true, x_init: w_init, args: [base_x, bin_y, @params[:reg_param]],
181
- maxiter: @params[:max_iter], factr: @params[:tol] / Lbfgsb::DBL_EPSILON,
181
+ maxiter: @params[:max_iter], factr: @params[:tol] / Numo::Optimize::Lbfgsb::DBL_EPSILON,
182
182
  verbose: @params[:verbose] ? 1 : -1
183
183
  )
184
184
 
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'lbfgsb'
3
+ require 'numo/optimize'
4
4
 
5
5
  require 'rumale/base/regressor'
6
6
  require 'rumale/validation'
@@ -115,9 +115,9 @@ module Rumale
115
115
  n_features = base_x.shape[1]
116
116
  w_init = Numo::DFloat.zeros(n_features)
117
117
 
118
- res = Lbfgsb.minimize(
118
+ res = Numo::Optimize.minimize(
119
119
  fnc: fnc, jcb: true, x_init: w_init, args: [base_x, single_y, @params[:epsilon], @params[:reg_param]],
120
- maxiter: @params[:max_iter], factr: @params[:tol] / Lbfgsb::DBL_EPSILON,
120
+ maxiter: @params[:max_iter], factr: @params[:tol] / Numo::Optimize::Lbfgsb::DBL_EPSILON,
121
121
  verbose: @params[:verbose] ? 1 : -1
122
122
  )
123
123
 
@@ -5,6 +5,6 @@ module Rumale
5
5
  # This module consists of the classes that implement generalized linear models.
6
6
  module LinearModel
7
7
  # @!visibility private
8
- VERSION = '0.29.0'
8
+ VERSION = '2.0.0'
9
9
  end
10
10
  end
metadata CHANGED
@@ -1,57 +1,56 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rumale-linear_model
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.29.0
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - yoshoku
8
- autorequire:
9
8
  bindir: exe
10
9
  cert_chain: []
11
- date: 2024-03-30 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
12
11
  dependencies:
13
12
  - !ruby/object:Gem::Dependency
14
- name: lbfgsb
13
+ name: numo-narray-alt
15
14
  requirement: !ruby/object:Gem::Requirement
16
15
  requirements:
17
- - - ">="
16
+ - - "~>"
18
17
  - !ruby/object:Gem::Version
19
- version: 0.3.0
18
+ version: 0.9.4
20
19
  type: :runtime
21
20
  prerelease: false
22
21
  version_requirements: !ruby/object:Gem::Requirement
23
22
  requirements:
24
- - - ">="
23
+ - - "~>"
25
24
  - !ruby/object:Gem::Version
26
- version: 0.3.0
25
+ version: 0.9.4
27
26
  - !ruby/object:Gem::Dependency
28
- name: numo-narray
27
+ name: numo-optimize
29
28
  requirement: !ruby/object:Gem::Requirement
30
29
  requirements:
31
- - - ">="
30
+ - - "~>"
32
31
  - !ruby/object:Gem::Version
33
- version: 0.9.1
32
+ version: '0.2'
34
33
  type: :runtime
35
34
  prerelease: false
36
35
  version_requirements: !ruby/object:Gem::Requirement
37
36
  requirements:
38
- - - ">="
37
+ - - "~>"
39
38
  - !ruby/object:Gem::Version
40
- version: 0.9.1
39
+ version: '0.2'
41
40
  - !ruby/object:Gem::Dependency
42
41
  name: rumale-core
43
42
  requirement: !ruby/object:Gem::Requirement
44
43
  requirements:
45
44
  - - "~>"
46
45
  - !ruby/object:Gem::Version
47
- version: 0.29.0
46
+ version: 2.0.0
48
47
  type: :runtime
49
48
  prerelease: false
50
49
  version_requirements: !ruby/object:Gem::Requirement
51
50
  requirements:
52
51
  - - "~>"
53
52
  - !ruby/object:Gem::Version
54
- version: 0.29.0
53
+ version: 2.0.0
55
54
  description: |
56
55
  Rumale::LinearModel provides linear model algorithms,
57
56
  such as Logistic Regression, Support Vector Machine, Lasso, and Ridge Regression
@@ -87,7 +86,6 @@ metadata:
87
86
  changelog_uri: https://github.com/yoshoku/rumale/blob/main/CHANGELOG.md
88
87
  documentation_uri: https://yoshoku.github.io/rumale/doc/
89
88
  rubygems_mfa_required: 'true'
90
- post_install_message:
91
89
  rdoc_options: []
92
90
  require_paths:
93
91
  - lib
@@ -102,8 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
102
100
  - !ruby/object:Gem::Version
103
101
  version: '0'
104
102
  requirements: []
105
- rubygems_version: 3.5.7
106
- signing_key:
103
+ rubygems_version: 3.6.9
107
104
  specification_version: 4
108
105
  summary: Rumale::LinearModel provides linear model algorithms with Rumale interface.
109
106
  test_files: []