lightgbm 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4aac9eac1ab0dadbf31d1e1fc2714e75a8c37075538aef5c53b42df1c34f658
-  data.tar.gz: ca3a1043c55184992b3fac611963062d01747449f6170719ef1f299d4f0474c9
+  metadata.gz: 2b3405aa832aaa365ce38d59bf5a36b318f8d02c1a236ea144eb9b102bf7f07e
+  data.tar.gz: 5be378b94486a668fffdc276a73ff62f24a24b644932bd776fd877f4b69b157a
 SHA512:
-  metadata.gz: c2f14ccc3b40690060d2ee533cfe46e137f40e91520aab3eb188a8a03a697a6956853b717e743cd357d0a059836fc32e9e0aa0fbe5a7dd4263b1ff3e94e79601
-  data.tar.gz: 64abdb43f4c45222dcbb39ddde1d21350b2b4958439dc84d8f13684f4e9bcd3aa2c0e49aa8fd9ae1dfc09b8bc0ce69592e95aab0542684f3c952e9e67ac4689f
+  metadata.gz: 914379fe9271306117fc222534915f3c19de1c6b165ecc053f49b9089da0b85594c8430958f03f28a23d98fcf2879c4948c8d3e5fecee920c2984700928380ec
+  data.tar.gz: 4f93ae6b4a2c3123d452ecf41d7ada8473af397f12ddafb4e34b4e552aae4b6ef23ecb75b54ce3f7f64ba0985402c6172070de4afaca2ea614875f6d91c2de1a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.0 (2020-08-31)
+
+- Updated LightGBM to 3.0.0
+
 ## 0.1.9 (2020-06-10)
 
 - Added support for Rover

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

@@ -129,7 +129,7 @@ Data can be an array of arrays
 [[1, 2, 3], [4, 5, 6]]
 ```
 
-Or a Numo NArray
+Or a Numo array
 
 ```ruby
 Numo::NArray.cast([[1, 2, 3], [4, 5, 6]])

data/lib/lightgbm.rb

@@ -61,16 +61,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 +186,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
 

data/lib/lightgbm/ffi.rb

@@ -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/version.rb

@@ -1,3 +1,3 @@
 module LightGBM
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightgbm
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi