Date: Fri, 21 Jun 2024 09:43:35 GMT
From: Yuri Victorovich <yuri@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: b392cab5e7c7 - main - misc/{,py-}xgboost: update 2.0.3 =?utf-8?Q?=E2=86=92?= 2.1.0
Message-ID: <202406210943.45L9hZgd073428@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b392cab5e7c7fea0b91ccef68b4da725b4e9575f commit b392cab5e7c7fea0b91ccef68b4da725b4e9575f Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-06-21 09:38:55 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-06-21 09:43:09 +0000 misc/{,py-}xgboost: update 2.0.3 → 2.1.0 Reported by: portscout --- misc/py-xgboost/Makefile | 2 +- misc/py-xgboost/distinfo | 6 +- misc/py-xgboost/files/patch-CMakeLists.txt | 80 +++++++++++--------- misc/xgboost/Makefile | 7 +- misc/xgboost/distinfo | 6 +- misc/xgboost/files/patch-CMakeLists.txt | 88 +++++++++++----------- .../xgboost/files/patch-src_c__api_coll__c__api.cc | 13 ++++ misc/xgboost/pkg-plist | 2 +- 8 files changed, 118 insertions(+), 86 deletions(-) diff --git a/misc/py-xgboost/Makefile b/misc/py-xgboost/Makefile index b20a339c16a5..89e99b30c857 100644 --- a/misc/py-xgboost/Makefile +++ b/misc/py-xgboost/Makefile @@ -1,6 +1,6 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 2.0.3 +DISTVERSION= 2.1.0 CATEGORIES= misc # machine-learning PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/misc/py-xgboost/distinfo b/misc/py-xgboost/distinfo index 82743aed43c5..c8cf33ef71a7 100644 --- a/misc/py-xgboost/distinfo +++ b/misc/py-xgboost/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1703054780 -SHA256 (dmlc-xgboost-v2.0.3_GH0.tar.gz) = 94e5deb27133459ec4172f3fed83971383366ad2a7d646b6f0b51f63484c5138 -SIZE (dmlc-xgboost-v2.0.3_GH0.tar.gz) = 1988289 +TIMESTAMP = 1718956274 +SHA256 (dmlc-xgboost-v2.1.0_GH0.tar.gz) = 380c66ac3611a9cc867d4f51aaa95bb8946f75a84e5a3f0a3f37b89a072e6f93 +SIZE (dmlc-xgboost-v2.1.0_GH0.tar.gz) = 2124684 diff --git a/misc/py-xgboost/files/patch-CMakeLists.txt b/misc/py-xgboost/files/patch-CMakeLists.txt index 593bcfbf2b9d..a0003ec715ea 100644 --- a/misc/py-xgboost/files/patch-CMakeLists.txt +++ b/misc/py-xgboost/files/patch-CMakeLists.txt @@ -1,55 +1,67 @@ ---- ../CMakeLists.txt.orig 2021-10-15 04:21:04 UTC +--- ../CMakeLists.txt.orig 2024-06-19 18:31:39 UTC +++ ../CMakeLists.txt -@@ -104,11 +104,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) -@@ -177,7 +177,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) -@@ -218,7 +218,7 @@ set_target_properties(runxgboost PROPERTIES OUTPUT_NAM + # 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}) -@@ -269,7 +269,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) diff --git a/misc/xgboost/Makefile b/misc/xgboost/Makefile index b5117e696724..c13726c33e68 100644 --- a/misc/xgboost/Makefile +++ b/misc/xgboost/Makefile @@ -1,6 +1,6 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 2.0.3 +DISTVERSION= 2.1.0 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -28,10 +28,13 @@ GH_TUPLE= \ LDFLAGS+= ${LOCALBASE}/lib/libdmlc.so -lexecinfo -CMAKE_TESTING_ON= GOOGLE_TEST # 1 test fails, see https://github.com/dmlc/xgboost/issues/8425 +CMAKE_TESTING_ON= GOOGLE_TEST OPTIONS_DEFINE= OPENMP OPENMP_CMAKE_BOOL= USE_OPENMP +# 1 test fails, see https://github.com/dmlc/xgboost/issues/8425 +# 2.1.0: tests fail to compile, see https://github.com/dmlc/xgboost/issues/10468 + .include <bsd.port.mk> diff --git a/misc/xgboost/distinfo b/misc/xgboost/distinfo index 18a646e7686e..3006b5211de1 100644 --- a/misc/xgboost/distinfo +++ b/misc/xgboost/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1703054318 -SHA256 (dmlc-xgboost-v2.0.3_GH0.tar.gz) = 94e5deb27133459ec4172f3fed83971383366ad2a7d646b6f0b51f63484c5138 -SIZE (dmlc-xgboost-v2.0.3_GH0.tar.gz) = 1988289 +TIMESTAMP = 1718953379 +SHA256 (dmlc-xgboost-v2.1.0_GH0.tar.gz) = 380c66ac3611a9cc867d4f51aaa95bb8946f75a84e5a3f0a3f37b89a072e6f93 +SIZE (dmlc-xgboost-v2.1.0_GH0.tar.gz) = 2124684 SHA256 (NVlabs-cub-af39ee2_GH0.tar.gz) = 3444f1d0af16d3680bf5089c1a91e707769d946580b80f12463860366fb6884b SIZE (NVlabs-cub-af39ee2_GH0.tar.gz) = 413215 SHA256 (rapidsai-gputreeshap-acb5be3_GH0.tar.gz) = c2b67f8f398000570cac6b9d82a0bdab251105391602a3e07fd497c5e61534c4 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) diff --git a/misc/xgboost/files/patch-src_c__api_coll__c__api.cc b/misc/xgboost/files/patch-src_c__api_coll__c__api.cc new file mode 100644 index 000000000000..b81bddb3d702 --- /dev/null +++ b/misc/xgboost/files/patch-src_c__api_coll__c__api.cc @@ -0,0 +1,13 @@ +- workaround for https://github.com/dmlc/xgboost/issues/10466 + +--- src/c_api/coll_c_api.cc.orig 2024-06-21 07:43:36 UTC ++++ src/c_api/coll_c_api.cc +@@ -75,7 +75,7 @@ void WaitImpl(TrackerHandleT *ptr, std::chrono::second + + void WaitImpl(TrackerHandleT *ptr, std::chrono::seconds timeout) { + constexpr std::int64_t kDft{collective::DefaultTimeoutSec()}; +- std::chrono::seconds wait_for{collective::HasTimeout(timeout) ? std::min(kDft, timeout.count()) ++ std::chrono::seconds wait_for{collective::HasTimeout(timeout) ? std::min(long(kDft), long(timeout.count())) + : kDft}; + + common::Timer timer; diff --git a/misc/xgboost/pkg-plist b/misc/xgboost/pkg-plist index f0f4a6dba4e3..baa8200d6ee5 100644 --- a/misc/xgboost/pkg-plist +++ b/misc/xgboost/pkg-plist @@ -1,7 +1,7 @@ -bin/xgboost include/xgboost/base.h include/xgboost/c_api.h include/xgboost/cache.h +include/xgboost/collective/result.h include/xgboost/collective/socket.h include/xgboost/context.h include/xgboost/data.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406210943.45L9hZgd073428>