Index: branches/2020Q4/misc/py-xgboost/Makefile =================================================================== --- branches/2020Q4/misc/py-xgboost/Makefile (revision 553405) +++ branches/2020Q4/misc/py-xgboost/Makefile (revision 553406) @@ -1,40 +1,38 @@ # $FreeBSD$ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 1.2.0 +DISTVERSION= 1.2.1 CATEGORIES= misc # machine-learning PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT, GBM) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/../LICENSE BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= libdmlc.so:devel/dmlc-core \ librabit.so:misc/xgboost RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= python:3.5+ localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= dmlc USE_PYTHON= distutils autoplist USE_LDCONFIG= yes GH_TUPLE= \ - dmlc:rabit:4fb34a008db6437c84d1877635064e09a55c8553:dmlc_rabit/../rabit + dmlc:rabit:4acdd7c6f68debe1c39ae07ca75466d74d194dd1:dmlc_rabit/../rabit WRKSRC_SUBDIR= python-package - -MAKE_ENV+= FREEBSD_LIBRARY_PATH=${LOCALBASE}/lib LDFLAGS+= -lexecinfo POST_PLIST= fix-plist fix-plist: # https://github.com/dmlc/xgboost/issues/5705 @${REINPLACE_CMD} 's|/libxgboost.so$$|/xgboost/lib/libxgboost.so|' ${TMPPLIST} .include Index: branches/2020Q4/misc/py-xgboost/distinfo =================================================================== --- branches/2020Q4/misc/py-xgboost/distinfo (revision 553405) +++ branches/2020Q4/misc/py-xgboost/distinfo (revision 553406) @@ -1,5 +1,5 @@ -TIMESTAMP = 1600935150 -SHA256 (dmlc-xgboost-v1.2.0_GH0.tar.gz) = 074ef38f9fff675470c4b461e204cd1c778f984191ca89afdfcc55b46a1868d2 -SIZE (dmlc-xgboost-v1.2.0_GH0.tar.gz) = 1341770 -SHA256 (dmlc-rabit-4fb34a008db6437c84d1877635064e09a55c8553_GH0.tar.gz) = 7d9a18b1613dfd3a5244524ecdb164d6b2a1f150d297cc7b8527e221aabb6eb7 -SIZE (dmlc-rabit-4fb34a008db6437c84d1877635064e09a55c8553_GH0.tar.gz) = 93236 +TIMESTAMP = 1603744234 +SHA256 (dmlc-xgboost-v1.2.1_GH0.tar.gz) = 0190b902cdf4e0a05e735a382708e2025f1ff541a53251e43160beb3041bf35b +SIZE (dmlc-xgboost-v1.2.1_GH0.tar.gz) = 1341653 +SHA256 (dmlc-rabit-4acdd7c6f68debe1c39ae07ca75466d74d194dd1_GH0.tar.gz) = 9e8bbdc04e504d7e7c98b9f683be5378cc5394405983d30737a14ca3dd43d449 +SIZE (dmlc-rabit-4acdd7c6f68debe1c39ae07ca75466d74d194dd1_GH0.tar.gz) = 94118 Index: branches/2020Q4/misc/py-xgboost/files/patch-CMakeLists.txt =================================================================== --- branches/2020Q4/misc/py-xgboost/files/patch-CMakeLists.txt (revision 553405) +++ branches/2020Q4/misc/py-xgboost/files/patch-CMakeLists.txt (revision 553406) @@ -1,34 +1,43 @@ --- ../CMakeLists.txt.orig 2020-09-24 08:09:24 UTC +++ ../CMakeLists.txt @@ -131,11 +131,11 @@ add_subdirectory(${xgboost_SOURCE_DIR}/src) # dmlc-core msvc_use_static_runtime() -add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core) -set_target_properties(dmlc PROPERTIES - CXX_STANDARD 14 - CXX_STANDARD_REQUIRED ON - POSITION_INDEPENDENT_CODE ON) +#add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core) +#set_target_properties(dmlc PROPERTIES +# CXX_STANDARD 14 +# CXX_STANDARD_REQUIRED ON +# POSITION_INDEPENDENT_CODE ON) if (MSVC) target_compile_options(dmlc PRIVATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE) @@ -144,10 +144,10 @@ if (MSVC) -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE) endif (TARGET dmlc_unit_tests) endif (MSVC) -if (ENABLE_ALL_WARNINGS) - target_compile_options(dmlc PRIVATE -Wall -Wextra) -endif (ENABLE_ALL_WARNINGS) -target_link_libraries(objxgboost PUBLIC dmlc) +#if (ENABLE_ALL_WARNINGS) +# target_compile_options(dmlc PRIVATE -Wall -Wextra) +#endif (ENABLE_ALL_WARNINGS) +#target_link_libraries(objxgboost PUBLIC dmlc) # rabit set(RABIT_BUILD_DMLC OFF) +@@ -202,7 +202,7 @@ + + #-- Hide all C++ symbols + if (HIDE_CXX_SYMBOLS) +- foreach(target objxgboost xgboost dmlc rabit rabit_mock_static) ++ foreach(target objxgboost xgboost rabit rabit_mock_static) + set_target_properties(${target} PROPERTIES CXX_VISIBILITY_PRESET hidden) + endforeach() + endif (HIDE_CXX_SYMBOLS) Index: branches/2020Q4/misc/py-xgboost/files/patch-xgboost_libpath.py =================================================================== --- branches/2020Q4/misc/py-xgboost/files/patch-xgboost_libpath.py (revision 553405) +++ branches/2020Q4/misc/py-xgboost/files/patch-xgboost_libpath.py (revision 553406) @@ -1,11 +1,19 @@ ---- xgboost/libpath.py.orig 2020-05-25 18:09:22 UTC +--- xgboost/libpath.py.orig 2020-10-12 22:10:16 UTC +++ xgboost/libpath.py -@@ -20,6 +20,8 @@ def find_lib_path(): +@@ -4,6 +4,7 @@ + import os + import platform + import sys ++import sysconfig # from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247408#c0 + + + class XGBoostLibraryNotFound(Exception): +@@ -20,6 +21,8 @@ def find_lib_path(): """ curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__))) dll_path = [ -+ os.getenv('FREEBSD_LIBRARY_PATH'), ++ sysconfig.get_config_var('LIBDIR'), # from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247408#c0 + os.path.join(sys.prefix, 'xgboost'), # normal, after installation `lib` is copied into Python package tree. os.path.join(curr_path, 'lib'), # editable installation, no copying is performed. Index: branches/2020Q4/misc/xgboost/Makefile =================================================================== --- branches/2020Q4/misc/xgboost/Makefile (revision 553405) +++ branches/2020Q4/misc/xgboost/Makefile (revision 553406) @@ -1,36 +1,35 @@ # $FreeBSD$ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 1.2.0 +DISTVERSION= 1.2.1 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT, GBM) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_12_powerpc64= fails to build: /usr/local/include/dmlc/serializer.h:63:16: 'Write' is not a member of 'dmlc::serializer::UndefinedSerializerFor' -BROKEN_FreeBSD_13_powerpc64= fails to build: /usr/local/include/dmlc/./serializer.h:63:11: no member named 'Write' in 'dmlc::serializer::UndefinedSerializerFor' - LIB_DEPENDS= libdmlc.so:devel/dmlc-core USES= cmake compiler:c++11-lang localbase:ldflags +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= dmlc GH_TUPLE= \ dmlc:rabit:4fb34a008db6437c84d1877635064e09a55c8553:dmlc_rabit/rabit \ + rapidsai:gputreeshap:5f33132d75482338f78cfba562791d8445e157f6:rapidsai_gputreeshap/gputreeshap \ NVlabs:cub:c3cceac115c072fb63df1836ff46d8c60d9eb304:NVlabs_cub/cub -USE_LDCONFIG= yes LDFLAGS+= ${LOCALBASE}/lib/libdmlc.so -lexecinfo OPTIONS_DEFINE= OPENMP OPENMP_CMAKE_BOOL= USE_OPENMP post-patch: # https://github.com/dmlc/rabit/issues/131 @${FIND} ${WRKSRC} -name "*.h" -o -name "*.cc" | ${XARGS} ${REINPLACE_CMD} -i '' -e 's| _assert(| _xassert(|; s| _assert)| _xassert)|' .include Index: branches/2020Q4/misc/xgboost/distinfo =================================================================== --- branches/2020Q4/misc/xgboost/distinfo (revision 553405) +++ branches/2020Q4/misc/xgboost/distinfo (revision 553406) @@ -1,7 +1,9 @@ -TIMESTAMP = 1598655768 -SHA256 (dmlc-xgboost-v1.2.0_GH0.tar.gz) = 074ef38f9fff675470c4b461e204cd1c778f984191ca89afdfcc55b46a1868d2 -SIZE (dmlc-xgboost-v1.2.0_GH0.tar.gz) = 1341770 +TIMESTAMP = 1602663685 +SHA256 (dmlc-xgboost-v1.2.1_GH0.tar.gz) = 0190b902cdf4e0a05e735a382708e2025f1ff541a53251e43160beb3041bf35b +SIZE (dmlc-xgboost-v1.2.1_GH0.tar.gz) = 1341653 SHA256 (dmlc-rabit-4fb34a008db6437c84d1877635064e09a55c8553_GH0.tar.gz) = 7d9a18b1613dfd3a5244524ecdb164d6b2a1f150d297cc7b8527e221aabb6eb7 SIZE (dmlc-rabit-4fb34a008db6437c84d1877635064e09a55c8553_GH0.tar.gz) = 93236 +SHA256 (rapidsai-gputreeshap-5f33132d75482338f78cfba562791d8445e157f6_GH0.tar.gz) = df446fe7a4e064515892ee43f0db8b1f77253e0791110024a105c6570447a8ca +SIZE (rapidsai-gputreeshap-5f33132d75482338f78cfba562791d8445e157f6_GH0.tar.gz) = 25920 SHA256 (NVlabs-cub-c3cceac115c072fb63df1836ff46d8c60d9eb304_GH0.tar.gz) = ecb8b5b7c2e9493b1661cf023b29edcf5cdb80de7033e90f286501251e293b97 SIZE (NVlabs-cub-c3cceac115c072fb63df1836ff46d8c60d9eb304_GH0.tar.gz) = 385598 Index: branches/2020Q4 =================================================================== --- branches/2020Q4 (revision 553405) +++ branches/2020Q4 (revision 553406) Property changes on: branches/2020Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r552175,553388-553389