Unverified Commit 441f38bb authored by James Lamb's avatar James Lamb Committed by GitHub
Browse files

[R-package] remove lgb.last_error() and LGBM_GetLastError_R() (#4344)

parent 3837e60d
...@@ -15,16 +15,6 @@ lgb.is.null.handle <- function(x) { ...@@ -15,16 +15,6 @@ lgb.is.null.handle <- function(x) {
) )
} }
# [description] Get the most recent error stored on the C++ side and raise it
# as an R error.
lgb.last_error <- function() {
err_msg <- .Call(
LGBM_GetLastError_R
)
stop("api error: ", err_msg)
return(invisible(NULL))
}
lgb.params2str <- function(params) { lgb.params2str <- function(params) {
# Check for a list as input # Check for a list as input
......
...@@ -42,14 +42,6 @@ ...@@ -42,14 +42,6 @@
using LightGBM::Common::Split; using LightGBM::Common::Split;
using LightGBM::Log; using LightGBM::Log;
SEXP LGBM_GetLastError_R() {
SEXP out;
out = PROTECT(Rf_allocVector(STRSXP, 1));
SET_STRING_ELT(out, 0, Rf_mkChar(LGBM_GetLastError()));
UNPROTECT(1);
return out;
}
SEXP LGBM_HandleIsNull_R(SEXP handle) { SEXP LGBM_HandleIsNull_R(SEXP handle) {
return Rf_ScalarLogical(R_ExternalPtrAddr(handle) == NULL); return Rf_ScalarLogical(R_ExternalPtrAddr(handle) == NULL);
} }
...@@ -712,7 +704,6 @@ SEXP LGBM_BoosterDumpModel_R(SEXP handle, ...@@ -712,7 +704,6 @@ SEXP LGBM_BoosterDumpModel_R(SEXP handle,
// .Call() calls // .Call() calls
static const R_CallMethodDef CallEntries[] = { static const R_CallMethodDef CallEntries[] = {
{"LGBM_GetLastError_R" , (DL_FUNC) &LGBM_GetLastError_R , 0},
{"LGBM_HandleIsNull_R" , (DL_FUNC) &LGBM_HandleIsNull_R , 1}, {"LGBM_HandleIsNull_R" , (DL_FUNC) &LGBM_HandleIsNull_R , 1},
{"LGBM_DatasetCreateFromFile_R" , (DL_FUNC) &LGBM_DatasetCreateFromFile_R , 3}, {"LGBM_DatasetCreateFromFile_R" , (DL_FUNC) &LGBM_DatasetCreateFromFile_R , 3},
{"LGBM_DatasetCreateFromCSC_R" , (DL_FUNC) &LGBM_DatasetCreateFromCSC_R , 8}, {"LGBM_DatasetCreateFromCSC_R" , (DL_FUNC) &LGBM_DatasetCreateFromCSC_R , 8},
......
...@@ -11,12 +11,6 @@ ...@@ -11,12 +11,6 @@
#define R_USE_C99_IN_CXX #define R_USE_C99_IN_CXX
#include <Rinternals.h> #include <Rinternals.h>
/*!
* \brief get string message of the last error
* \return err_msg string with error information
*/
LIGHTGBM_C_EXPORT SEXP LGBM_GetLastError_R();
/*! /*!
* \brief check if an R external pointer (like a Booster or Dataset handle) is a null pointer * \brief check if an R external pointer (like a Booster or Dataset handle) is a null pointer
* \param handle handle for a Booster, Dataset, or Predictor * \param handle handle for a Booster, Dataset, or Predictor
......
...@@ -48,30 +48,6 @@ test_that("lgb.params2str() works as expected for a key in params with multiple ...@@ -48,30 +48,6 @@ test_that("lgb.params2str() works as expected for a key in params with multiple
) )
}) })
context("lgb.last_error")
test_that("lgb.last_error() throws an error if there are no errors", {
expect_error({
lgb.last_error()
}, regexp = "Everything is fine")
})
test_that("lgb.last_error() correctly returns errors from the C++ side", {
testthat::skip(paste0(
"Skipping this test because it causes valgrind to think "
, "there is a memory leak, and needs to be rethought"
))
data(agaricus.train, package = "lightgbm")
train <- agaricus.train
dvalid1 <- lgb.Dataset(
data = train$data
, label = as.matrix(rnorm(5L))
)
expect_error({
dvalid1$construct()
}, regexp = "[LightGBM] [Fatal] Length of label is not same with #data", fixed = TRUE)
})
context("lgb.check.eval") context("lgb.check.eval")
test_that("lgb.check.eval works as expected with no metric", { test_that("lgb.check.eval works as expected with no metric", {
......
...@@ -372,7 +372,7 @@ writeLines(description_contents, DESCRIPTION_FILE) ...@@ -372,7 +372,7 @@ writeLines(description_contents, DESCRIPTION_FILE)
# CMake-based builds can't currently use R's builtin routine registration, # CMake-based builds can't currently use R's builtin routine registration,
# so have to update NAMESPACE manually, with a statement like this: # so have to update NAMESPACE manually, with a statement like this:
# #
# useDynLib(lib_lightgbm, LGBM_GetLastError_R, LGBM_DatasetCreateFromFile_R, ...) # useDynLib(lib_lightgbm, LGBM_DatasetCreateFromFile_R, ...)
# #
# See https://cran.r-project.org/doc/manuals/r-release/R-exts.html#useDynLib for # See https://cran.r-project.org/doc/manuals/r-release/R-exts.html#useDynLib for
# documentation of this approach, where the NAMESPACE file uses a statement like # documentation of this approach, where the NAMESPACE file uses a statement like
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment