lightgbm 0.1.8 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b86686bc4575d069e469fb9c8911e93c7dcfb7622a415dc3e7ebee301947c3
-  data.tar.gz: a186cca11d4838fd13573b14ea154fff174804b31ae45236130c30a24f55ff7b
+  metadata.gz: 5fb9ecd85bab15bf4edcf200de81cb1d4a70a743810ca67ca77e28c957d492c8
+  data.tar.gz: 56b063a0ba3f1a2db796e701f5e1d96625b4f03340defd540b160552aa24e577
 SHA512:
-  metadata.gz: 32ef8f452075bcf4441b8e0fcf68e63332c42da61445301ecd0a85b51b2af1b7a730da0810e1b182ff5fdfe184884242a5489469d16e0e9a717d19bb145eb095
-  data.tar.gz: 41b76c5ac174b75ce4e4f21477e4d32a9607b550e70448dde2797a765813d08a6c75de2f7f6d04ea79b4e9fa8afd768d097be516781e27e4eee4f982af364dc0
+  metadata.gz: 69085b60d683816b9286f504c7901b969d8070d0fe3e8dacc7efd4beff99cdf0fca9f094b45235cb4119ea8a19e570c0463d8a21d947f6c0c412c3b41bc1f6a9
+  data.tar.gz: 3e5274aefd850b3590cedbb58e09c96152fe0c166f6a929b373c850fd3c39ee3fcbfdd4b5609c8da22dd019dca1658f6784c5b6e2bd1cc5791507ee10617d57c

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.2.3 (2021-03-09)
+
+- Added ARM shared library for Mac
+
+## 0.2.2 (2020-12-07)
+
+- Updated LightGBM to 3.1.1
+
+## 0.2.1 (2020-11-15)
+
+- Updated LightGBM to 3.1.0
+
+## 0.2.0 (2020-08-31)
+
+- Updated LightGBM to 3.0.0
+- Made `best_iteration` and `eval_hist` consistent with Python
+
+## 0.1.9 (2020-06-10)
+
+- Added support for Rover
+- Improved performance of Numo datasets
+
 ## 0.1.8 (2020-05-09)
 
 - Improved error message when OpenMP not found on Mac

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2019 Andrew Kane
+The MIT License (MIT)
 
