misc/{,py-}xgboost: Update 1.5.2 -> 1.6.0

Reported by: portscout
freebsd · Apr 17, 2022 · 6ba8180 · 6ba8180
1 parent 6d17df7
commit 6ba8180
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 396 deletions.
diff --git a/misc/py-xgboost/Makefile b/misc/py-xgboost/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xgboost
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.2
+DISTVERSION=	1.6.0
 CATEGORIES=	misc # machine-learning
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

diff --git a/misc/py-xgboost/distinfo b/misc/py-xgboost/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643047834
-SHA256 (dmlc-xgboost-v1.5.2_GH0.tar.gz) = d77c71aa125bd7292cd670e5a575850d48aba03d1b05d75d791f3580748b1b0e
-SIZE (dmlc-xgboost-v1.5.2_GH0.tar.gz) = 1645645
+TIMESTAMP = 1650230831
+SHA256 (dmlc-xgboost-v1.6.0_GH0.tar.gz) = 035706af59d842d03e23d6eb2c9a146ae7c2832f66aed2a4703b4c32209cce40
+SIZE (dmlc-xgboost-v1.6.0_GH0.tar.gz) = 1755620
diff --git a/misc/py-xgboost/files/patch-2to3 b/misc/py-xgboost/files/patch-2to3
diff --git a/misc/py-xgboost/files/patch-CMakeLists.txt b/misc/py-xgboost/files/patch-CMakeLists.txt
@@ -17,10 +17,10 @@
  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))
-@@ -160,7 +160,7 @@ endif (USE_NCCL)
-
- # dmlc-core
- msvc_use_static_runtime()
+@@ -168,7 +168,7 @@ msvc_use_static_runtime()
+ if (FORCE_SHARED_CRT)
+   set(DMLC_FORCE_SHARED_CRT ON)
+ endif ()
 -add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core)
 +#add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core)
 

diff --git a/misc/py-xgboost/pkg-plist b/misc/py-xgboost/pkg-plist
@@ -0,0 +1,14 @@
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/_typing%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/callback%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/compat%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/core%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/dask%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/data%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/libpath%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/plotting%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/rabit%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/sklearn%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/tracker%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xgboost/__pycache__/training%%PYTHON_EXT_SUFFIX%%.pyc
diff --git a/misc/xgboost/Makefile b/misc/xgboost/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xgboost
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.2
+DISTVERSION=	1.6.0
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org

diff --git a/misc/xgboost/distinfo b/misc/xgboost/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1643047765
-SHA256 (dmlc-xgboost-v1.5.2_GH0.tar.gz) = d77c71aa125bd7292cd670e5a575850d48aba03d1b05d75d791f3580748b1b0e
-SIZE (dmlc-xgboost-v1.5.2_GH0.tar.gz) = 1645645
+TIMESTAMP = 1650229980
+SHA256 (dmlc-xgboost-v1.6.0_GH0.tar.gz) = 035706af59d842d03e23d6eb2c9a146ae7c2832f66aed2a4703b4c32209cce40
+SIZE (dmlc-xgboost-v1.6.0_GH0.tar.gz) = 1755620
 SHA256 (NVlabs-cub-af39ee2_GH0.tar.gz) = 3444f1d0af16d3680bf5089c1a91e707769d946580b80f12463860366fb6884b
 SIZE (NVlabs-cub-af39ee2_GH0.tar.gz) = 413215
 SHA256 (rapidsai-gputreeshap-5bba198_GH0.tar.gz) = bad0d98eddff46e298f4c6be71b140ac8573b2d1740f109f3151097c56f18463

diff --git a/misc/xgboost/files/patch-CMakeLists.txt b/misc/xgboost/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2021-10-15 04:21:04 UTC
+--- CMakeLists.txt.orig	2022-04-16 00:43:21 UTC
 +++ CMakeLists.txt
-@@ -104,11 +104,11 @@ endif (PLUGIN_RMM AND NOT ((CMAKE_CXX_COMPILER_ID STRE
+@@ -105,11 +105,11 @@ endif (PLUGIN_RMM AND NOT ((CMAKE_CXX_COMPILER_ID STRE
  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"))
@@ -17,16 +17,16 @@
  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))
-@@ -160,7 +160,7 @@ endif (USE_NCCL)
-
- # dmlc-core
- msvc_use_static_runtime()
+@@ -168,7 +168,7 @@ msvc_use_static_runtime()
+ if (FORCE_SHARED_CRT)
+   set(DMLC_FORCE_SHARED_CRT ON)
+ endif ()
 -add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core)
 +#add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core)
 
  if (MSVC)
    if (TARGET dmlc_unit_tests)
-@@ -177,7 +177,7 @@ endif (RABIT_BUILD_MPI)
+@@ -185,7 +185,7 @@ endif (RABIT_BUILD_MPI)
 
  # core xgboost
  add_subdirectory(${xgboost_SOURCE_DIR}/src)
@@ -35,7 +35,15 @@
 
  # Exports some R specific definitions and objects
  if (R_LIB)
-@@ -218,7 +218,7 @@ set_target_properties(runxgboost PROPERTIES OUTPUT_NAM
+@@ -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)
  #-- End CLI for xgboost
 
  # Common setup for all targets
@@ -44,7 +52,7 @@
    xgboost_target_properties(${target})
    xgboost_target_link_libraries(${target})
    xgboost_target_defs(${target})
-@@ -269,7 +269,7 @@ install(DIRECTORY ${xgboost_SOURCE_DIR}/include/xgboos
+@@ -277,7 +277,7 @@ install(DIRECTORY ${xgboost_SOURCE_DIR}/include/xgboos
  #
  # https://github.com/dmlc/xgboost/issues/6085
  if (BUILD_STATIC_LIB)

diff --git a/misc/xgboost/pkg-plist b/misc/xgboost/pkg-plist
@@ -20,6 +20,8 @@ include/xgboost/objective.h
 include/xgboost/parameter.h
 include/xgboost/predictor.h
 include/xgboost/span.h
+include/xgboost/string_view.h
+include/xgboost/task.h
 include/xgboost/tree_model.h
 include/xgboost/tree_updater.h
 include/xgboost/version_config.h