From e61693b2b118c7f67b8a983005ff7600d6244589 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Tue, 20 Apr 2021 13:46:13 -0700 Subject: misc/xgboost: Update 1.2.1 -> 1.4.1 Reported by: portscout --- misc/xgboost/Makefile | 10 +++---- misc/xgboost/distinfo | 18 ++++++------- misc/xgboost/files/patch-CMakeLists.txt | 39 +++++++++++++++++---------- misc/xgboost/files/patch-rabit_CMakeLists.txt | 34 ----------------------- misc/xgboost/pkg-plist | 21 ++------------- 5 files changed, 39 insertions(+), 83 deletions(-) delete mode 100644 misc/xgboost/files/patch-rabit_CMakeLists.txt diff --git a/misc/xgboost/Makefile b/misc/xgboost/Makefile index 48ee6a906cb4..679748ac9c54 100644 --- a/misc/xgboost/Makefile +++ b/misc/xgboost/Makefile @@ -1,6 +1,6 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 1.2.1 +DISTVERSION= 1.4.1 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -17,9 +17,8 @@ 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 + NVlabs:cub:af39ee2:NVlabs_cub/cub \ + rapidsai:gputreeshap:3310a30:rapidsai_gputreeshap/gputreeshap LDFLAGS+= ${LOCALBASE}/lib/libdmlc.so -lexecinfo @@ -27,7 +26,4 @@ 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 diff --git a/misc/xgboost/distinfo b/misc/xgboost/distinfo index 0b734d86bea4..34a76aad17c8 100644 --- a/misc/xgboost/distinfo +++ b/misc/xgboost/distinfo @@ -1,9 +1,9 @@ -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 +TIMESTAMP = 1618948383 +SHA256 (dmlc-xgboost-v1.4.1_GH0.tar.gz) = 3464cb2463b25e8a6702129a2b3d1e270e28478369bd524d048d5c2422345a51 +SIZE (dmlc-xgboost-v1.4.1_GH0.tar.gz) = 1580682 +SHA256 (dmlc-dmlc-core-f00e3ec_GH0.tar.gz) = a5ec4fbad798e2c0b1ffa23857406249e599547cfce890fea86f7553f537344a +SIZE (dmlc-dmlc-core-f00e3ec_GH0.tar.gz) = 256388 +SHA256 (NVlabs-cub-af39ee2_GH0.tar.gz) = 3444f1d0af16d3680bf5089c1a91e707769d946580b80f12463860366fb6884b +SIZE (NVlabs-cub-af39ee2_GH0.tar.gz) = 413215 +SHA256 (rapidsai-gputreeshap-3310a30_GH0.tar.gz) = abfbf8e4bccb4bb2baf394018187b5d83b13f02c9f0b1326ff1b040596907dc3 +SIZE (rapidsai-gputreeshap-3310a30_GH0.tar.gz) = 27141 diff --git a/misc/xgboost/files/patch-CMakeLists.txt b/misc/xgboost/files/patch-CMakeLists.txt index 3c7f0af2827a..3a9624514124 100644 --- a/misc/xgboost/files/patch-CMakeLists.txt +++ b/misc/xgboost/files/patch-CMakeLists.txt @@ -1,6 +1,23 @@ ---- CMakeLists.txt.orig 2020-09-24 08:09:24 UTC +--- CMakeLists.txt.orig 2020-12-22 07:22:32 UTC +++ CMakeLists.txt -@@ -131,11 +131,11 @@ add_subdirectory(${xgboost_SOURCE_DIR}/src) +@@ -101,11 +101,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) # dmlc-core msvc_use_static_runtime() @@ -17,18 +34,12 @@ 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) +@@ -172,7 +172,7 @@ add_subdirectory(rabit) + + # core xgboost + add_subdirectory(${xgboost_SOURCE_DIR}/src) -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) + # Exports some R specific definitions and objects + if (R_LIB) diff --git a/misc/xgboost/files/patch-rabit_CMakeLists.txt b/misc/xgboost/files/patch-rabit_CMakeLists.txt deleted file mode 100644 index 72c6dfe368d0..000000000000 --- a/misc/xgboost/files/patch-rabit_CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ ---- rabit/CMakeLists.txt.orig 2019-12-14 20:43:47 UTC -+++ rabit/CMakeLists.txt -@@ -13,7 +13,7 @@ set(DMLC_ROOT ${CMAKE_CURRENT_LIST_DIR}/../dmlc-core) - - # moved from xgboost build - if(R_LIB OR MINGW OR WIN32) -- add_library(rabit src/engine_empty.cc src/c_api.cc) -+ add_library(rabit SHARED src/engine_empty.cc src/c_api.cc) - set(rabit_libs rabit) - set_target_properties(rabit - PROPERTIES CXX_STANDARD 11 -@@ -21,10 +21,10 @@ if(R_LIB OR MINGW OR WIN32) - POSITION_INDEPENDENT_CODE ON) - else() - find_package(Threads REQUIRED) -- add_library(rabit_empty src/engine_empty.cc src/c_api.cc) -- add_library(rabit_base src/allreduce_base.cc src/engine_base.cc src/c_api.cc) -+ add_library(rabit_empty SHARED src/engine_empty.cc src/c_api.cc) -+ add_library(rabit_base SHARED src/allreduce_base.cc src/engine_base.cc src/c_api.cc) - -- add_library(rabit src/allreduce_base.cc src/allreduce_robust.cc src/engine.cc src/c_api.cc) -+ add_library(rabit SHARED src/allreduce_base.cc src/allreduce_robust.cc src/engine.cc src/c_api.cc) - add_library(rabit_mock_static src/allreduce_base.cc src/allreduce_robust.cc src/engine_mock.cc src/c_api.cc) - add_library(rabit_mock SHARED src/allreduce_base.cc src/allreduce_robust.cc src/engine_mock.cc src/c_api.cc) - target_link_libraries(rabit Threads::Threads) -@@ -43,7 +43,7 @@ if(RABIT_BUILD_MPI) - if (NOT MPI_CXX_FOUND) - message(FATAL_ERROR "CXX Interface for MPI is required for building MPI backend.") - endif (NOT MPI_CXX_FOUND) -- add_library(rabit_mpi src/engine_mpi.cc ${MPI_INCLUDE_PATH}) -+ add_library(rabit_mpi SHARED src/engine_mpi.cc ${MPI_INCLUDE_PATH}) - target_link_libraries(rabit_mpi ${MPI_CXX_LIBRARIES}) - list(APPEND rabit_libs rabit_mpi) - endif() diff --git a/misc/xgboost/pkg-plist b/misc/xgboost/pkg-plist index 3941f98ffcf4..6e7fd12db23a 100644 --- a/misc/xgboost/pkg-plist +++ b/misc/xgboost/pkg-plist @@ -1,21 +1,13 @@ bin/xgboost -include/rabit/c_api.h -include/rabit/internal/engine.h -include/rabit/internal/io.h -include/rabit/internal/rabit-inl.h -include/rabit/internal/socket.h -include/rabit/internal/thread_local.h -include/rabit/internal/timer.h -include/rabit/internal/utils.h -include/rabit/rabit.h -include/rabit/serializable.h 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 @@ -30,18 +22,9 @@ include/xgboost/span.h include/xgboost/tree_model.h include/xgboost/tree_updater.h include/xgboost/version_config.h -lib/cmake/rabit/rabitConfig.cmake -lib/cmake/rabit/rabitConfigVersion.cmake -lib/cmake/rabit/rabitTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/rabit/rabitTargets.cmake 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/librabit.so -lib/librabit_base.so -lib/librabit_empty.so -lib/librabit_mock.so -lib/librabit_mock_static.a lib/libxgboost.so libdata/pkgconfig/xgboost.pc -- cgit v1.2.3