From nobody Sun Aug 28 23:50:40 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MG9LT13Mvz4Zhhh; Sun, 28 Aug 2022 23:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MG9LT0GPRz46J6; Sun, 28 Aug 2022 23:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661730641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zoMGhFITfDS48XDL9IskndMGZZUHVcbOt1++M7MSHY0=; b=puDDwaGwzyXY1LQ/c+aCd389ccn5Ni3IFApyYNfrmeoy2R0zMYpUhv65f4XEGQMXSFYYME mefwhPu9Pcb3GLswfx2iFjD1VLjteH0q+m5/P9WAGhOBMnidnc6KnnrnsipgMOgD+5YhZL WAXq3zYzS+y+TxCHBkvzucj7NETvKcnpDUPuf4Aq5GqpzedBmADn9VrS5xklK8yRwt+/b8 9O17LUsfILDB9nRfWRdhUPbxoMUY1Xhi/6jXUB0nnEenpNGo8OH/oQ9GoPHcC2bwrZ32VN YhLaR26+r2Qtcf4T/ZVd+W7DL9hgjJqlW7quFx6YZP2ZwA/NhMkdBfgDspxVvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MG9LS6QbszFmk; Sun, 28 Aug 2022 23:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27SNoeqn029772; Sun, 28 Aug 2022 23:50:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27SNoetF029771; Sun, 28 Aug 2022 23:50:40 GMT (envelope-from git) Date: Sun, 28 Aug 2022 23:50:40 GMT Message-Id: <202208282350.27SNoetF029771@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: faee1d001d61 - main - misc/{,py-}xgboost: Update 1.6.1 -> 1.6.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faee1d001d618bea5fd190fc62dc84786eb63821 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661730641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zoMGhFITfDS48XDL9IskndMGZZUHVcbOt1++M7MSHY0=; b=hbAdVqdCzZvFUHd4wYlSz2B/yDVZrCimXD/W55KKcGBfH44tyBemst4X5BGRPVcMaowIGx TkIuGv+R+JEyW83fXe1rslsBUzs6AcL4Dlu+QLS4K/8BmjPygj+3U7/ou+QLxRDoLesqRX zNYCfMdIihBfVfhC8TrmF8a+vO/0R+4nu6rDhvkw9RUKy3+is6NT0xpG6pxL3QcluSnh+j GdBZiC7IXoSUK+irtBXeRBcCmap4tdeEPqAtzwxXMTA7uExw0rAddyRzcCT/tl7Ah6/cc4 hTwah+gGzzOdJ2NkhVz3UOTujJUvVeJi0m9XavUVyiZ9bQf8Y/Zki73euuhrTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661730641; a=rsa-sha256; cv=none; b=eUmZmOjJpEBf9XY+qixv5Y7gAs2VZwhxv2suvvFoqTWUyAxBN/99vBjN/mzKESUaIjymJj ABk2Eh4Pv15bx9w2YcEzw1HRZMrlzNcOdNZdYubKXJOvlgKlv+JrBbYvoCBcAP5Y9sl9kX MC1iOovR/48+wTyZZoJcGTajHeyNHI+51QW9v9oUGFS4FheWK76wAmboOzi2sg2r1BaST1 eJEDzgScd71Y41go3VEai6f4/fxXE+WVEddsGy+E1GESC5zI7M0nvxeJFxO4xwClU1Kp4/ /YHwaBeTouOJsRH45gm+B2kEWu9UtWMN/JQzUY6WNWybD0EGklggD3EEjtr5uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=faee1d001d618bea5fd190fc62dc84786eb63821 commit faee1d001d618bea5fd190fc62dc84786eb63821 Author: Yuri Victorovich AuthorDate: 2022-08-28 23:15:49 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-28 23:50:36 +0000 misc/{,py-}xgboost: Update 1.6.1 -> 1.6.2 Reported by: portscout --- misc/py-xgboost/Makefile | 13 +++---------- misc/py-xgboost/distinfo | 6 +++--- misc/py-xgboost/files/patch-setup.py | 17 +++++++++-------- misc/py-xgboost/pkg-plist | 16 ++++++++++++++++ misc/xgboost/Makefile | 2 +- misc/xgboost/distinfo | 6 +++--- 6 files changed, 35 insertions(+), 25 deletions(-) diff --git a/misc/py-xgboost/Makefile b/misc/py-xgboost/Makefile index 59bbcaa5424b..839c5a7121c4 100644 --- a/misc/py-xgboost/Makefile +++ b/misc/py-xgboost/Makefile @@ -1,7 +1,6 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 1.6.1 -PORTREVISION= 1 +DISTVERSION= 1.6.2 CATEGORIES= misc # machine-learning PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,7 +18,7 @@ RUN_DEPENDS= ${PYNUMPY} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ USES= compiler:c11 python:3.5+ localbase:ldflags -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils pytest # no Python tests are run, see https://github.com/dmlc/xgboost/issues/8208 USE_LDCONFIG= yes USE_GITHUB= yes @@ -31,15 +30,9 @@ PYDISTUTILS_INSTALLARGS= --use-system-libxgboost # this is ignored so that setup NO_ARCH= yes -POST_PLIST= fix-plist - -fix-plist: # https://github.com/dmlc/xgboost/issues/5705 - @${REINPLACE_CMD} 's|.*libxgboost${PYTHON_EXT_SUFFIX}.so$$||' ${TMPPLIST} +TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-install: ${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} -do-test: # tests fail w/out CUDA: https://github.com/dmlc/xgboost/issues/6881 - @cd ${WRKSRC}/.. && ${PYTHON_CMD} -m pytest - .include diff --git a/misc/py-xgboost/distinfo b/misc/py-xgboost/distinfo index 3334805f9271..8e66cf46f1e4 100644 --- a/misc/py-xgboost/distinfo +++ b/misc/py-xgboost/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652131151 -SHA256 (dmlc-xgboost-v1.6.1_GH0.tar.gz) = 76d932558606ea6047b4b9a547794d5eec47028713ddcef68baec5317a9761d0 -SIZE (dmlc-xgboost-v1.6.1_GH0.tar.gz) = 1752874 +TIMESTAMP = 1661727094 +SHA256 (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 0fbe4815d1e9407952ba485794c02b1bc9ead63bf7c541441aec47a671d7303f +SIZE (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 1754609 diff --git a/misc/py-xgboost/files/patch-setup.py b/misc/py-xgboost/files/patch-setup.py index 99247ee24d23..ffda5eae0975 100644 --- a/misc/py-xgboost/files/patch-setup.py +++ b/misc/py-xgboost/files/patch-setup.py @@ -1,33 +1,34 @@ ---- setup.py.orig 2021-04-20 00:31:38 UTC +--- setup.py.orig 2022-08-22 08:36:38 UTC +++ setup.py -@@ -60,14 +60,14 @@ def copy_tree(src_dir, target_dir): +@@ -60,7 +60,7 @@ def copy_tree(src_dir: str, target_dir: str) -> None: src = os.path.join(src_dir, 'src') inc = os.path.join(src_dir, 'include') - dmlc_core = os.path.join(src_dir, 'dmlc-core') + #dmlc_core = os.path.join(src_dir, 'dmlc-core') + gputreeshap = os.path.join(src_dir, "gputreeshap") rabit = os.path.join(src_dir, 'rabit') cmake = os.path.join(src_dir, 'cmake') - plugin = os.path.join(src_dir, 'plugin') +@@ -68,7 +68,7 @@ def copy_tree(src_dir: str, target_dir: str) -> None: clean_copy_tree(src, os.path.join(target_dir, 'src')) clean_copy_tree(inc, os.path.join(target_dir, 'include')) - clean_copy_tree(dmlc_core, os.path.join(target_dir, 'dmlc-core')) + #clean_copy_tree(dmlc_core, os.path.join(target_dir, 'dmlc-core')) + clean_copy_tree(gputreeshap, os.path.join(target_dir, "gputreeshap")) clean_copy_tree(rabit, os.path.join(target_dir, 'rabit')) clean_copy_tree(cmake, os.path.join(target_dir, 'cmake')) - clean_copy_tree(plugin, os.path.join(target_dir, 'plugin')) -@@ -125,7 +125,7 @@ class BuildExt(build_ext.build_ext): # pylint: disabl +@@ -142,7 +142,7 @@ class BuildExt(build_ext.build_ext): # pylint: disabl - def build_cmake_extension(self): + def build_cmake_extension(self) -> None: '''Configure and build using CMake''' - if USER_OPTIONS['use-system-libxgboost'][2]: + if True or USER_OPTIONS['use-system-libxgboost'][2]: # see https://github.com/dmlc/xgboost/issues/6879 self.logger.info('Using system libxgboost.') return -@@ -217,7 +217,7 @@ class InstallLib(install_lib.install_lib): - def install(self): +@@ -239,7 +239,7 @@ class InstallLib(install_lib.install_lib): + def install(self) -> List[str]: outfiles = super().install() - if USER_OPTIONS['use-system-libxgboost'][2] != 0: diff --git a/misc/py-xgboost/pkg-plist b/misc/py-xgboost/pkg-plist index 1ddb5b1777da..fd68b193fb10 100644 --- a/misc/py-xgboost/pkg-plist +++ b/misc/py-xgboost/pkg-plist @@ -1,3 +1,5 @@ +%%PYTHON_SITELIBDIR%%/xgboost/VERSION +%%PYTHON_SITELIBDIR%%/xgboost/__init__.py %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/_typing%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/callback%%PYTHON_EXT_SUFFIX%%.pyc @@ -12,3 +14,17 @@ %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/sklearn%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/tracker%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/xgboost/__pycache__/training%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/xgboost/_typing.py +%%PYTHON_SITELIBDIR%%/xgboost/callback.py +%%PYTHON_SITELIBDIR%%/xgboost/compat.py +%%PYTHON_SITELIBDIR%%/xgboost/config.py +%%PYTHON_SITELIBDIR%%/xgboost/core.py +%%PYTHON_SITELIBDIR%%/xgboost/dask.py +%%PYTHON_SITELIBDIR%%/xgboost/data.py +%%PYTHON_SITELIBDIR%%/xgboost/libpath.py +%%PYTHON_SITELIBDIR%%/xgboost/plotting.py +%%PYTHON_SITELIBDIR%%/xgboost/py.typed +%%PYTHON_SITELIBDIR%%/xgboost/rabit.py +%%PYTHON_SITELIBDIR%%/xgboost/sklearn.py +%%PYTHON_SITELIBDIR%%/xgboost/tracker.py +%%PYTHON_SITELIBDIR%%/xgboost/training.py diff --git a/misc/xgboost/Makefile b/misc/xgboost/Makefile index 563d12e576d5..ee46495bd00b 100644 --- a/misc/xgboost/Makefile +++ b/misc/xgboost/Makefile @@ -1,6 +1,6 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 1.6.1 +DISTVERSION= 1.6.2 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org diff --git a/misc/xgboost/distinfo b/misc/xgboost/distinfo index 73c19e60643f..324a478747a7 100644 --- a/misc/xgboost/distinfo +++ b/misc/xgboost/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1652130939 -SHA256 (dmlc-xgboost-v1.6.1_GH0.tar.gz) = 76d932558606ea6047b4b9a547794d5eec47028713ddcef68baec5317a9761d0 -SIZE (dmlc-xgboost-v1.6.1_GH0.tar.gz) = 1752874 +TIMESTAMP = 1661726534 +SHA256 (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 0fbe4815d1e9407952ba485794c02b1bc9ead63bf7c541441aec47a671d7303f +SIZE (dmlc-xgboost-v1.6.2_GH0.tar.gz) = 1754609 SHA256 (NVlabs-cub-af39ee2_GH0.tar.gz) = 3444f1d0af16d3680bf5089c1a91e707769d946580b80f12463860366fb6884b SIZE (NVlabs-cub-af39ee2_GH0.tar.gz) = 413215 SHA256 (rapidsai-gputreeshap-5bba198_GH0.tar.gz) = bad0d98eddff46e298f4c6be71b140ac8573b2d1740f109f3151097c56f18463