From a626b572016c7e661cc2c5e205299199e4dacc53 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 30 Oct 2022 02:41:47 +0000 Subject: [PATCH 1/2] [R-package] fix handling of custom paths in Windows GPU build (fixes #5153) --- build_r.R | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build_r.R b/build_r.R index 64ca29989db9..b73676370187 100644 --- a/build_r.R +++ b/build_r.R @@ -95,23 +95,26 @@ install_libs_content <- .replace_flag("use_msys2", USING_MSYS2, install_libs_con # set up extra flags based on keyword arguments keyword_args <- parsed_args[["keyword_args"]] +print("+-+-+-+-+-") if (length(keyword_args) > 0L) { cmake_args_to_add <- NULL for (i in seq_len(length(keyword_args))) { arg_name <- names(keyword_args)[[i]] define_name <- ARGS_TO_DEFINES[[arg_name]] - arg_value <- shQuote(keyword_args[[arg_name]]) + arg_value <- shQuote(normalizePath(keyword_args[[arg_name]], winslash = "/")) cmake_args_to_add <- c(cmake_args_to_add, paste0(define_name, "=", arg_value)) } install_libs_content <- gsub( pattern = paste0("command_line_args <- NULL") , replacement = paste0( - "command_line_args <- c(\"" - , paste(cmake_args_to_add, collapse = "\", \"") - , "\")" + "command_line_args <- c(\'" + , paste(cmake_args_to_add, collapse = "', '") + , "')" ) , x = install_libs_content + , fixed = TRUE ) + writeLines(install_libs_content, "C:/Users/James/repos/LightGBM/install-out.R") } # if provided, set '-j' in 'make' commands in install.libs.R From dc20181d3fba747298c7890033c891f3e103c0e8 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 28 Nov 2022 02:34:21 +0000 Subject: [PATCH 2/2] remove debugging stuff --- build_r.R | 2 -- 1 file changed, 2 deletions(-) diff --git a/build_r.R b/build_r.R index b73676370187..79e8b42e8fdc 100644 --- a/build_r.R +++ b/build_r.R @@ -95,7 +95,6 @@ install_libs_content <- .replace_flag("use_msys2", USING_MSYS2, install_libs_con # set up extra flags based on keyword arguments keyword_args <- parsed_args[["keyword_args"]] -print("+-+-+-+-+-") if (length(keyword_args) > 0L) { cmake_args_to_add <- NULL for (i in seq_len(length(keyword_args))) { @@ -114,7 +113,6 @@ if (length(keyword_args) > 0L) { , x = install_libs_content , fixed = TRUE ) - writeLines(install_libs_content, "C:/Users/James/repos/LightGBM/install-out.R") } # if provided, set '-j' in 'make' commands in install.libs.R