[R-package] Use R standard routines to access character data in C++ (#…

…4252) * converted LGBM_BoosterSaveModel_R * switch all other non-params cases * handle params
microsoft · May 4, 2021 · ec87432 · ec87432
1 parent d511f1a
commit ec87432
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 89 deletions.
diff --git a/R-package/R/lgb.Booster.R b/R-package/R/lgb.Booster.R
@@ -90,7 +90,7 @@ Booster <- R6::R6Class(
           # Create booster from model
           .Call(
             LGBM_BoosterCreateFromModelfile_R
-            , lgb.c_str(x = modelfile)
+            , modelfile
             , handle
           )
 
@@ -104,7 +104,7 @@ Booster <- R6::R6Class(
           # Create booster from model
           .Call(
             LGBM_BoosterLoadModelFromString_R
-            , lgb.c_str(x = model_str)
+            , model_str
             , handle
           )
 
@@ -452,7 +452,7 @@ Booster <- R6::R6Class(
         , private$handle
         , as.integer(num_iteration)
         , as.integer(feature_importance_type)
-        , lgb.c_str(x = filename)
+        , filename
       )
 
       return(invisible(self))

diff --git a/R-package/R/lgb.Dataset.R b/R-package/R/lgb.Dataset.R
@@ -202,7 +202,7 @@ Dataset <- R6::R6Class(
 
           .Call(
             LGBM_DatasetCreateFromFile_R
-            , lgb.c_str(x = private$raw_data)
+            , private$raw_data
             , params_str
             , ref_handle
             , handle
@@ -436,7 +436,7 @@ Dataset <- R6::R6Class(
         .Call(
           LGBM_DatasetSetFeatureNames_R
           , private$handle
-          , lgb.c_str(x = merged_name)
+          , merged_name
         )
 
       }
@@ -468,7 +468,7 @@ Dataset <- R6::R6Class(
         .Call(
           LGBM_DatasetGetFieldSize_R
           , private$handle
-          , lgb.c_str(x = name)
+          , name
           , info_len
         )
 
@@ -486,7 +486,7 @@ Dataset <- R6::R6Class(
           .Call(
             LGBM_DatasetGetField_R
             , private$handle
-            , lgb.c_str(x = name)
+            , name
             , ret
           )
 
@@ -527,7 +527,7 @@ Dataset <- R6::R6Class(
           .Call(
             LGBM_DatasetSetField_R
             , private$handle
-            , lgb.c_str(x = name)
+            , name
             , info
             , length(info)
           )
@@ -678,7 +678,7 @@ Dataset <- R6::R6Class(
       .Call(
         LGBM_DatasetSaveBinary_R
         , private$handle
-        , lgb.c_str(x = fname)
+        , fname
       )
       return(invisible(self))
     }

diff --git a/R-package/R/lgb.Predictor.R b/R-package/R/lgb.Predictor.R
@@ -39,7 +39,7 @@ Predictor <- R6::R6Class(
         # Create handle on it
         .Call(
           LGBM_BoosterCreateFromModelfile_R
-          , lgb.c_str(x = modelfile)
+          , modelfile
           , handle
         )
         private$need_free_handle <- TRUE
@@ -117,7 +117,7 @@ Predictor <- R6::R6Class(
           , as.integer(start_iteration)
           , as.integer(num_iteration)
           , private$params
-          , lgb.c_str(x = tmp_filename)
+          , tmp_filename
         )
 
         # Get predictions from file

diff --git a/R-package/R/utils.R b/R-package/R/utils.R
@@ -89,10 +89,10 @@ lgb.params2str <- function(params, ...) {
 
   # Check ret length
   if (length(ret) == 0L) {
-    return(lgb.c_str(x = ""))
+    return("")
   }
 
-  return(lgb.c_str(x = paste0(ret, collapse = " ")))
+  return(paste0(ret, collapse = " "))
 
 }
 
@@ -154,13 +154,6 @@ lgb.check_interaction_constraints <- function(interaction_constraints, column_na
 
 }
 
-lgb.c_str <- function(x) {
-
-  ret <- charToRaw(as.character(x))
-  ret <- c(ret, as.raw(0L))
-  return(ret)
-
-}
 
 lgb.check.r6.class <- function(object, name) {