math/{,py-}faiss: update 1.7.4 → 1.8.0

Reported by:	portscout

7 files changed, 20 insertions, 23 deletions

diff --git a/math/faiss/Makefile b/math/faiss/Makefile
index 37269968021c..c1725d8fb6f2 100644
--- a/math/faiss/Makefile
+++ b/math/faiss/Makefile
@@ -1,9 +1,11 @@
 PORTNAME=	faiss
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.4
-PORTREVISION=	2
+DISTVERSION=	1.8.0
 CATEGORIES=	math
 
+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
 WWW=		https://github.com/facebookresearch/faiss
diff --git a/math/faiss/distinfo b/math/faiss/distinfo
index 4f8bb75144c3..6951c712ece4 100644
--- a/math/faiss/distinfo
+++ b/math/faiss/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1682122179
-SHA256 (facebookresearch-faiss-v1.7.4_GH0.tar.gz) = d9a7b31bf7fd6eb32c10b7ea7ff918160eed5be04fe63bb7b4b4b5f2bbde01ad
-SIZE (facebookresearch-faiss-v1.7.4_GH0.tar.gz) = 909408
+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
diff --git a/math/faiss/files/patch-tests_CMakeLists.txt b/math/faiss/files/patch-tests_CMakeLists.txt
deleted file mode 100644
index 1dea53ae3dbf..000000000000
--- a/math/faiss/files/patch-tests_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-- workaround for https://github.com/facebookresearch/faiss/issues/2827
-
---- tests/CMakeLists.txt.orig	2023-04-19 13:18:30 UTC
-+++ tests/CMakeLists.txt
-@@ -52,6 +52,8 @@ find_package(OpenMP REQUIRED)
- target_link_libraries(faiss_test PRIVATE
-   OpenMP::OpenMP_CXX
-   gtest_main
-+  gtest
-+  pthread
- )
- 
- # Defines `gtest_discover_tests()`.
diff --git a/math/faiss/pkg-plist b/math/faiss/pkg-plist
index a2ceb9a7cc42..7f4fb030db94 100644
--- a/math/faiss/pkg-plist
+++ b/math/faiss/pkg-plist
@@ -21,6 +21,7 @@ include/faiss/IndexIVFAdditiveQuantizer.h
 include/faiss/IndexIVFAdditiveQuantizerFastScan.h
 include/faiss/IndexIVFFastScan.h
 include/faiss/IndexIVFFlat.h
+include/faiss/IndexIVFIndependentQuantizer.h
 include/faiss/IndexIVFPQ.h
 include/faiss/IndexIVFPQFastScan.h
 include/faiss/IndexIVFPQR.h
@@ -45,6 +46,7 @@ include/faiss/VectorTransform.h
 include/faiss/clone_index.h
 include/faiss/impl/AdditiveQuantizer.h
 include/faiss/impl/AuxIndexStructures.h
+include/faiss/impl/CodePacker.h
 include/faiss/impl/DistanceComputer.h
 include/faiss/impl/FaissAssert.h
 include/faiss/impl/FaissException.h
@@ -73,6 +75,7 @@ include/faiss/impl/kmeans1d.h
 include/faiss/impl/lattice_Zn.h
 include/faiss/impl/platform_macros.h
 include/faiss/impl/pq4_fast_scan.h
+include/faiss/impl/residual_quantizer_encode_steps.h
 include/faiss/impl/simd_result_handlers.h
 include/faiss/index_factory.h
 include/faiss/index_io.h
@@ -95,6 +98,7 @@ include/faiss/utils/distances_fused/distances_fused.h
 include/faiss/utils/distances_fused/simdlib_based.h
 include/faiss/utils/extra_distances-inl.h
 include/faiss/utils/extra_distances.h
+include/faiss/utils/fp16-arm.h
 include/faiss/utils/fp16-fp16c.h
 include/faiss/utils/fp16-inl.h
 include/faiss/utils/fp16.h
@@ -107,12 +111,14 @@ include/faiss/utils/hamming_distance/hamdis-inl.h
 include/faiss/utils/hamming_distance/neon-inl.h
 include/faiss/utils/ordered_key_value.h
 include/faiss/utils/partitioning.h
+include/faiss/utils/prefetch.h
 include/faiss/utils/quantize_lut.h
 include/faiss/utils/random.h
 include/faiss/utils/simdlib.h
 include/faiss/utils/simdlib_avx2.h
 include/faiss/utils/simdlib_emulated.h
 include/faiss/utils/simdlib_neon.h
+include/faiss/utils/sorting.h
 include/faiss/utils/transpose/transpose-avx2-inl.h
 include/faiss/utils/utils.h
 lib/libfaiss.so
diff --git a/math/py-faiss/Makefile b/math/py-faiss/Makefile
index 3a08c0498ee1..7040bfb21d68 100644
--- a/math/py-faiss/Makefile
+++ b/math/py-faiss/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	faiss
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.4
-PORTREVISION=	1
+DISTVERSION=	1.8.0
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/math/py-faiss/distinfo b/math/py-faiss/distinfo
index f28f117eac63..191a495b8773 100644
--- a/math/py-faiss/distinfo
+++ b/math/py-faiss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1682124246
-SHA256 (facebookresearch-faiss-v1.7.4_GH0.tar.gz) = d9a7b31bf7fd6eb32c10b7ea7ff918160eed5be04fe63bb7b4b4b5f2bbde01ad
-SIZE (facebookresearch-faiss-v1.7.4_GH0.tar.gz) = 909408
+TIMESTAMP = 1709597479
+SHA256 (facebookresearch-faiss-v1.8.0_GH0.tar.gz) = 56ece0a419d62eaa11e39022fa27c8ed6d5a9b9eb7416cc5a0fdbeab07ec2f0c
+SIZE (facebookresearch-faiss-v1.8.0_GH0.tar.gz) = 1015506
diff --git a/math/py-faiss/pkg-plist b/math/py-faiss/pkg-plist
index cb884c112728..6b82a1bd1b71 100644
--- a/math/py-faiss/pkg-plist
+++ b/math/py-faiss/pkg-plist
@@ -3,6 +3,7 @@
 %%PYTHON_SITELIBDIR%%/faiss/array_conversions.py
 %%PYTHON_SITELIBDIR%%/faiss/class_wrappers.py
 %%PYTHON_SITELIBDIR%%/faiss/contrib/__init__.py
+%%PYTHON_SITELIBDIR%%/faiss/contrib/big_batch_search.py
 %%PYTHON_SITELIBDIR%%/faiss/contrib/client_server.py
 %%PYTHON_SITELIBDIR%%/faiss/contrib/clustering.py
 %%PYTHON_SITELIBDIR%%/faiss/contrib/datasets.py