Removed unneeded method

ankane · ankane · commit b5157739c46e · 2024-10-17T10:02:07.000-07:00
diff --git a/lib/xgboost/booster.rb b/lib/xgboost/booster.rb
@@ -44,7 +44,7 @@ def save_config
       length = ::FFI::MemoryPointer.new(:uint64)
       json_string = ::FFI::MemoryPointer.new(:pointer)
       check_call FFI.XGBoosterSaveJsonConfig(handle, length, json_string)
-      json_string.read_pointer.read_string(read_uint64(length)).force_encoding(Encoding::UTF_8)
+      json_string.read_pointer.read_string(length.read_uint64).force_encoding(Encoding::UTF_8)
     end
 
     def attr(key)
@@ -114,7 +114,7 @@ def predict(data, ntree_limit: nil)
       out_len = ::FFI::MemoryPointer.new(:uint64)
       out_result = ::FFI::MemoryPointer.new(:pointer)
       check_call FFI.XGBoosterPredict(handle, data.handle, 0, ntree_limit, 0, out_len, out_result)
-      out = out_result.read_pointer.read_array_of_float(read_uint64(out_len))
+      out = out_result.read_pointer.read_array_of_float(out_len.read_uint64)
       num_class = out.size / data.num_row
       out = out.each_slice(num_class).to_a if num_class > 1
       out
@@ -149,7 +149,7 @@ def num_boosted_rounds
     def num_features
       features = ::FFI::MemoryPointer.new(:uint64)
       check_call FFI.XGBoosterGetNumFeature(handle, features)
-      read_uint64(features)
+      features.read_uint64
     end
 
     def dump_model(fout, fmap: "", with_stats: false, dump_format: "text")
@@ -182,7 +182,7 @@ def dump(fmap: "", with_stats: false, dump_format: "text")
 
       check_call FFI.XGBoosterDumpModelExWithFeatures(handle, 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))
+      out_result.read_pointer.get_array_of_string(0, out_len.read_uint64)
     end
 
     def fscore(fmap: "")
diff --git a/lib/xgboost/dmatrix.rb b/lib/xgboost/dmatrix.rb
@@ -92,25 +92,25 @@ def weight
     def num_row
       out = ::FFI::MemoryPointer.new(:uint64)
       check_call FFI.XGDMatrixNumRow(handle, out)
-      read_uint64(out)
+      out.read_uint64
     end
 
     def num_col
       out = ::FFI::MemoryPointer.new(:uint64)
       check_call FFI.XGDMatrixNumCol(handle, out)
-      read_uint64(out)
+      out.read_uint64
     end
 
     def num_nonmissing
       out = ::FFI::MemoryPointer.new(:uint64)
       check_call FFI.XGDMatrixNumNonMissing(handle, out)
-      read_uint64(out)
+      out.read_uint64
     end
 
     def data_split_mode
       out = ::FFI::MemoryPointer.new(:uint64)
       check_call FFI.XGDMatrixDataSplitMode(handle, out)
-      read_uint64(out) == 0 ? :row : :col
+      out.read_uint64 == 0 ? :row : :col
     end
 
     def slice(rindex)
diff --git a/lib/xgboost/utils.rb b/lib/xgboost/utils.rb
@@ -24,15 +24,10 @@ def string_pointer(value)
 
     def from_cstr_to_rbstr(data, length)
       res = []
-      read_uint64(length).times do |i|
+      length.read_uint64.times do |i|
         res << data.read_pointer[i * ::FFI::Pointer.size].read_pointer.read_string.force_encoding(Encoding::UTF_8)
       end
       res
     end
-
-    # read_uint64 not available on JRuby
-    def read_uint64(ptr)
-      ptr.read_array_of_uint64(1).first
-    end
   end
 end
