diff --git a/math/faiss/Makefile b/math/faiss/Makefile index 5275f1e8680d..cd6f48fcf18d 100644 --- a/math/faiss/Makefile +++ b/math/faiss/Makefile @@ -1,36 +1,36 @@ PORTNAME= faiss DISTVERSIONPREFIX= v -DISTVERSION= 1.14.2 +DISTVERSION= 1.14.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= benchmark>0:devel/benchmark \ gflags>0:devel/gflags \ googletest>0:devel/googletest 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 CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BUILD_TESTING FAISS_ENABLE_GPU FAISS_ENABLE_PYTHON post-extract: # workaround for https://github.com/facebookresearch/faiss/issues/3913 @${LN} -s ${WRKSRC} ${WRKDIR}/faiss # tests as of 1.13.1: 100% tests passed, 0 tests failed out of 138 .include diff --git a/math/faiss/distinfo b/math/faiss/distinfo index 4dfbdb79d581..a5119b65aeb9 100644 --- a/math/faiss/distinfo +++ b/math/faiss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1779742519 -SHA256 (facebookresearch-faiss-v1.14.2_GH0.tar.gz) = 13c3643d1e96baf660e7aee45032464d3c0297188d2be74f3167e5393033246c -SIZE (facebookresearch-faiss-v1.14.2_GH0.tar.gz) = 1595385 +TIMESTAMP = 1781802617 +SHA256 (facebookresearch-faiss-v1.14.3_GH0.tar.gz) = 7f3c4ed9aec3bd7524382862f5fcbd4d8984e2a8979ff3bdb2c0bcea5144149e +SIZE (facebookresearch-faiss-v1.14.3_GH0.tar.gz) = 1680994 diff --git a/math/faiss/pkg-plist b/math/faiss/pkg-plist index 0a67de3ec111..0b318ab564eb 100644 --- a/math/faiss/pkg-plist +++ b/math/faiss/pkg-plist @@ -1,192 +1,194 @@ 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/IndexIVFFlatPanorama.h include/faiss/IndexIVFIndependentQuantizer.h include/faiss/IndexIVFPQ.h include/faiss/IndexIVFPQFastScan.h include/faiss/IndexIVFPQR.h include/faiss/IndexIVFRaBitQ.h include/faiss/IndexIVFRaBitQFastScan.h include/faiss/IndexIVFSpectralHash.h include/faiss/IndexLSH.h include/faiss/IndexLattice.h include/faiss/IndexNNDescent.h include/faiss/IndexNSG.h include/faiss/IndexNeuralNetCodec.h include/faiss/IndexPQ.h include/faiss/IndexPQFastScan.h include/faiss/IndexPreTransform.h include/faiss/IndexRaBitQ.h include/faiss/IndexRaBitQFastScan.h include/faiss/IndexRefine.h include/faiss/IndexReplicas.h include/faiss/IndexRowwiseMinMax.h include/faiss/IndexScalarQuantizer.h include/faiss/IndexShards.h include/faiss/IndexShardsIVF.h include/faiss/MatrixStats.h include/faiss/MetaIndexes.h include/faiss/MetricType.h include/faiss/SuperKMeans.h include/faiss/VectorTransform.h include/faiss/clone_index.h include/faiss/factory_tools.h include/faiss/impl/AdSampling.h include/faiss/impl/AdditiveQuantizer.h include/faiss/impl/AuxIndexStructures.h include/faiss/impl/ClusteringHelpers.h include/faiss/impl/ClusteringInitialization.h include/faiss/impl/CodePacker.h include/faiss/impl/CodePackerRaBitQ.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/InvertedListScannerStats.h include/faiss/impl/LocalSearchQuantizer.h include/faiss/impl/NNDescent.h include/faiss/impl/NSG.h include/faiss/impl/Panorama.h include/faiss/impl/PanoramaStats.h include/faiss/impl/PdxLayout.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/RaBitQUtils.h include/faiss/impl/RaBitQuantizer.h include/faiss/impl/RaBitQuantizerMultiBit.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/VisitedTable.h include/faiss/impl/approx_topk/approx_topk.h include/faiss/impl/approx_topk/generic.h include/faiss/impl/approx_topk/rq_beam_search_tab-inl.h include/faiss/impl/approx_topk/rq_beam_search_tab.h include/faiss/impl/approx_topk/simdlib256-inl.h include/faiss/impl/expanded_scanners.h include/faiss/impl/fast_scan/FastScanDistancePostProcessing.h include/faiss/impl/fast_scan/LookupTableScaler.h include/faiss/impl/fast_scan/accumulate_loops.h include/faiss/impl/fast_scan/accumulate_loops_512.h include/faiss/impl/fast_scan/decompose_qbs.h include/faiss/impl/fast_scan/dispatching.h include/faiss/impl/fast_scan/fast_scan.h include/faiss/impl/fast_scan/kernels_simd256.h include/faiss/impl/fast_scan/kernels_simd512.h include/faiss/impl/fast_scan/rabitq_dispatching.h include/faiss/impl/fast_scan/rabitq_result_handler.h include/faiss/impl/fast_scan/simd_result_handlers.h include/faiss/impl/hnsw/LockVector.h include/faiss/impl/hnsw/MinimaxHeap.h include/faiss/impl/index_read_utils.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/mapped_io.h include/faiss/impl/maybe_owned_vector.h include/faiss/impl/platform_macros.h include/faiss/impl/pq_code_distance/IVFPQScanner_impl.h include/faiss/impl/pq_code_distance/IVFPQ_QueryTables.h include/faiss/impl/pq_code_distance/PQDistanceComputer_impl.h include/faiss/impl/pq_code_distance/pq_code_distance-avx2.h include/faiss/impl/pq_code_distance/pq_code_distance-avx512.h include/faiss/impl/pq_code_distance/pq_code_distance-generic.h include/faiss/impl/pq_code_distance/pq_code_distance-inl.h include/faiss/impl/residual_quantizer_encode_steps.h include/faiss/impl/scalar_quantizer/codecs.h include/faiss/impl/scalar_quantizer/distance_computers.h include/faiss/impl/scalar_quantizer/quantizers.h include/faiss/impl/scalar_quantizer/scanners.h include/faiss/impl/scalar_quantizer/similarities.h include/faiss/impl/scalar_quantizer/sq-dispatch.h include/faiss/impl/scalar_quantizer/training.h include/faiss/impl/simd_dispatch.h include/faiss/impl/simdlib/simdlib.h include/faiss/impl/simdlib/simdlib_avx2.h include/faiss/impl/simdlib/simdlib_avx512.h include/faiss/impl/simdlib/simdlib_dispatch.h include/faiss/impl/simdlib/simdlib_emulated.h include/faiss/impl/simdlib/simdlib_neon.h include/faiss/impl/simdlib/simdlib_ppc64.h include/faiss/impl/zerocopy_io.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/NeuralNet.h include/faiss/utils/WorkerThread.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/distances_fused.h include/faiss/utils/distances_fused/simdlib_kernel-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 include/faiss/utils/hamming-inl.h include/faiss/utils/hamming.h include/faiss/utils/hamming_distance/common.h include/faiss/utils/hamming_distance/hamming_computer-avx2.h include/faiss/utils/hamming_distance/hamming_computer-avx512.h +include/faiss/utils/hamming_distance/hamming_computer-avx512_spr.h include/faiss/utils/hamming_distance/hamming_computer-generic.h include/faiss/utils/hamming_distance/hamming_computer-neon.h include/faiss/utils/hamming_distance/hamming_computer-rvv.h include/faiss/utils/hamming_distance/hamming_computer.h include/faiss/utils/hamming_distance/hamming_impl.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/rabitq_simd.h include/faiss/utils/random.h include/faiss/utils/simd_impl/IVFFlatScanner-inl.h include/faiss/utils/simd_impl/distances_autovec-inl.h include/faiss/utils/simd_impl/distances_simdlib256.h include/faiss/utils/simd_impl/distances_sse-inl.h include/faiss/utils/simd_impl/exhaustive_L2sqr_blas_cmax.h include/faiss/utils/simd_impl/super_kmeans_dispatch.h include/faiss/utils/simd_impl/super_kmeans_kernels.h include/faiss/utils/simd_levels.h include/faiss/utils/sorting.h include/faiss/utils/transpose/transpose-avx2-inl.h include/faiss/utils/transpose/transpose-avx512-inl.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 a96024d23487..3c0932df2271 100644 --- a/math/py-faiss/Makefile +++ b/math/py-faiss/Makefile @@ -1,50 +1,50 @@ PORTNAME= faiss DISTVERSIONPREFIX= v -DISTVERSION= 1.14.2 +DISTVERSION= 1.14.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= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.25:math/py-numpy@${PY_FLAVOR} \ ${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} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} USES= cmake compiler:c++11-lang localbase python USE_PYTHON= flavors pytest # tests fail to run, see https://github.com/facebookresearch/faiss/issues/3914 USE_GITHUB= yes GH_ACCOUNT= facebookresearch WRKSRC_SUBDIR= faiss/python CMAKE_ARGS= -DPython_EXECUTABLE:STRING=${PYTHON_CMD} TEST_WRKSRC= ${WRKSRC}/../../tests TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-patch: # remove GPU testcases @${RM} -r ${WRKSRC}/../../faiss/gpu 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 array_conversions.py class_wrappers.py extra_wrappers.py gpu_wrappers.py loader.py swigfaiss.py ${INSTALL_DATA} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} .endfor cd ${BUILD_WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} # tests expect the modle common_io to be available, but this module is questionable, see https://github.com/facebookresearch/faiss/issues/4865 .include diff --git a/math/py-faiss/distinfo b/math/py-faiss/distinfo index da708378952e..d08c9b6e86a0 100644 --- a/math/py-faiss/distinfo +++ b/math/py-faiss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1779749380 -SHA256 (facebookresearch-faiss-v1.14.2_GH0.tar.gz) = 13c3643d1e96baf660e7aee45032464d3c0297188d2be74f3167e5393033246c -SIZE (facebookresearch-faiss-v1.14.2_GH0.tar.gz) = 1595385 +TIMESTAMP = 1781803255 +SHA256 (facebookresearch-faiss-v1.14.3_GH0.tar.gz) = 7f3c4ed9aec3bd7524382862f5fcbd4d8984e2a8979ff3bdb2c0bcea5144149e +SIZE (facebookresearch-faiss-v1.14.3_GH0.tar.gz) = 1680994