lightgbm 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3405aa832aaa365ce38d59bf5a36b318f8d02c1a236ea144eb9b102bf7f07e
-  data.tar.gz: 5be378b94486a668fffdc276a73ff62f24a24b644932bd776fd877f4b69b157a
+  metadata.gz: ec446571f84421dcaf4d9453dce40aabdd8e76534e263b8de52566efc1d94560
+  data.tar.gz: 4be2791d0753e1f8848581c84c80c8952aa131e3eb33435293b37beee963ae19
 SHA512:
-  metadata.gz: 914379fe9271306117fc222534915f3c19de1c6b165ecc053f49b9089da0b85594c8430958f03f28a23d98fcf2879c4948c8d3e5fecee920c2984700928380ec
-  data.tar.gz: 4f93ae6b4a2c3123d452ecf41d7ada8473af397f12ddafb4e34b4e552aae4b6ef23ecb75b54ce3f7f64ba0985402c6172070de4afaca2ea614875f6d91c2de1a
+  metadata.gz: 03317e8af302bfbe6d3cd6b5d9499696c249bcfadaa0d265ca04cbd4b0d5801a1379cefc6789b1d0ad7e4d3ef1e2f9f3728f3654195823b55821b226141e41e8
+  data.tar.gz: b94edee304531f64a605785a707fdc4ae3b1d7879a121d98708ce5f32eef747d483f396e6a164f3fad76e0d0dcb63b46a05f68fa7fb57f3d7c6c2e1070ecabbe

data/CHANGELOG.md

@@ -1,6 +1,27 @@
+## 0.2.5 (2021-07-07)
+
+- Added `feature_name` method to boosters
+
+## 0.2.4 (2021-03-26)
+
+- Updated LightGBM to 3.2.0
+
+## 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)
 

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
 

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]
 

data/lib/lightgbm/booster.rb

@@ -76,6 +76,26 @@ module LightGBM
       out_result.read_array_of_double(num_feature).map(&:to_i)
     end
 
+    def feature_name
+      len = self.num_feature
+      out_len = ::FFI::MemoryPointer.new(:size_t)
+      buffer_len = 255
+      out_buffer_len = ::FFI::MemoryPointer.new(:size_t)
+      out_strs = ::FFI::MemoryPointer.new(:pointer, num_feature)
+      str_ptrs = len.times.map { ::FFI::MemoryPointer.new(:char, buffer_len) }
+      out_strs.write_array_of_pointer(str_ptrs)
+      check_result FFI.LGBM_BoosterGetFeatureNames(handle_pointer, len, out_len, buffer_len, out_buffer_len, out_strs)
+
+      actual_len = out_buffer_len.read(:size_t)
+      if actual_len > buffer_len
+        str_ptrs = len.times.map { ::FFI::MemoryPointer.new(:char, actual_len) }
+        out_strs.write_array_of_pointer(str_ptrs)
+        check_result FFI.LGBM_BoosterGetFeatureNames(handle_pointer, len, out_len, actual_len, out_buffer_len, out_strs)
+      end
+
+      str_ptrs[0, out_len.read(:size_t)].map(&:read_string)
+    end
+
     def model_from_string(model_str)
       out_num_iterations = ::FFI::MemoryPointer.new(:int)
       check_result FFI.LGBM_BoosterLoadModelFromString(model_str, out_num_iterations, @handle)
@@ -185,6 +205,14 @@ module LightGBM
       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, eval_counts, out_len, buffer_len, out_buffer_len, out_strs)
+
+      actual_len = out_buffer_len.read(:size_t)
+      if actual_len > buffer_len
+        str_ptrs = eval_counts.times.map { ::FFI::MemoryPointer.new(:char, actual_len) }
+        out_strs.write_array_of_pointer(str_ptrs)
+        check_result FFI.LGBM_BoosterGetEvalNames(handle_pointer, eval_counts, out_len, actual_len, out_buffer_len, out_strs)
+      end
+
       str_ptrs.map(&:read_string)
     end
 

data/lib/lightgbm/dataset.rb

@@ -34,6 +34,18 @@ module LightGBM
       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, len, num_feature_names, buffer_len, out_buffer_len, out_strs)
+
+      num_features = num_feature_names.read_int
+      actual_len = out_buffer_len.read(:size_t)
+      if num_features > len || actual_len > buffer_len
+        out_strs = ::FFI::MemoryPointer.new(:pointer, num_features) if num_features > len
+        str_ptrs = num_features.times.map { ::FFI::MemoryPointer.new(:char, actual_len) }
+        out_strs.write_array_of_pointer(str_ptrs)
+        check_result FFI.LGBM_DatasetGetFeatureNames(handle_pointer, num_features, num_feature_names, actual_len, out_buffer_len, out_strs)
+      end
+
+      # should be the same, but get number of features
+      # from most recent call (instead of num_features)
       str_ptrs[0, num_feature_names.read_int].map(&:read_string)
     end
 

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
@@ -45,6 +45,7 @@ module LightGBM
     attach_function :LGBM_BoosterNumberOfTotalModel, %i[pointer pointer], :int
     attach_function :LGBM_BoosterGetEvalCounts, %i[pointer pointer], :int
     attach_function :LGBM_BoosterGetEvalNames, %i[pointer int pointer size_t pointer pointer], :int
+    attach_function :LGBM_BoosterGetFeatureNames, %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 int string pointer pointer], :int

data/lib/lightgbm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightgbm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2021-07-07 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: []