summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYour Name2023-09-10 10:02:14 +0800
committerYour Name2023-09-10 10:02:14 +0800
commit3130c907e15f72633ffa8ad88a9b96656e72179c (patch)
tree857b6483a361bf424057b719a6da4804e29711ff
parent04fd216352d5c723ede53951d56a86084ff2a66e (diff)
downloadaur-faiss.tar.gz
update
-rw-r--r--.SRCINFO30
-rw-r--r--PKGBUILD62
2 files changed, 3 insertions, 89 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2597966fe0ab..969962384269 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,6 @@ pkgbase = faiss
makedepends = python-installer
makedepends = python-wheel
makedepends = python-setuptools
- makedepends = intel-mkl
makedepends = cuda
makedepends = swig
depends = blas
@@ -26,19 +25,6 @@ pkgname = faiss-cpu
provides = python-faiss
provides = python-faiss-cpu
-pkgname = faiss-cpu-mkl
- depends = blas
- depends = lapack
- depends = openmp
- depends = python
- depends = python-numpy
- depends = intel-mkl
- provides = faiss
- provides = python-faiss
- provides = faiss-mkl
- provides = python-faiss-mkl
- provides = python-faiss-cpu-mkl
-
pkgname = faiss-cuda
depends = blas
depends = lapack
@@ -49,19 +35,3 @@ pkgname = faiss-cuda
provides = faiss
provides = python-faiss
provides = python-faiss-cuda
-
-pkgname = faiss-cuda-mkl
- depends = blas
- depends = lapack
- depends = openmp
- depends = python
- depends = python-numpy
- depends = cuda
- depends = intel-mkl
- provides = faiss
- provides = python-faiss
- provides = faiss-mkl
- provides = python-faiss-mkl
- provides = faiss-cuda
- provides = python-faiss-cuda
- provides = python-faiss-cuda-mkl
diff --git a/PKGBUILD b/PKGBUILD
index 7331b37e60b2..3507e1f25a09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgbase=faiss
-pkgname=('faiss-cpu' 'faiss-cpu-mkl' 'faiss-cuda' 'faiss-cuda-mkl')
+pkgname=('faiss-cpu' 'faiss-cuda')
pkgdesc='A library for efficient similarity search and clustering of dense vectors.'
arch=('x86_64')
url="https://github.com/facebookresearch/faiss"
@@ -9,14 +9,12 @@ pkgrel=1
source=("https://github.com/facebookresearch/faiss/archive/refs/tags/v$pkgver.tar.gz")
sha256sums=('d9a7b31bf7fd6eb32c10b7ea7ff918160eed5be04fe63bb7b4b4b5f2bbde01ad')
depends=('blas' 'lapack' 'openmp' 'python' 'python-numpy' )
-makedepends=('cmake' 'python-build' 'python-installer' 'python-wheel' 'python-setuptools' 'intel-mkl' 'cuda' 'swig')
+makedepends=('cmake' 'python-build' 'python-installer' 'python-wheel' 'python-setuptools' 'cuda' 'swig')
prepare() {
cd $srcdir
cp -r faiss-$pkgver faiss
- cp -r faiss-$pkgver faiss-mkl
cp -r faiss-$pkgver faiss-cuda
- cp -r faiss-$pkgver faiss-cuda-mkl
}
build() {
@@ -32,22 +30,6 @@ build() {
make
cd faiss/python
python -m build --wheel --no-isolation
-
- # mkl
- cd "${srcdir}/faiss-mkl"
- mkdir build && cd build
- cmake -DFAISS_ENABLE_GPU=OFF \
- -DBUILD_TESTING=OFF \
- -DBLA_VENDOR=Intel10_64_dyn \
- -DMKL_LIBRARIES=/opt/intel/mkl \
- -DFAISS_OPT_LEVEL=avx2 \
- -DFAISS_ENABLE_PYTHON=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- ..
- make
- cd faiss/python
- python -m build --wheel --no-isolation
# cuda
cd "${srcdir}/faiss-cuda"
@@ -63,24 +45,6 @@ build() {
make
cd faiss/python
python -m build --wheel --no-isolation
-
- # cuda & mkl
- cd "${srcdir}/faiss-cuda-mkl"
- sed -i "/CMAKE_CUDA_HOST_COMPILER/d" CMakeLists.txt
- mkdir build && cd build
- cmake -DFAISS_ENABLE_GPU=ON \
- -DBUILD_TESTING=OFF \
- -DCUDAToolkit_ROOT=/opt/cuda \
- -DBLA_VENDOR=Intel10_64_dyn \
- -DMKL_LIBRARIES=/opt/intel/mkl \
- -DFAISS_OPT_LEVEL=avx2 \
- -DFAISS_ENABLE_PYTHON=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- ..
- make
- cd faiss/python
- python -m build --wheel --no-isolation
}
package_faiss-cpu() {
@@ -92,16 +56,6 @@ package_faiss-cpu() {
python -m installer --destdir="$pkgdir" dist/*.whl
}
-package_faiss-cpu-mkl() {
- provides=('faiss' 'python-faiss' 'faiss-mkl' 'python-faiss-mkl' 'python-faiss-cpu-mkl')
- depends+=('intel-mkl')
- cd "${srcdir}/faiss-mkl/build"
- make DESTDIR="$pkgdir" install
- install -Dm 644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- cd faiss/python
- python -m installer --destdir="$pkgdir" dist/*.whl
-}
-
package_faiss-cuda() {
provides=('faiss' 'python-faiss' 'python-faiss-cuda')
depends+=('cuda')
@@ -110,14 +64,4 @@ package_faiss-cuda() {
install -Dm 644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
cd faiss/python
python -m installer --destdir="$pkgdir" dist/*.whl
-}
-
-package_faiss-cuda-mkl() {
- provides=('faiss' 'python-faiss' 'faiss-mkl' 'python-faiss-mkl' 'faiss-cuda' 'python-faiss-cuda' 'python-faiss-cuda-mkl')
- depends+=('cuda' 'intel-mkl')
- cd "${srcdir}/faiss-cuda-mkl/build"
- make DESTDIR="$pkgdir" install
- install -Dm 644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- cd faiss/python
- python -m installer --destdir="$pkgdir" dist/*.whl
-}
+} \ No newline at end of file