diff --git a/math/faiss/Makefile b/math/faiss/Makefile index bf26484f1ddd..620843d67aaa 100644 --- a/math/faiss/Makefile +++ b/math/faiss/Makefile @@ -1,28 +1,29 @@ PORTNAME= faiss DISTVERSIONPREFIX= v -DISTVERSION= 1.7.2 +DISTVERSION= 1.7.3 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Library for efficient similarity search & clustering of dense vectors WWW= https://github.com/facebookresearch/faiss LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE .if !exists(/usr/include/omp.h) BROKEN= requires OpenMP support that is missing on this architecture .endif BUILD_DEPENDS= openblas>0:math/openblas # faiss links with libopenblasp-rN.N.N.so (installed by default only on amd64,i386), so use non-filename-specific DEPENDS commands RUN_DEPENDS= openblas>0:math/openblas +TEST_DEPENDS= googletest>0:devel/googletest -USES= cmake:testing compiler:c++11-lang +USES= cmake:testing compiler:c++11-lang localbase:ldflags # tests fail to link, see https://github.com/facebookresearch/faiss/issues/2654 USE_GITHUB= yes GH_ACCOUNT= facebookresearch CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BUILD_TESTING FAISS_ENABLE_GPU FAISS_ENABLE_PYTHON .include diff --git a/math/faiss/distinfo b/math/faiss/distinfo index 692e7da7cd70..ade7dbc6d2ee 100644 --- a/math/faiss/distinfo +++ b/math/faiss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642235176 -SHA256 (facebookresearch-faiss-v1.7.2_GH0.tar.gz) = d49b4afd6a7a5b64f260a236ee9b2efb760edb08c33d5ea5610c2f078a5995ec -SIZE (facebookresearch-faiss-v1.7.2_GH0.tar.gz) = 740431 +TIMESTAMP = 1673176591 +SHA256 (facebookresearch-faiss-v1.7.3_GH0.tar.gz) = dda1b031957789e6a6f3b37d48ad135b9557a33c5013c1c245ef4bced2d787de +SIZE (facebookresearch-faiss-v1.7.3_GH0.tar.gz) = 843640 diff --git a/math/faiss/pkg-plist b/math/faiss/pkg-plist index c35e65cf7ffd..f34b79b86cb7 100644 --- a/math/faiss/pkg-plist +++ b/math/faiss/pkg-plist @@ -1,90 +1,104 @@ include/faiss/AutoTune.h include/faiss/Clustering.h include/faiss/IVFlib.h include/faiss/Index.h include/faiss/Index2Layer.h include/faiss/IndexAdditiveQuantizer.h +include/faiss/IndexAdditiveQuantizerFastScan.h include/faiss/IndexBinary.h include/faiss/IndexBinaryFlat.h include/faiss/IndexBinaryFromFloat.h include/faiss/IndexBinaryHNSW.h include/faiss/IndexBinaryHash.h include/faiss/IndexBinaryIVF.h +include/faiss/IndexFastScan.h include/faiss/IndexFlat.h include/faiss/IndexFlatCodes.h include/faiss/IndexHNSW.h +include/faiss/IndexIDMap.h include/faiss/IndexIVF.h include/faiss/IndexIVFAdditiveQuantizer.h +include/faiss/IndexIVFAdditiveQuantizerFastScan.h +include/faiss/IndexIVFFastScan.h include/faiss/IndexIVFFlat.h include/faiss/IndexIVFPQ.h include/faiss/IndexIVFPQFastScan.h include/faiss/IndexIVFPQR.h include/faiss/IndexIVFSpectralHash.h include/faiss/IndexLSH.h include/faiss/IndexLattice.h include/faiss/IndexNNDescent.h include/faiss/IndexNSG.h include/faiss/IndexPQ.h include/faiss/IndexPQFastScan.h include/faiss/IndexPreTransform.h include/faiss/IndexRefine.h include/faiss/IndexReplicas.h +include/faiss/IndexRowwiseMinMax.h include/faiss/IndexScalarQuantizer.h include/faiss/IndexShards.h include/faiss/MatrixStats.h include/faiss/MetaIndexes.h include/faiss/MetricType.h include/faiss/VectorTransform.h include/faiss/clone_index.h include/faiss/impl/AdditiveQuantizer.h include/faiss/impl/AuxIndexStructures.h +include/faiss/impl/DistanceComputer.h include/faiss/impl/FaissAssert.h include/faiss/impl/FaissException.h include/faiss/impl/HNSW.h +include/faiss/impl/IDSelector.h include/faiss/impl/LocalSearchQuantizer.h +include/faiss/impl/LookupTableScaler.h include/faiss/impl/NNDescent.h include/faiss/impl/NSG.h include/faiss/impl/PolysemousTraining.h +include/faiss/impl/ProductAdditiveQuantizer.h include/faiss/impl/ProductQuantizer-inl.h include/faiss/impl/ProductQuantizer.h +include/faiss/impl/Quantizer.h include/faiss/impl/ResidualQuantizer.h include/faiss/impl/ResultHandler.h include/faiss/impl/ScalarQuantizer.h include/faiss/impl/ThreadedIndex-inl.h include/faiss/impl/ThreadedIndex.h include/faiss/impl/io.h include/faiss/impl/io_macros.h 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/simd_result_handlers.h include/faiss/index_factory.h include/faiss/index_io.h include/faiss/invlists/BlockInvertedLists.h include/faiss/invlists/DirectMap.h include/faiss/invlists/InvertedLists.h include/faiss/invlists/InvertedListsIOHook.h include/faiss/invlists/OnDiskInvertedLists.h include/faiss/utils/AlignedTable.h include/faiss/utils/Heap.h include/faiss/utils/WorkerThread.h include/faiss/utils/distances.h include/faiss/utils/extra_distances-inl.h include/faiss/utils/extra_distances.h +include/faiss/utils/fp16-fp16c.h +include/faiss/utils/fp16-inl.h +include/faiss/utils/fp16.h include/faiss/utils/hamming-inl.h include/faiss/utils/hamming.h include/faiss/utils/ordered_key_value.h include/faiss/utils/partitioning.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/utils.h lib/libfaiss.so %%DATADIR%%/faiss-config-version.cmake %%DATADIR%%/faiss-config.cmake %%DATADIR%%/faiss-targets-%%CMAKE_BUILD_TYPE%%.cmake %%DATADIR%%/faiss-targets.cmake diff --git a/math/py-faiss/Makefile b/math/py-faiss/Makefile index 445bcb3cd445..20ba38055555 100644 --- a/math/py-faiss/Makefile +++ b/math/py-faiss/Makefile @@ -1,45 +1,45 @@ PORTNAME= faiss DISTVERSIONPREFIX= v -DISTVERSION= 1.7.2 +DISTVERSION= 1.7.3 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Library for efficient similarity search & clustering of dense vectors WWW= https://github.com/facebookresearch/faiss LICENSE= MIT LICENSE_FILE= ${WRKSRC}/../../LICENSE BROKEN_i386= clang crashes, see bug#261580 PY_DEPENDS= ${PYNUMPY} 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_GITHUB= yes GH_ACCOUNT= facebookresearch WRKSRC_SUBDIR= faiss/python PLIST_FILES= \ ${PYTHON_SITELIBDIR}/${PORTNAME}/_swigfaiss.so \ ${PYTHON_SITELIBDIR}/${PORTNAME}/__init__.py \ ${PYTHON_SITELIBDIR}/${PORTNAME}/loader.py \ ${PYTHON_SITELIBDIR}/${PORTNAME}/swigfaiss.py do-install: # see https://github.com/facebookresearch/faiss/issues/2194 ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} ${INSTALL_LIB} ${BUILD_WRKSRC}/_swigfaiss.so ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} .for f in __init__.py loader.py swigfaiss.py ${INSTALL_DATA} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} .endfor do-test: install @${PYTHON_CMD} ${FILESDIR}/test.py .include diff --git a/math/py-faiss/distinfo b/math/py-faiss/distinfo index 692e7da7cd70..8604ef8daaa4 100644 --- a/math/py-faiss/distinfo +++ b/math/py-faiss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642235176 -SHA256 (facebookresearch-faiss-v1.7.2_GH0.tar.gz) = d49b4afd6a7a5b64f260a236ee9b2efb760edb08c33d5ea5610c2f078a5995ec -SIZE (facebookresearch-faiss-v1.7.2_GH0.tar.gz) = 740431 +TIMESTAMP = 1673177458 +SHA256 (facebookresearch-faiss-v1.7.3_GH0.tar.gz) = dda1b031957789e6a6f3b37d48ad135b9557a33c5013c1c245ef4bced2d787de +SIZE (facebookresearch-faiss-v1.7.3_GH0.tar.gz) = 843640