git: 68670a8f738e - main - math/{,py-}faiss: update 1.8.0 → 1.9.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 06 Oct 2024 18:08:32 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=68670a8f738e67bbbcf6a2a40a3790d30fd9f36c
commit 68670a8f738e67bbbcf6a2a40a3790d30fd9f36c
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-10-06 16:57:01 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
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