xgb 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ad2900e477bc8e8fa5aca236a49fb4d41d8ec28b3c975049b16023a89cfe60
-  data.tar.gz: 3228781e80b95310a5c874b27fd69ab29ec875e79daf1bdbe99d09178c1ed2b2
+  metadata.gz: 295787749986ba153354f61845509079f470a5d11015c20cb89a5c58f04b133a
+  data.tar.gz: e111099514e9a9a48d51a5033214a3e897eeff209302e47e1f30d79c818833c5
 SHA512:
-  metadata.gz: 228b317e43933701e2b9d3bdd0a1fc9c8781e64e2ec494b63a8be3efa5487350b022b64bcaffb4088e7e24c5698c39f23864248a87277e63d07ed7bd17573a09
-  data.tar.gz: f8cb92f5f10b20bb7342ee126a75cfb44fc85b0bd01e941b2031ad5b957be9c5c6060b22737ac04584f51eb0ed41668431c849a0417484358496606abf3690de
+  metadata.gz: 803003072dafa5d2de97da7721042b94315b125f62f4f524f818923c5e5f8d3277624b146cedd7b88d9ca0769bec074e99717fb27ce56f5d2bf079ba627d52f7
+  data.tar.gz: b9b14da27b6f8c03415d770c31dd16fdd112922daa2af3022df8554301eb5e43d0e873f21c65da13799e7a62d832cadbabff50188783aad5b5e7a577a9334005

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.1 (2020-04-16)
+
+- Added `feature_names` and `feature_types` to `DMatrix`
+- Added feature names to `dump`
+
 ## 0.3.0 (2020-02-19)
 
 - Updated XGBoost to 1.0.0

data/lib/xgboost.rb

@@ -31,7 +31,8 @@ module XGBoost
       booster = Booster.new(params: params)
       num_feature = dtrain.num_col
       booster.set_param("num_feature", num_feature)
-      booster.feature_names = num_feature.times.map { |i| "f#{i}" }
+      booster.feature_names = dtrain.feature_names
+      booster.feature_types = dtrain.feature_types
       evals ||= []
 
       if early_stopping_rounds

data/lib/xgboost/booster.rb

@@ -1,6 +1,6 @@
 module XGBoost
   class Booster
-    attr_accessor :best_iteration, :feature_names
+    attr_accessor :best_iteration, :feature_names, :feature_types
 
     def initialize(params: nil, model_file: nil)
       @handle = ::FFI::MemoryPointer.new(:pointer)
@@ -25,11 +25,8 @@ module XGBoost
     end
 
     def eval_set(evals, iteration)
-      dmats = ::FFI::MemoryPointer.new(:pointer, evals.size)
-      dmats.write_array_of_pointer(evals.map { |v| v[0].handle_pointer })
-
-      evnames = ::FFI::MemoryPointer.new(:pointer, evals.size)
-      evnames.write_array_of_pointer(evals.map { |v| ::FFI::MemoryPointer.from_string(v[1]) })
+      dmats = array_of_pointers(evals.map { |v| v[0].handle_pointer })
+      evnames = array_of_pointers(evals.map { |v| string_pointer(v[1]) })
 
       out_result = ::FFI::MemoryPointer.new(:pointer)
 
@@ -67,7 +64,13 @@ module XGBoost
     def dump(fmap: "", with_stats: false, dump_format: "text")
       out_len = ::FFI::MemoryPointer.new(:uint64)
       out_result = ::FFI::MemoryPointer.new(:pointer)
-      check_result FFI.XGBoosterDumpModelEx(handle_pointer, fmap, with_stats ? 1 : 0, dump_format, out_len, out_result)
+
+      names = feature_names || []
+      fnames = array_of_pointers(names.map { |fname| string_pointer(fname) })
+      ftypes = array_of_pointers(feature_types || Array.new(names.size, string_pointer("float")))
+
+      check_result FFI.XGBoosterDumpModelExWithFeatures(handle_pointer, names.size, fnames, ftypes, with_stats ? 1 : 0, dump_format, out_len, out_result)
+
       out_result.read_pointer.get_array_of_string(0, read_uint64(out_len))
     end
 
@@ -155,7 +158,7 @@ module XGBoost
     end
 
     def [](key_name)
-      key = ::FFI::MemoryPointer.from_string(key_name)
+      key = string_pointer(key_name)
       success = ::FFI::MemoryPointer.new(:int)
       out_result = ::FFI::MemoryPointer.new(:pointer)
 
@@ -165,8 +168,8 @@ module XGBoost
     end
 
     def []=(key_name, raw_value)
-      key = ::FFI::MemoryPointer.from_string(key_name)
-      value = raw_value.nil? ? nil : ::FFI::MemoryPointer.from_string(raw_value)
+      key = string_pointer(key_name)
+      value = raw_value.nil? ? nil : string_pointer(raw_value)
 
       check_result FFI.XGBoosterSetAttr(handle_pointer, key, value)
     end
@@ -188,6 +191,14 @@ module XGBoost
       @handle.read_pointer
     end
 
+    def array_of_pointers(values)
+      ::FFI::MemoryPointer.new(:pointer, values.size).write_array_of_pointer(values)
+    end
+
+    def string_pointer(value)
+      ::FFI::MemoryPointer.from_string(value.to_s)
+    end
+
     include Utils
   end
 end

data/lib/xgboost/dmatrix.rb

@@ -1,6 +1,6 @@
 module XGBoost
   class DMatrix
-    attr_reader :data
+    attr_reader :data, :feature_names, :feature_types
 
     def initialize(data, label: nil, weight: nil, missing: Float::NAN)
       @data = data
@@ -15,6 +15,18 @@ module XGBoost
         elsif daru?(data)
           nrow, ncol = data.shape
           flat_data = data.map_rows(&:to_a).flatten
+          @feature_names = data.each_vector.map(&:name)
+          @feature_types =
+            data.each_vector.map(&:db_type).map do |v|
+              case v
+              when "INTEGER"
+                "int"
+              when "DOUBLE"
+                "float"
+              else
+                raise Error, "Unknown feature type: #{v}"
+              end
+            end
         elsif narray?(data)
           nrow, ncol = data.shape
           flat_data = data.flatten.to_a
@@ -30,6 +42,8 @@ module XGBoost
         check_result FFI.XGDMatrixCreateFromMat(c_data, nrow, ncol, missing, @handle)
 
         ObjectSpace.define_finalizer(self, self.class.finalize(handle_pointer))
+
+        @feature_names ||= ncol.times.map { |i| "f#{i}" }
       end
 
       self.label = label if label

data/lib/xgboost/ffi.rb

@@ -31,7 +31,7 @@ module XGBoost
     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
+    attach_function :XGBoosterDumpModelExWithFeatures, %i[pointer int pointer pointer int string pointer pointer], :int
     attach_function :XGBoosterGetAttr, %i[pointer pointer pointer pointer], :int
     attach_function :XGBoosterSetAttr, %i[pointer pointer pointer], :int
     attach_function :XGBoosterGetAttrNames, %i[pointer pointer pointer], :int

data/lib/xgboost/version.rb

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

metadata

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