misc/{,py-}xgboost: update 2.0.3 → 2.1.0

Reported by:	portscout

1 files changed, 46 insertions, 42 deletions

diff --git a/misc/xgboost/files/patch-CMakeLists.txt b/misc/xgboost/files/patch-CMakeLists.txt
index 97097cd460c6..3750419d3296 100644
--- a/misc/xgboost/files/patch-CMakeLists.txt
+++ b/misc/xgboost/files/patch-CMakeLists.txt
@@ -1,63 +1,67 @@
---- CMakeLists.txt.orig	2022-04-16 00:43:21 UTC
+--- CMakeLists.txt.orig	2024-06-19 18:31:39 UTC
 +++ CMakeLists.txt
-@@ -105,11 +105,11 @@ endif (PLUGIN_RMM AND NOT ((CMAKE_CXX_COMPILER_ID STRE
- if (PLUGIN_RMM AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
+@@ -148,11 +148,11 @@ endif()
+ if(PLUGIN_RMM AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
    message(SEND_ERROR "`PLUGIN_RMM` must be used with Linux.")
- endif (PLUGIN_RMM AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
--if (ENABLE_ALL_WARNINGS)
--  if ((NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
+ endif()
+-if(ENABLE_ALL_WARNINGS)
+-  if((NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
 -    message(SEND_ERROR "ENABLE_ALL_WARNINGS is only available for Clang and GCC.")
--  endif ((NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
--endif (ENABLE_ALL_WARNINGS)
-+#if (ENABLE_ALL_WARNINGS)
-+#  if ((NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
+-  endif()
+-endif()
++#if(ENABLE_ALL_WARNINGS)
++#  if((NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
 +#    message(SEND_ERROR "ENABLE_ALL_WARNINGS is only available for Clang and GCC.")
-+#  endif ((NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
-+#endif (ENABLE_ALL_WARNINGS)
- if (BUILD_STATIC_LIB AND (R_LIB OR JVM_BINDINGS))
++#  endif()
++#endif()
+ if(BUILD_STATIC_LIB AND (R_LIB OR JVM_BINDINGS))
    message(SEND_ERROR "Cannot build a static library libxgboost.a when R or JVM packages are enabled.")
- endif (BUILD_STATIC_LIB AND (R_LIB OR JVM_BINDINGS))
-@@ -168,7 +168,7 @@ msvc_use_static_runtime()
- if (FORCE_SHARED_CRT)
-   set(DMLC_FORCE_SHARED_CRT ON)
- endif ()
+ endif()
+@@ -266,7 +266,7 @@ set(DMLC_FORCE_SHARED_CRT ${FORCE_SHARED_CRT})
+ 
+ # dmlc-core
+ set(DMLC_FORCE_SHARED_CRT ${FORCE_SHARED_CRT})
 -add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core)
 +#add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core)
  
- if (MSVC)
-   if (TARGET dmlc_unit_tests)
-@@ -185,7 +185,7 @@ endif (RABIT_BUILD_MPI)
+ if(MSVC)
+   if(TARGET dmlc_unit_tests)
+@@ -279,7 +279,7 @@ add_subdirectory(${xgboost_SOURCE_DIR}/src)
  
  # core xgboost
  add_subdirectory(${xgboost_SOURCE_DIR}/src)
 -target_link_libraries(objxgboost PUBLIC dmlc)
 +#target_link_libraries(objxgboost PUBLIC dmlc)
  
- # Exports some R specific definitions and objects
- if (R_LIB)
-@@ -219,14 +219,14 @@ target_link_libraries(runxgboost PRIVATE objxgboost)
- target_include_directories(runxgboost
-   PRIVATE
-   ${xgboost_SOURCE_DIR}/include
--  ${xgboost_SOURCE_DIR}/dmlc-core/include
-+  #${xgboost_SOURCE_DIR}/dmlc-core/include
-   ${xgboost_SOURCE_DIR}/rabit/include
- )
- set_target_properties(runxgboost PROPERTIES OUTPUT_NAME xgboost)
+ # Link -lstdc++fs for GCC 8.x
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.0")
+@@ -341,7 +341,7 @@ if(BUILD_DEPRECATED_CLI)
+   target_include_directories(runxgboost
+     PRIVATE
+     ${xgboost_SOURCE_DIR}/include
+-    ${xgboost_SOURCE_DIR}/dmlc-core/include
++    #${xgboost_SOURCE_DIR}/dmlc-core/include
+     ${xgboost_SOURCE_DIR}/rabit/include
+   )
+   set_target_properties(runxgboost PROPERTIES OUTPUT_NAME xgboost)
+@@ -358,7 +358,7 @@ endif()
  #-- End CLI for xgboost
  
  # Common setup for all targets
--foreach(target xgboost objxgboost dmlc runxgboost)
-+foreach(target xgboost objxgboost runxgboost)
+-foreach(target xgboost objxgboost dmlc)
++foreach(target xgboost objxgboost)
    xgboost_target_properties(${target})
    xgboost_target_link_libraries(${target})
    xgboost_target_defs(${target})
-@@ -277,7 +277,7 @@ install(DIRECTORY ${xgboost_SOURCE_DIR}/include/xgboos
- #
+@@ -420,9 +420,9 @@ if(BUILD_STATIC_LIB)
  # https://github.com/dmlc/xgboost/issues/6085
- if (BUILD_STATIC_LIB)
--  set(INSTALL_TARGETS xgboost runxgboost objxgboost dmlc)
-+  set(INSTALL_TARGETS xgboost runxgboost objxgboost)
- else (BUILD_STATIC_LIB)
-   set(INSTALL_TARGETS xgboost runxgboost)
- endif (BUILD_STATIC_LIB)
+ if(BUILD_STATIC_LIB)
+   if(BUILD_DEPRECATED_CLI)
+-    set(INSTALL_TARGETS xgboost runxgboost objxgboost dmlc)
++    set(INSTALL_TARGETS xgboost runxgboost objxgboost)
+   else()
+-    set(INSTALL_TARGETS xgboost objxgboost dmlc)
++    set(INSTALL_TARGETS xgboost objxgboost)
+   endif()
+ else()
+   if(BUILD_DEPRECATED_CLI)