-MIT License
+Copyright (c) Microsoft Corporation
+Copyright (c) 2019-2020 Andrew Kane
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -2,7 +2,7 @@
 
 [LightGBM](https://github.com/microsoft/LightGBM) - high performance gradient boosting - for Ruby
 
-[![Build Status](https://travis-ci.org/ankane/lightgbm.svg?branch=master)](https://travis-ci.org/ankane/lightgbm)
+[![Build Status](https://github.com/ankane/lightgbm/workflows/build/badge.svg?branch=master)](https://github.com/ankane/lightgbm/actions)
 
 ## Installation
 
@@ -129,16 +129,22 @@ Data can be an array of arrays
 [[1, 2, 3], [4, 5, 6]]
 ```
 
-Or a Daru data frame
+Or a Numo array
 
 ```ruby
-Daru::DataFrame.from_csv("houses.csv")
+Numo::NArray.cast([[1, 2, 3], [4, 5, 6]])
+```
+
+Or a Rover data frame
+
+```ruby
+Rover.read_csv("houses.csv")
 ```
 
-Or a Numo NArray
+Or a Daru data frame
 
 ```ruby
-Numo::DFloat.new(3, 2).seq
+Daru::DataFrame.from_csv("houses.csv")
 ```
 
 ## Helpful Resources

data/lib/lightgbm.rb

@@ -19,7 +19,12 @@ module LightGBM
   class << self
     attr_accessor :ffi_lib
   end
-  lib_name = "lib_lightgbm.#{::FFI::Platform::LIBSUFFIX}"
+  lib_name =
+    if RbConfig::CONFIG["host_os"] =~ /darwin/i && RbConfig::CONFIG["host_cpu"] =~ /arm/i
+      "lib_lightgbm.arm64.#{::FFI::Platform::LIBSUFFIX}"
+    else
+      "lib_lightgbm.#{::FFI::Platform::LIBSUFFIX}"
+    end
   vendor_lib = File.expand_path("../vendor/#{lib_name}", __dir__)
   self.ffi_lib = [lib_name, "lib_lightgbm.so", vendor_lib]
 
@@ -61,16 +66,14 @@ module LightGBM
           # print results
           messages = []
 
+          eval_valid = booster.eval_valid
           if valid_contain_train
-            # not sure why reversed in output
-            booster.eval_train.reverse.each do |res|
-              messages << "%s's %s: %g" % [res[0], res[1], res[2]]
-            end
+            eval_valid = eval_valid + booster.eval_train
           end
-
-          eval_valid = booster.eval_valid
           # not sure why reversed in output
-          eval_valid.reverse.each do |res|
+          eval_valid.reverse!
+
+          eval_valid.each do |res|
             messages << "%s's %s: %g" % [res[0], res[1], res[2]]
           end
 
@@ -188,8 +191,7 @@ module LightGBM
         # use best iteration from first metric if not stopped early
         best_iteration ||= best_iter[best_iter.keys.first]
         eval_hist.each_key do |k|
-          # TODO uncomment for 0.2.0
-          # eval_hist[k] = eval_hist[k].first(best_iteration + 1)
+          eval_hist[k] = eval_hist[k].first(best_iteration + 1)
         end
       end
 

data/lib/lightgbm/booster.rb

@@ -39,11 +39,12 @@ module LightGBM
       buffer_len = 1 << 20
       out_len = ::FFI::MemoryPointer.new(:int64)
       out_str = ::FFI::MemoryPointer.new(:char, buffer_len)
-      check_result FFI.LGBM_BoosterDumpModel(handle_pointer, start_iteration, num_iteration, buffer_len, out_len, out_str)
+      feature_importance_type = 0 # TODO add option
+      check_result FFI.LGBM_BoosterDumpModel(handle_pointer, start_iteration, num_iteration, feature_importance_type, buffer_len, out_len, out_str)
       actual_len = read_int64(out_len)
       if actual_len > buffer_len
         out_str = ::FFI::MemoryPointer.new(:char, actual_len)
-        check_result FFI.LGBM_BoosterDumpModel(handle_pointer, start_iteration, num_iteration, actual_len, out_len, out_str)
+        check_result FFI.LGBM_BoosterDumpModel(handle_pointer, start_iteration, num_iteration, feature_importance_type, actual_len, out_len, out_str)
       end
       out_str.read_string
     end
@@ -86,11 +87,12 @@ module LightGBM
       buffer_len = 1 << 20
       out_len = ::FFI::MemoryPointer.new(:int64)
       out_str = ::FFI::MemoryPointer.new(:char, buffer_len)
-      check_result FFI.LGBM_BoosterSaveModelToString(handle_pointer, start_iteration, num_iteration, buffer_len, out_len, out_str)
+      feature_importance_type = 0 # TODO add option
+      check_result FFI.LGBM_BoosterSaveModelToString(handle_pointer, start_iteration, num_iteration, feature_importance_type, buffer_len, out_len, out_str)
       actual_len = read_int64(out_len)
       if actual_len > buffer_len
         out_str = ::FFI::MemoryPointer.new(:char, actual_len)
-        check_result FFI.LGBM_BoosterSaveModelToString(handle_pointer, start_iteration, num_iteration, actual_len, out_len, out_str)
+        check_result FFI.LGBM_BoosterSaveModelToString(handle_pointer, start_iteration, num_iteration, feature_importance_type, actual_len, out_len, out_str)
       end
       out_str.read_string
     end
@@ -115,7 +117,7 @@ module LightGBM
     end
 
     # TODO support different prediction types
-    def predict(input, num_iteration: nil, **params)
+    def predict(input, start_iteration: nil, num_iteration: nil, **params)
       input =
         if daru?(input)
           input.map_rows(&:to_a)
@@ -126,6 +128,7 @@ module LightGBM
       singular = !input.first.is_a?(Array)
       input = [input] if singular
 
+      start_iteration ||= 0
       num_iteration ||= best_iteration
       num_class ||= num_class()
 
@@ -136,7 +139,7 @@ module LightGBM
 
       out_len = ::FFI::MemoryPointer.new(:int64)
       out_result = ::FFI::MemoryPointer.new(:double, num_class * input.count)
-      check_result FFI.LGBM_BoosterPredictForMat(handle_pointer, data, 1, input.count, input.first.count, 1, 0, num_iteration, params_str(params), out_len, out_result)
+      check_result FFI.LGBM_BoosterPredictForMat(handle_pointer, data, 1, input.count, input.first.count, 1, 0, start_iteration, num_iteration, params_str(params), out_len, out_result)
       out = out_result.read_array_of_double(read_int64(out_len))
       out = out.each_slice(num_class).to_a if num_class > 1
 
@@ -145,7 +148,8 @@ module LightGBM
 
     def save_model(filename, num_iteration: nil, start_iteration: 0)
       num_iteration ||= best_iteration
-      check_result FFI.LGBM_BoosterSaveModel(handle_pointer, start_iteration, num_iteration, filename)
+      feature_importance_type = 0 # TODO add
+      check_result FFI.LGBM_BoosterSaveModel(handle_pointer, start_iteration, num_iteration, feature_importance_type, filename)
       self # consistent with Python API
     end
 
@@ -175,10 +179,12 @@ module LightGBM
     def eval_names
       eval_counts ||= eval_counts()
       out_len = ::FFI::MemoryPointer.new(:int)
+      out_buffer_len = ::FFI::MemoryPointer.new(:size_t)
       out_strs = ::FFI::MemoryPointer.new(:pointer, eval_counts)
-      str_ptrs = eval_counts.times.map { ::FFI::MemoryPointer.new(:char, 255) }
+      buffer_len = 255
+      str_ptrs = eval_counts.times.map { ::FFI::MemoryPointer.new(:char, buffer_len) }
       out_strs.write_array_of_pointer(str_ptrs)
-      check_result FFI.LGBM_BoosterGetEvalNames(handle_pointer, out_len, out_strs)
+      check_result FFI.LGBM_BoosterGetEvalNames(handle_pointer, eval_counts, out_len, buffer_len, out_buffer_len, out_strs)
       str_ptrs.map(&:read_string)
     end
 

data/lib/lightgbm/dataset.rb

@@ -27,10 +27,13 @@ module LightGBM
     def feature_names
       # must preallocate space
       num_feature_names = ::FFI::MemoryPointer.new(:int)
-      out_strs = ::FFI::MemoryPointer.new(:pointer, 1000)
-      str_ptrs = 1000.times.map { ::FFI::MemoryPointer.new(:char, 255) }
+      out_buffer_len = ::FFI::MemoryPointer.new(:size_t)
+      len = 1000
+      out_strs = ::FFI::MemoryPointer.new(:pointer, len)
+      buffer_len = 255
+      str_ptrs = len.times.map { ::FFI::MemoryPointer.new(:char, buffer_len) }
       out_strs.write_array_of_pointer(str_ptrs)
-      check_result FFI.LGBM_DatasetGetFeatureNames(handle_pointer, out_strs, num_feature_names)
+      check_result FFI.LGBM_DatasetGetFeatureNames(handle_pointer, len, num_feature_names, buffer_len, out_buffer_len, out_strs)
       str_ptrs[0, num_feature_names.read_int].map(&:read_string)
     end
 
@@ -130,18 +133,23 @@ module LightGBM
         elsif daru?(data)
           nrow, ncol = data.shape
           flat_data = data.map_rows(&:to_a).flatten
-        elsif narray?(data)
+        elsif numo?(data) || rover?(data)
+          data = data.to_numo if rover?(data)
           nrow, ncol = data.shape
-          flat_data = data.flatten.to_a
         else
           nrow = data.count
           ncol = data.first.count
           flat_data = data.flatten
         end
 
-        handle_missing(flat_data)
         c_data = ::FFI::MemoryPointer.new(:double, nrow * ncol)
-        c_data.write_array_of_double(flat_data)
+        if numo?(data)
+          c_data.write_bytes(data.cast_to(Numo::DFloat).to_string)
+        else
+          handle_missing(flat_data)
+          c_data.write_array_of_double(flat_data)
+        end
+
         check_result FFI.LGBM_DatasetCreateFromMat(c_data, 1, nrow, ncol, 1, parameters, reference, @handle)
       end
       ObjectSpace.define_finalizer(self, self.class.finalize(handle_pointer)) unless used_indices

data/lib/lightgbm/ffi.rb

@@ -5,7 +5,7 @@ module LightGBM
     begin
       ffi_lib LightGBM.ffi_lib
     rescue LoadError => e
-      if e.message.include?("Library not loaded: /usr/local/opt/libomp/lib/libomp.dylib") && e.message.include?("Reason: image not found")
+      if ["/usr/local", "/opt/homebrew"].any? { |v| e.message.include?("Library not loaded: #{v}/opt/libomp/lib/libomp.dylib") } && e.message.include?("Reason: image not found")
         raise LoadError, "OpenMP not found. Run `brew install libomp`"
       else
         raise e
@@ -23,7 +23,7 @@ module LightGBM
     attach_function :LGBM_DatasetCreateFromMat, %i[pointer int int32 int32 int string pointer pointer], :int
     attach_function :LGBM_DatasetGetSubset, %i[pointer pointer int32 string pointer], :int
     attach_function :LGBM_DatasetSetFeatureNames, %i[pointer pointer int], :int
-    attach_function :LGBM_DatasetGetFeatureNames, %i[pointer pointer pointer], :int
+    attach_function :LGBM_DatasetGetFeatureNames, %i[pointer int pointer size_t pointer pointer], :int
     attach_function :LGBM_DatasetFree, %i[pointer], :int
     attach_function :LGBM_DatasetSaveBinary, %i[pointer string], :int
     attach_function :LGBM_DatasetDumpText, %i[pointer string], :int
@@ -44,13 +44,13 @@ module LightGBM
     attach_function :LGBM_BoosterNumModelPerIteration, %i[pointer pointer], :int
     attach_function :LGBM_BoosterNumberOfTotalModel, %i[pointer pointer], :int
     attach_function :LGBM_BoosterGetEvalCounts, %i[pointer pointer], :int
-    attach_function :LGBM_BoosterGetEvalNames, %i[pointer pointer pointer], :int
+    attach_function :LGBM_BoosterGetEvalNames, %i[pointer int pointer size_t pointer pointer], :int
     attach_function :LGBM_BoosterGetNumFeature, %i[pointer pointer], :int
     attach_function :LGBM_BoosterGetEval, %i[pointer int pointer pointer], :int
-    attach_function :LGBM_BoosterPredictForMat, %i[pointer pointer int int32 int32 int int int string pointer pointer], :int
-    attach_function :LGBM_BoosterSaveModel, %i[pointer int int string], :int
-    attach_function :LGBM_BoosterSaveModelToString, %i[pointer int int int64 pointer pointer], :int
-    attach_function :LGBM_BoosterDumpModel, %i[pointer int int int64 pointer pointer], :int
+    attach_function :LGBM_BoosterPredictForMat, %i[pointer pointer int int32 int32 int int int int string pointer pointer], :int
+    attach_function :LGBM_BoosterSaveModel, %i[pointer int int int string], :int
+    attach_function :LGBM_BoosterSaveModelToString, %i[pointer int int int int64 pointer pointer], :int
+    attach_function :LGBM_BoosterDumpModel, %i[pointer int int int int64 pointer pointer], :int
     attach_function :LGBM_BoosterFeatureImportance, %i[pointer int int pointer], :int
   end
 end

data/lib/lightgbm/utils.rb

@@ -37,8 +37,12 @@ module LightGBM
       defined?(Daru::DataFrame) && data.is_a?(Daru::DataFrame)
     end
 
-    def narray?(data)
+    def numo?(data)
       defined?(Numo::NArray) && data.is_a?(Numo::NArray)
     end
+
+    def rover?(data)
+      defined?(Rover::DataFrame) && data.is_a?(Rover::DataFrame)
+    end
   end
 end

data/lib/lightgbm/version.rb

@@ -1,3 +1,3 @@
 module LightGBM
-  VERSION = "0.1.8"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightgbm
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.3
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,63 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: daru
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
+description:
 email: andrew@chartkick.com
 executables: []
 extensions: []
@@ -100,6 +44,7 @@ files:
 - lib/lightgbm/utils.rb
 - lib/lightgbm/version.rb
 - vendor/LICENSE
+- vendor/lib_lightgbm.arm64.dylib
 - vendor/lib_lightgbm.dll
 - vendor/lib_lightgbm.dylib
 - vendor/lib_lightgbm.so
@@ -107,7 +52,7 @@ homepage: https://github.com/ankane/lightgbm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +67,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.3
+signing_key:
 specification_version: 4
 summary: High performance gradient boosting for Ruby
 test_files: []