From nobody Sun Oct 06 18:08:32 2024 X-Original-To: dev-commits-ports-main@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 4XM9JJ1vZGz5YMw7; Sun, 06 Oct 2024 18:08:32 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM9JJ1FNGz4Q39; Sun, 6 Oct 2024 18:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728238112; 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=Kgywx4lXi9lvsFI9yKmh0ufLaLYHzwJwdAfBcoy6FsI=; b=ZpEkVqwWcqfdcZObO+WCwIadaMj1/+WDYCyzjCWAANKtLEo/7Fz8BzwQwzFBwzp/GWpZTf XfS6sw/CaOfOCvC+Xo9fxpZysJ62x1D4fu5kW7gwBQymMNEx+CXGyPcPsrxPOmAxSWTEAH TZhnLjgAXhXfsR1FHoCcpiPBBq71VqGI82BuEe8kSjmtAJhWjFbBBSGsNNQM9EkTkyXHrl Ku/L1LN1LKVk7cJsPA0TmSEk3yl8E+wQa54TF2g8gI7dlqatENKHAWBFn84ooZJ37w2aDW NNkJlXesh9ppZJhq9GCX8xl1Iqvld9Bx3aSNETqv48fY1tGAB7NHTyjrbweD3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728238112; 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=Kgywx4lXi9lvsFI9yKmh0ufLaLYHzwJwdAfBcoy6FsI=; b=TeQeYAcRjJVYZ/RHFXn0vovPKeFHSn7NlpTEUxWDhOUvSGj4IPFCtVRcR+3WFnocvCg2rU lqv+5u9//V5zejdFSj0Q7MA96mB9yrdCTcNCj6HTkPWkyfEVYvlScklC+iRo1ES5qkx8vq 4E+gWHLGZ7N+tXJb5CaCKnD1+dwshrTQhavc931E0ob9z4SMtylBzY22AEx1qsMWng6CIU WPMNml67P0w3BLb34vkRodOWbUM0+dUaEeuLSUTyXbl2eiojio4o8fWdQlRyFgTC6ic6s0 oeLlZe8cB44T61zDjrI+XouOplu6xQYZ8KpGhW3M6kFNgvKaRqHnrKASBNGP/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728238112; a=rsa-sha256; cv=none; b=YbrHy+XDLTal8zy6/XeuYF2WiOCEC5VVqmzszxqKZw8BWX/bSf9/vjAP3nIjA19aHKKXO0 PSYus8kgUmH/g8rb7tFbmJs4+xVTVaI2AKAZ4RKS/btxhsVzoxV6JFlzHk8LdxXqJ+3fkj v0konRPUygvXneBIxl92OZgCqooueQxJMzNOoeVOQaNWUdFAZKUkHGT0VbWbnoRN3fW5jb b02iS5/m5lB/JZbU3CJ3J10Rb6mnazOI3j3kME8BaAGwiNLgffKOye4qe+HmkpLpSDNFX6 HhtdwpJIPhidiXYdUzWOnw116kO7WVAOL5GSac3JpX6n6IWw0tzpBvtoQSH/qg== 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 4XM9JJ0sW7z1C70; Sun, 6 Oct 2024 18:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496I8WJ0055451; Sun, 6 Oct 2024 18:08:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496I8WiA055448; Sun, 6 Oct 2024 18:08:32 GMT (envelope-from git) Date: Sun, 6 Oct 2024 18:08:32 GMT Message-Id: <202410061808.496I8WiA055448@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: 68670a8f738e - main - math/{,py-}faiss: update 1.8.0 =?utf-8?Q?=E2=86=92?= 1.9.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 68670a8f738e67bbbcf6a2a40a3790d30fd9f36c Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=68670a8f738e67bbbcf6a2a40a3790d30fd9f36c commit 68670a8f738e67bbbcf6a2a40a3790d30fd9f36c Author: Yuri Victorovich AuthorDate: 2024-10-06 16:57:01 +0000 Commit: Yuri Victorovich CommitDate: 2024-10-06 18:08:27 +0000 math/{,py-}faiss: update 1.8.0 → 1.9.0 Reported by: portscout --- math/faiss/Makefile | 9 ++++----- math/faiss/distinfo | 8 +++----- math/faiss/pkg-plist | 1 + math/py-faiss/Makefile | 9 +++++---- math/py-faiss/distinfo | 6 +++--- math/py-faiss/files/patch-swig | 21 --------------------- math/py-faiss/pkg-plist | 5 +++++ 7 files changed, 21 insertions(+), 38 deletions(-) diff --git a/math/faiss/Makefile b/math/faiss/Makefile index fb4bebbbadc3..9769ec9ebd6d 100644 --- a/math/faiss/Makefile +++ b/math/faiss/Makefile @@ -1,11 +1,10 @@ PORTNAME= faiss DISTVERSIONPREFIX= v -DISTVERSION= 1.8.0 -PORTREVISION= 1 +DISTVERSION= 1.9.0 CATEGORIES= math -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 70c5de13cd9e2ce94181fe67d9a70eb371ecd554.patch:-p1 # fix GTest linkage +#PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +#PATCHFILES= 70c5de13cd9e2ce94181fe67d9a70eb371ecd554.patch:-p1 # fix GTest linkage MAINTAINER= yuri@FreeBSD.org COMMENT= Library for efficient similarity search & clustering of dense vectors @@ -22,7 +21,7 @@ BUILD_DEPENDS= openblas>0:math/openblas # faiss links with libopenblasp-rN.N.N.s RUN_DEPENDS= openblas>0:math/openblas TEST_DEPENDS= googletest>0:devel/googletest -USES= cmake:testing compiler:c++11-lang localbase:ldflags # tests fail to link, see https://github.com/facebookresearch/faiss/issues/2654 +USES= cmake:testing compiler:c++11-lang localbase:ldflags # tests fail to compile, see https://github.com/facebookresearch/faiss/issues/3913 USE_GITHUB= yes GH_ACCOUNT= facebookresearch diff --git a/math/faiss/distinfo b/math/faiss/distinfo index 6951c712ece4..1595317a3324 100644 --- a/math/faiss/distinfo +++ b/math/faiss/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1709601119 -SHA256 (facebookresearch-faiss-v1.8.0_GH0.tar.gz) = 56ece0a419d62eaa11e39022fa27c8ed6d5a9b9eb7416cc5a0fdbeab07ec2f0c -SIZE (facebookresearch-faiss-v1.8.0_GH0.tar.gz) = 1015506 -SHA256 (70c5de13cd9e2ce94181fe67d9a70eb371ecd554.patch) = a50d06093d3aa6450caa127d6f10bac5325474f5102fea87f07170d11e2293c3 -SIZE (70c5de13cd9e2ce94181fe67d9a70eb371ecd554.patch) = 869 +TIMESTAMP = 1728188633 +SHA256 (facebookresearch-faiss-v1.9.0_GH0.tar.gz) = a6c3c60811aeec2dd8943a41f3df244bfed12371453d9b10eaf6ba55fafad1d2 +SIZE (facebookresearch-faiss-v1.9.0_GH0.tar.gz) = 1084439 diff --git a/math/faiss/pkg-plist b/math/faiss/pkg-plist index 7f4fb030db94..726ba7114f2b 100644 --- a/math/faiss/pkg-plist +++ b/math/faiss/pkg-plist @@ -92,6 +92,7 @@ include/faiss/utils/approx_topk/avx2-inl.h include/faiss/utils/approx_topk/generic.h include/faiss/utils/approx_topk/mode.h include/faiss/utils/approx_topk_hamming/approx_topk_hamming.h +include/faiss/utils/bf16.h include/faiss/utils/distances.h include/faiss/utils/distances_fused/avx512.h include/faiss/utils/distances_fused/distances_fused.h diff --git a/math/py-faiss/Makefile b/math/py-faiss/Makefile index 7040bfb21d68..b83f259c71b5 100644 --- a/math/py-faiss/Makefile +++ b/math/py-faiss/Makefile @@ -1,6 +1,6 @@ PORTNAME= faiss DISTVERSIONPREFIX= v -DISTVERSION= 1.8.0 +DISTVERSION= 1.9.0 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,14 +13,15 @@ LICENSE_FILE= ${WRKSRC}/../../LICENSE BROKEN_i386= clang crashes, see bug#261580 -PY_DEPENDS= ${PYNUMPY} +PY_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} BUILD_DEPENDS= swig:devel/swig \ ${PY_DEPENDS} LIB_DEPENDS= libfaiss.so:math/faiss RUN_DEPENDS= ${PY_DEPENDS} USES= cmake compiler:c++11-lang localbase python -USE_PYTHON= flavors pytest +USE_PYTHON= flavors pytest # tests fail to run, see https://github.com/facebookresearch/faiss/issues/3914 USE_GITHUB= yes GH_ACCOUNT= facebookresearch @@ -33,7 +34,7 @@ TEST_WRKSRC= ${WRKSRC}/../.. TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-patch: # remove GPU testcases - ${RM} -r ${WRKSRC}/../../faiss/gpu + @${RM} -r ${WRKSRC}/../../faiss/gpu do-install: # see https://github.com/facebookresearch/faiss/issues/2194 ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} diff --git a/math/py-faiss/distinfo b/math/py-faiss/distinfo index 191a495b8773..ad7e827ec030 100644 --- a/math/py-faiss/distinfo +++ b/math/py-faiss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709597479 -SHA256 (facebookresearch-faiss-v1.8.0_GH0.tar.gz) = 56ece0a419d62eaa11e39022fa27c8ed6d5a9b9eb7416cc5a0fdbeab07ec2f0c -SIZE (facebookresearch-faiss-v1.8.0_GH0.tar.gz) = 1015506 +TIMESTAMP = 1728191400 +SHA256 (facebookresearch-faiss-v1.9.0_GH0.tar.gz) = a6c3c60811aeec2dd8943a41f3df244bfed12371453d9b10eaf6ba55fafad1d2 +SIZE (facebookresearch-faiss-v1.9.0_GH0.tar.gz) = 1084439 diff --git a/math/py-faiss/files/patch-swig b/math/py-faiss/files/patch-swig deleted file mode 100644 index 1aa5f58bcbd8..000000000000 --- a/math/py-faiss/files/patch-swig +++ /dev/null @@ -1,21 +0,0 @@ -Obtained from: https://github.com/facebookresearch/faiss/commit/d6854136afa3b987defb2c8e8108bad76ebdb949 - ---- swigfaiss.swig.orig 2024-02-29 21:24:50 UTC -+++ swigfaiss.swig -@@ -1022,14 +1022,14 @@ PyObject *swig_ptr (PyObject *a) - return SWIG_NewPointerObj(data, SWIGTYPE_p_bool, 0); - } - if(PyArray_TYPE(ao) == NPY_UINT64) { --#ifdef SWIGWORDSIZE64 -+#if (__SIZEOF_LONG__ == 8) - return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long, 0); - #else - return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long_long, 0); - #endif - } - if(PyArray_TYPE(ao) == NPY_INT64) { --#ifdef SWIGWORDSIZE64 -+#if (__SIZEOF_LONG__ == 8) - return SWIG_NewPointerObj(data, SWIGTYPE_p_long, 0); - #else - return SWIG_NewPointerObj(data, SWIGTYPE_p_long_long, 0); diff --git a/math/py-faiss/pkg-plist b/math/py-faiss/pkg-plist index 6b82a1bd1b71..9f2af6dceddf 100644 --- a/math/py-faiss/pkg-plist +++ b/math/py-faiss/pkg-plist @@ -2,6 +2,7 @@ %%PYTHON_SITELIBDIR%%/faiss/_swigfaiss.so %%PYTHON_SITELIBDIR%%/faiss/array_conversions.py %%PYTHON_SITELIBDIR%%/faiss/class_wrappers.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/README.md %%PYTHON_SITELIBDIR%%/faiss/contrib/__init__.py %%PYTHON_SITELIBDIR%%/faiss/contrib/big_batch_search.py %%PYTHON_SITELIBDIR%%/faiss/contrib/client_server.py @@ -14,6 +15,10 @@ %%PYTHON_SITELIBDIR%%/faiss/contrib/ivf_tools.py %%PYTHON_SITELIBDIR%%/faiss/contrib/ondisk.py %%PYTHON_SITELIBDIR%%/faiss/contrib/rpc.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/torch/README.md +%%PYTHON_SITELIBDIR%%/faiss/contrib/torch/__init__.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/torch/clustering.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/torch/quantization.py %%PYTHON_SITELIBDIR%%/faiss/contrib/torch_utils.py %%PYTHON_SITELIBDIR%%/faiss/contrib/vecs_io.py %%PYTHON_SITELIBDIR%%/faiss/extra_wrappers.py