xgb 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79a40c703992619e8f834ff11e8eff704b96bf5eb0af8a47b4d0ab410cb68fff
-  data.tar.gz: a8924ce9e90ee78d7ad4c98ae659f83e68155dfb5c1e3fcbed4797053c266922
+  metadata.gz: e9ad2900e477bc8e8fa5aca236a49fb4d41d8ec28b3c975049b16023a89cfe60
+  data.tar.gz: 3228781e80b95310a5c874b27fd69ab29ec875e79daf1bdbe99d09178c1ed2b2
 SHA512:
-  metadata.gz: 2401d7accb4a2709c0ee0a9fd76b451bff641775fbe16f884de7b3a1288c7e210b1e3ea1b7b76734f8ff29aa9eac59ab161bb06b92340c7e7744ddf58fb8a8ae
-  data.tar.gz: a256ab14fa84e7b10f54b7f465ccf0b261c1e7854ae85e1715e13e8d591a4fa756d5a2892e4783e2549cf6d9f29ab061438035ba305f7ab23e86341d53effb4a
+  metadata.gz: 228b317e43933701e2b9d3bdd0a1fc9c8781e64e2ec494b63a8be3efa5487350b022b64bcaffb4088e7e24c5698c39f23864248a87277e63d07ed7bd17573a09
+  data.tar.gz: f8cb92f5f10b20bb7342ee126a75cfb44fc85b0bd01e941b2031ad5b957be9c5c6060b22737ac04584f51eb0ed41668431c849a0417484358496606abf3690de

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0 (2020-02-19)
+
+- Updated XGBoost to 1.0.0
+
 ## 0.2.1 (2020-02-11)
 
 - Fixed `Could not find XGBoost` error on some Linux platforms

data/README.md

@@ -12,6 +12,12 @@ Add this line to your application’s Gemfile:
 gem 'xgb'
 ```
 
+On Mac, also install OpenMP:
+
+```sh
+brew install libomp
+```
+
 ## Learning API
 
 Prep your data

data/lib/xgboost.rb

@@ -156,6 +156,14 @@ module XGBoost
       eval_hist
     end
 
+    def lib_version
+      major = ::FFI::MemoryPointer.new(:int)
+      minor = ::FFI::MemoryPointer.new(:int)
+      patch = ::FFI::MemoryPointer.new(:int)
+      FFI.XGBoostVersion(major, minor, patch)
+      "#{major.read_int}.#{minor.read_int}.#{patch.read_int}"
+    end
+
     private
 
     def mean(arr)

data/lib/xgboost/booster.rb

@@ -52,7 +52,7 @@ module XGBoost
       ntree_limit ||= 0
       out_len = ::FFI::MemoryPointer.new(:uint64)
       out_result = ::FFI::MemoryPointer.new(:pointer)
-      check_result FFI.XGBoosterPredict(handle_pointer, data.handle_pointer, 0, ntree_limit, out_len, out_result)
+      check_result FFI.XGBoosterPredict(handle_pointer, data.handle_pointer, 0, ntree_limit, 0, out_len, out_result)
       out = out_result.read_pointer.read_array_of_float(read_uint64(out_len))
       num_class = out.size / data.num_row
       out = out.each_slice(num_class).to_a if num_class > 1

data/lib/xgboost/dmatrix.rb

@@ -60,7 +60,7 @@ module XGBoost
     def group=(group)
       c_data = ::FFI::MemoryPointer.new(:int, group.size)
       c_data.write_array_of_int(group)
-      check_result FFI.XGDMatrixSetGroup(handle_pointer, c_data, group.size)
+      check_result FFI.XGDMatrixSetUIntInfo(handle_pointer, "group", c_data, group.size)
     end
 
     def num_row

data/lib/xgboost/ffi.rb

@@ -7,12 +7,13 @@ module XGBoost
     # https://github.com/dmlc/xgboost/blob/master/include/xgboost/c_api.h
     # keep same order
 
-    # error
+    # general
+    attach_function :XGBoostVersion, %i[pointer pointer pointer], :void
     attach_function :XGBGetLastError, %i[], :string
 
     # dmatrix
     attach_function :XGDMatrixCreateFromMat, %i[pointer uint64 uint64 float pointer], :int
-    attach_function :XGDMatrixSetGroup, %i[pointer pointer uint64], :int
+    attach_function :XGDMatrixSetUIntInfo, %i[pointer string pointer uint64], :int
     attach_function :XGDMatrixNumRow, %i[pointer pointer], :int
     attach_function :XGDMatrixNumCol, %i[pointer pointer], :int
     attach_function :XGDMatrixSliceDMatrix, %i[pointer pointer uint64 pointer], :int
@@ -27,7 +28,7 @@ module XGBoost
     attach_function :XGBoosterEvalOneIter, %i[pointer int pointer pointer uint64 pointer], :int
     attach_function :XGBoosterFree, %i[pointer], :int
     attach_function :XGBoosterSetParam, %i[pointer string string], :int
-    attach_function :XGBoosterPredict, %i[pointer pointer int int pointer pointer], :int
+    attach_function :XGBoosterPredict, %i[pointer pointer int int int pointer pointer], :int
     attach_function :XGBoosterLoadModel, %i[pointer string], :int
     attach_function :XGBoosterSaveModel, %i[pointer string], :int
     attach_function :XGBoosterDumpModelEx, %i[pointer string int string pointer pointer], :int

data/lib/xgboost/model.rb

@@ -2,12 +2,8 @@ module XGBoost
   class Model
     attr_reader :booster
 
-    def initialize(max_depth: 3, learning_rate: 0.1, n_estimators: 100, objective: nil, importance_type: "gain", **options)
-      @params = {
-        max_depth: max_depth,
-        objective: objective,
-        learning_rate: learning_rate
-      }.merge(options)
+    def initialize(n_estimators: 100, importance_type: "gain", **options)
+      @params = options
       @n_estimators = n_estimators
       @importance_type = importance_type
     end

data/lib/xgboost/ranker.rb

@@ -1,6 +1,6 @@
 module XGBoost
   class Ranker < Model
-    def initialize(max_depth: 3, learning_rate: 0.1, n_estimators: 100, objective: "rank:pairwise", importance_type: "gain", **options)
+    def initialize(n_estimators: 100, objective: "rank:pairwise", importance_type: "gain", **options)
       super
     end
 

data/lib/xgboost/version.rb

@@ -1,3 +1,3 @@
 module XGBoost
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xgb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi