diff --git a/misc/xgboost/Makefile b/misc/xgboost/Makefile index 0952a6570754..3f5a842820da 100644 --- a/misc/xgboost/Makefile +++ b/misc/xgboost/Makefile @@ -1,31 +1,31 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 1.4.2 +DISTVERSION= 1.5.0 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT, GBM) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libdmlc.so:devel/dmlc-core 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:5bba198:rapidsai_gputreeshap/gputreeshap LDFLAGS+= ${LOCALBASE}/lib/libdmlc.so -lexecinfo CMAKE_TESTING_ON= GOOGLE_TEST OPTIONS_DEFINE= OPENMP OPENMP_CMAKE_BOOL= USE_OPENMP .include diff --git a/misc/xgboost/distinfo b/misc/xgboost/distinfo index faf68eede2b1..65a28cd370ab 100644 --- a/misc/xgboost/distinfo +++ b/misc/xgboost/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1629576075 -SHA256 (dmlc-xgboost-v1.4.2_GH0.tar.gz) = e251dae332ce6168f7c900ba8ca2e84c75c0e227ef51611d2badbdd451847dc3 -SIZE (dmlc-xgboost-v1.4.2_GH0.tar.gz) = 1582010 +TIMESTAMP = 1634915550 +SHA256 (dmlc-xgboost-v1.5.0_GH0.tar.gz) = 24a78308986b1c2b00fa9c1dc25e7899854ff5fc5337e57a9fc49dad002c7ddd +SIZE (dmlc-xgboost-v1.5.0_GH0.tar.gz) = 1640493 SHA256 (NVlabs-cub-af39ee2_GH0.tar.gz) = 3444f1d0af16d3680bf5089c1a91e707769d946580b80f12463860366fb6884b SIZE (NVlabs-cub-af39ee2_GH0.tar.gz) = 413215 SHA256 (rapidsai-gputreeshap-5bba198_GH0.tar.gz) = bad0d98eddff46e298f4c6be71b140ac8573b2d1740f109f3151097c56f18463 SIZE (rapidsai-gputreeshap-5bba198_GH0.tar.gz) = 32468 diff --git a/misc/xgboost/files/patch-CMakeLists.txt b/misc/xgboost/files/patch-CMakeLists.txt index 3a9624514124..7fbe42423d27 100644 --- a/misc/xgboost/files/patch-CMakeLists.txt +++ b/misc/xgboost/files/patch-CMakeLists.txt @@ -1,45 +1,55 @@ ---- CMakeLists.txt.orig 2020-12-22 07:22:32 UTC +--- CMakeLists.txt.orig 2021-10-15 04:21:04 UTC +++ CMakeLists.txt -@@ -101,11 +101,11 @@ endif (PLUGIN_RMM AND NOT ((CMAKE_CXX_COMPILER_ID STRE +@@ -104,11 +104,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")) -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")) +# 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)) 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)) -@@ -150,11 +150,11 @@ endif (USE_OPENMP) +@@ -160,7 +160,7 @@ endif (USE_NCCL) # 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) -@@ -172,7 +172,7 @@ add_subdirectory(rabit) + if (TARGET dmlc_unit_tests) +@@ -177,7 +177,7 @@ endif (RABIT_BUILD_MPI) # 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 + #-- End CLI for xgboost + + # Common setup for all targets +-foreach(target xgboost objxgboost dmlc runxgboost) ++foreach(target xgboost objxgboost runxgboost) + xgboost_target_properties(${target}) + xgboost_target_link_libraries(${target}) + xgboost_target_defs(${target}) +@@ -269,7 +269,7 @@ install(DIRECTORY ${xgboost_SOURCE_DIR}/include/xgboos + # + # 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) diff --git a/misc/xgboost/pkg-plist b/misc/xgboost/pkg-plist index 6e7fd12db23a..3b9b92585a29 100644 --- a/misc/xgboost/pkg-plist +++ b/misc/xgboost/pkg-plist @@ -1,30 +1,31 @@ bin/xgboost include/xgboost/base.h include/xgboost/c_api.h include/xgboost/data.h include/xgboost/feature_map.h include/xgboost/gbm.h include/xgboost/generic_parameters.h include/xgboost/global_config.h include/xgboost/host_device_vector.h include/xgboost/intrusive_ptr.h include/xgboost/json.h include/xgboost/json_io.h include/xgboost/learner.h +include/xgboost/linalg.h include/xgboost/linear_updater.h include/xgboost/logging.h include/xgboost/metric.h include/xgboost/model.h include/xgboost/objective.h include/xgboost/parameter.h include/xgboost/predictor.h include/xgboost/span.h include/xgboost/tree_model.h include/xgboost/tree_updater.h include/xgboost/version_config.h lib/cmake/xgboost/XGBoostTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/xgboost/XGBoostTargets.cmake lib/cmake/xgboost/xgboost-config-version.cmake lib/cmake/xgboost/xgboost-config.cmake lib/libxgboost.so libdata/pkgconfig/xgboost.pc