diff --git a/misc/py-xgboost/Makefile b/misc/py-xgboost/Makefile index 89e99b30c857..26ec066b3d12 100644 --- a/misc/py-xgboost/Makefile +++ b/misc/py-xgboost/Makefile @@ -1,45 +1,45 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 2.1.0 +DISTVERSION= 2.1.1 CATEGORIES= misc # machine-learning PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT, GBM) WWW= https://xgboost.ai/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/../LICENSE BROKEN_armv7= compilation fails due to type conversion issues, like on i386, but the upstream says that they don't support 32-bit architectures BROKEN_i386= compilation fails, see https://github.com/dmlc/xgboost/issues/10002 BUILD_DEPENDS= cmake:devel/cmake-core \ ${PYTHON_PKGNAMEPREFIX}hatchling>=1.12.1:devel/py-hatchling@${PY_FLAVOR} LIB_DEPENDS= libdmlc.so:devel/dmlc-core RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} USES= compiler:c11 python localbase:ldflags USE_PYTHON= pep517 autoplist pytest # Python tests are broken because py-scikit-learn is missing the py-threadpoolctl dependency which is also currently broken USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= dmlc WRKSRC_SUBDIR= python-package LDFLAGS+= -lexecinfo \ -ldmlc PYDISTUTILS_INSTALLARGS= --use-system-libxgboost # this is ignored so that setup.py has to be patched, see https://github.com/dmlc/xgboost/issues/6879 TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} TEST_WRKSRC= ${WRKSRC}/../tests/python post-install: @${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/xgboost/lib/libxgboost.so .include diff --git a/misc/py-xgboost/distinfo b/misc/py-xgboost/distinfo index c8cf33ef71a7..8b8e85443302 100644 --- a/misc/py-xgboost/distinfo +++ b/misc/py-xgboost/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1718956274 -SHA256 (dmlc-xgboost-v2.1.0_GH0.tar.gz) = 380c66ac3611a9cc867d4f51aaa95bb8946f75a84e5a3f0a3f37b89a072e6f93 -SIZE (dmlc-xgboost-v2.1.0_GH0.tar.gz) = 2124684 +TIMESTAMP = 1722405992 +SHA256 (dmlc-xgboost-v2.1.1_GH0.tar.gz) = 3204cc5cc3cf421c42d310cd5ef7711bf8fe7e11c34641e1f042625566a421b2 +SIZE (dmlc-xgboost-v2.1.1_GH0.tar.gz) = 2134830 diff --git a/misc/py-xgboost/files/patch-src_c__api_coll__c__api.cc b/misc/py-xgboost/files/patch-src_c__api_coll__c__api.cc deleted file mode 100644 index 7a6961734687..000000000000 --- a/misc/py-xgboost/files/patch-src_c__api_coll__c__api.cc +++ /dev/null @@ -1,13 +0,0 @@ -- 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/Makefile b/misc/xgboost/Makefile index c13726c33e68..30d63b59199f 100644 --- a/misc/xgboost/Makefile +++ b/misc/xgboost/Makefile @@ -1,40 +1,40 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 2.1.0 +DISTVERSION= 2.1.1 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT, GBM) WWW= https://xgboost.ai/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv7= compilation fails: non-constant-expression cannot be narrowed from type 'unsigned long long' to 'size_t', see https://github.com/dmlc/xgboost/issues/8489 BROKEN_i386= compilation fails: non-constant-expression cannot be narrowed from type 'unsigned long long' to 'size_t', see https://github.com/dmlc/xgboost/issues/8489 BROKEN_powerpc= compilation fails: non-constant-expression cannot be narrowed from type 'unsigned long long' to 'size_t', see https://github.com/dmlc/xgboost/issues/8489 LIB_DEPENDS= libdmlc.so:devel/dmlc-core TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++11-lang localbase:ldflags USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= dmlc GH_TUPLE= \ NVlabs:cub:af39ee2:NVlabs_cub/cub \ rapidsai:gputreeshap:acb5be3:rapidsai_gputreeshap/gputreeshap LDFLAGS+= ${LOCALBASE}/lib/libdmlc.so -lexecinfo 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 diff --git a/misc/xgboost/distinfo b/misc/xgboost/distinfo index 3006b5211de1..4ccbd22764a3 100644 --- a/misc/xgboost/distinfo +++ b/misc/xgboost/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1718953379 -SHA256 (dmlc-xgboost-v2.1.0_GH0.tar.gz) = 380c66ac3611a9cc867d4f51aaa95bb8946f75a84e5a3f0a3f37b89a072e6f93 -SIZE (dmlc-xgboost-v2.1.0_GH0.tar.gz) = 2124684 +TIMESTAMP = 1722404645 +SHA256 (dmlc-xgboost-v2.1.1_GH0.tar.gz) = 3204cc5cc3cf421c42d310cd5ef7711bf8fe7e11c34641e1f042625566a421b2 +SIZE (dmlc-xgboost-v2.1.1_GH0.tar.gz) = 2134830 SHA256 (NVlabs-cub-af39ee2_GH0.tar.gz) = 3444f1d0af16d3680bf5089c1a91e707769d946580b80f12463860366fb6884b SIZE (NVlabs-cub-af39ee2_GH0.tar.gz) = 413215 SHA256 (rapidsai-gputreeshap-acb5be3_GH0.tar.gz) = c2b67f8f398000570cac6b9d82a0bdab251105391602a3e07fd497c5e61534c4 SIZE (rapidsai-gputreeshap-acb5be3_GH0.tar.gz) = 61972 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 deleted file mode 100644 index b81bddb3d702..000000000000 --- a/misc/xgboost/files/patch-src_c__api_coll__c__api.cc +++ /dev/null @@ -1,13 +0,0 @@ -- 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;