From nobody Sat Apr 22 05:10:41 2023 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 4Q3KGn6gp6z46C2L; Sat, 22 Apr 2023 05:10:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q3KGn4cM9z41Gk; Sat, 22 Apr 2023 05:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682140241; 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=psfE+KUAJMytQnWWYFj+iPW10ewmXRYnpW6tgwD9YoQ=; b=GnSFu7qrVdW7aA5gqw6JCmFxuG0bipB8fQF3j2HH40daKaHr1S6l32v2w0mfaIERzOarEB FJ6QhkasxmRQb1B6gj4O9Txsu95+d6OygBo1jCkN7Z+IBeyhuceKbUa6ndnCiDRW+grv7/ YUChWR/9pH5SkTx4w+LK2Vgk/jzW1uQ78E9xzI4UoKNyixwwzYEk6Kj1MvDaGI0D5J/MLO 6KdTb70NlkFVVwC3Xzh5JfWPjpSPkL+pJC1kadf8UdwBR2pLMlK5pz49AJzsk9715c+8OU x5kZIBxy5hY3jIeWw0wVsDVxEN9pnVSbfaB+V9jIp0UgnKdl6cYu8dXPKIBuTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682140241; 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=psfE+KUAJMytQnWWYFj+iPW10ewmXRYnpW6tgwD9YoQ=; b=CUwvpBNFvoqOIJnEHoFKV7ifjNG5vTZ+WV3Aw5FlJBf7AzAufJCjzhtE6fBQWSXyHlvP20 hSOXh7yCzxj0Ry4bjsOKxak3kx4nqVeEDwqRh1Mo3PHNgdw0M6QXewhDwgtXM1tN0EVEQM BG05+sn1Spc1QSmR7TxQol/uDxERvXqo0SumgZ3dXMSxghXebRQi36PYAxCTjYCkfvNKcW f6AZeonhGMWnqikn284p22ngZF2te0EMXZMoqhZoem5E+R6zSsjjkqNetGOgGhe0NvaO+6 iMUMdqptJ0hK7q/PGkNKWyOqMNx0F5SaBiR7BJGNAVXV4dVcAcE5bKduIBo0kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682140241; a=rsa-sha256; cv=none; b=VPhRBrnv44fXHskIMRkMFWuiXl1ASbJ9elzuoy2EdBOSxktcVnzpu8EljkNVPNTYAvKheF KyOywiY7LPHiE1v3LsREyLvIkhvFRvALXSbYzTz5VnfquiSAxnFQw7iD4bh0XLcQnoGvoz zXfaO5o59NJiFvCgvS5Z6hUrKeObZSI3LGTzhVJ09/MyXa0CdcjbQsYW8PF4DceAIoTaQn 0fJn0i/KNhqhT1qVdZiwXxmZZeY9yGsn8GpDRkcYjoOFt2hdaGEUC4zaGjtYmmGRiZJ0DT VJcbSQ/BO7EUmyzhMV9LVoeojZHMpVMf2jc4JHkr7sQL5uuHNw54Dkc1XBJfGw== 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 4Q3KGn3HkGzpRS; Sat, 22 Apr 2023 05:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M5Afqh096005; Sat, 22 Apr 2023 05:10:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M5AfrW096004; Sat, 22 Apr 2023 05:10:41 GMT (envelope-from git) Date: Sat, 22 Apr 2023 05:10:41 GMT Message-Id: <202304220510.33M5AfrW096004@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: c6c877853c23 - main - =?utf-8?Q?math/{,py-}faiss:=20Update=201.7.3=20=E2=86=92=201.7.4?= 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: c6c877853c23c5b81f3591fda3d389d18c1c27da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6c877853c23c5b81f3591fda3d389d18c1c27da commit c6c877853c23c5b81f3591fda3d389d18c1c27da Author: Yuri Victorovich AuthorDate: 2023-04-22 04:03:03 +0000 Commit: Yuri Victorovich CommitDate: 2023-04-22 05:10:38 +0000 math/{,py-}faiss: Update 1.7.3 → 1.7.4 Reported by: portscout --- math/faiss/Makefile | 4 +++- math/faiss/distinfo | 6 +++--- math/faiss/files/patch-tests_CMakeLists.txt | 13 +++++++++++++ math/faiss/pkg-plist | 18 ++++++++++++++++++ math/py-faiss/Makefile | 21 +++++++++++---------- math/py-faiss/distinfo | 6 +++--- math/py-faiss/pkg-plist | 21 +++++++++++++++++++++ 7 files changed, 72 insertions(+), 17 deletions(-) diff --git a/math/faiss/Makefile b/math/faiss/Makefile index 620843d67aaa..8ca5a98d8c07 100644 --- a/math/faiss/Makefile +++ b/math/faiss/Makefile @@ -1,6 +1,6 @@ PORTNAME= faiss DISTVERSIONPREFIX= v -DISTVERSION= 1.7.3 +DISTVERSION= 1.7.4 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -23,6 +23,8 @@ USES= cmake:testing compiler:c++11-lang localbase:ldflags # tests fail to link, USE_GITHUB= yes GH_ACCOUNT= facebookresearch +#LDFLAGS+= -lgtest #-pthread + CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BUILD_TESTING FAISS_ENABLE_GPU FAISS_ENABLE_PYTHON diff --git a/math/faiss/distinfo b/math/faiss/distinfo index ade7dbc6d2ee..4f8bb75144c3 100644 --- a/math/faiss/distinfo +++ b/math/faiss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673176591 -SHA256 (facebookresearch-faiss-v1.7.3_GH0.tar.gz) = dda1b031957789e6a6f3b37d48ad135b9557a33c5013c1c245ef4bced2d787de -SIZE (facebookresearch-faiss-v1.7.3_GH0.tar.gz) = 843640 +TIMESTAMP = 1682122179 +SHA256 (facebookresearch-faiss-v1.7.4_GH0.tar.gz) = d9a7b31bf7fd6eb32c10b7ea7ff918160eed5be04fe63bb7b4b4b5f2bbde01ad +SIZE (facebookresearch-faiss-v1.7.4_GH0.tar.gz) = 909408 diff --git a/math/faiss/files/patch-tests_CMakeLists.txt b/math/faiss/files/patch-tests_CMakeLists.txt new file mode 100644 index 000000000000..1dea53ae3dbf --- /dev/null +++ b/math/faiss/files/patch-tests_CMakeLists.txt @@ -0,0 +1,13 @@ +- 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 f34b79b86cb7..a2ceb9a7cc42 100644 --- a/math/faiss/pkg-plist +++ b/math/faiss/pkg-plist @@ -37,6 +37,7 @@ 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 @@ -63,6 +64,9 @@ include/faiss/impl/ResultHandler.h include/faiss/impl/ScalarQuantizer.h include/faiss/impl/ThreadedIndex-inl.h include/faiss/impl/ThreadedIndex.h +include/faiss/impl/code_distance/code_distance-avx2.h +include/faiss/impl/code_distance/code_distance-generic.h +include/faiss/impl/code_distance/code_distance.h include/faiss/impl/io.h include/faiss/impl/io_macros.h include/faiss/impl/kmeans1d.h @@ -80,7 +84,15 @@ include/faiss/invlists/OnDiskInvertedLists.h include/faiss/utils/AlignedTable.h include/faiss/utils/Heap.h include/faiss/utils/WorkerThread.h +include/faiss/utils/approx_topk/approx_topk.h +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/distances.h +include/faiss/utils/distances_fused/avx512.h +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-fp16c.h @@ -88,6 +100,11 @@ 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/avx2-inl.h +include/faiss/utils/hamming_distance/common.h +include/faiss/utils/hamming_distance/generic-inl.h +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/quantize_lut.h @@ -96,6 +113,7 @@ 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/transpose/transpose-avx2-inl.h include/faiss/utils/utils.h lib/libfaiss.so %%DATADIR%%/faiss-config-version.cmake diff --git a/math/py-faiss/Makefile b/math/py-faiss/Makefile index 20ba38055555..6b11bebd8c30 100644 --- a/math/py-faiss/Makefile +++ b/math/py-faiss/Makefile @@ -1,6 +1,6 @@ PORTNAME= faiss DISTVERSIONPREFIX= v -DISTVERSION= 1.7.3 +DISTVERSION= 1.7.4 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,26 +20,27 @@ LIB_DEPENDS= libfaiss.so:math/faiss RUN_DEPENDS= ${PY_DEPENDS} USES= cmake compiler:c++11-lang localbase python +USE_PYTHON= flavors pytest 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 +CMAKE_ARGS= -DPython_EXECUTABLE:STRING=${PYTHON_CMD} + +TEST_WRKSRC= ${WRKSRC}/../.. +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 loader.py swigfaiss.py +.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 - -do-test: install - @${PYTHON_CMD} ${FILESDIR}/test.py + cd ${BUILD_WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} .include diff --git a/math/py-faiss/distinfo b/math/py-faiss/distinfo index 8604ef8daaa4..f28f117eac63 100644 --- a/math/py-faiss/distinfo +++ b/math/py-faiss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673177458 -SHA256 (facebookresearch-faiss-v1.7.3_GH0.tar.gz) = dda1b031957789e6a6f3b37d48ad135b9557a33c5013c1c245ef4bced2d787de -SIZE (facebookresearch-faiss-v1.7.3_GH0.tar.gz) = 843640 +TIMESTAMP = 1682124246 +SHA256 (facebookresearch-faiss-v1.7.4_GH0.tar.gz) = d9a7b31bf7fd6eb32c10b7ea7ff918160eed5be04fe63bb7b4b4b5f2bbde01ad +SIZE (facebookresearch-faiss-v1.7.4_GH0.tar.gz) = 909408 diff --git a/math/py-faiss/pkg-plist b/math/py-faiss/pkg-plist new file mode 100644 index 000000000000..cb884c112728 --- /dev/null +++ b/math/py-faiss/pkg-plist @@ -0,0 +1,21 @@ +%%PYTHON_SITELIBDIR%%/faiss/__init__.py +%%PYTHON_SITELIBDIR%%/faiss/_swigfaiss.so +%%PYTHON_SITELIBDIR%%/faiss/array_conversions.py +%%PYTHON_SITELIBDIR%%/faiss/class_wrappers.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/__init__.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/client_server.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/clustering.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/datasets.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/evaluation.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/exhaustive_search.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/factory_tools.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/inspect_tools.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/ivf_tools.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/ondisk.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/rpc.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/torch_utils.py +%%PYTHON_SITELIBDIR%%/faiss/contrib/vecs_io.py +%%PYTHON_SITELIBDIR%%/faiss/extra_wrappers.py +%%PYTHON_SITELIBDIR%%/faiss/gpu_wrappers.py +%%PYTHON_SITELIBDIR%%/faiss/loader.py +%%PYTHON_SITELIBDIR%%/faiss/swigfaiss.py