No patch needed anymore

3 files changed, 4 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c12d10a04b9b..4eda8c0d8657 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,9 +16,7 @@ pkgbase = faiss-cuda-git
 	depends = lapack
 	depends = cuda
 	source = faiss::git+https://github.com/facebookresearch/faiss.git
-	source = cuda10.1.patch
 	sha256sums = SKIP
-	sha256sums = 88be494d517b4879e2dfbf91f74d6f9bc851d038639c5f51f4820278f0309e28
 
 pkgname = faiss-cuda-git
 	pkgdesc = A library for efficient similarity search and clustering of dense vectors, CUDA version.
diff --git a/PKGBUILD b/PKGBUILD
index dcf75ac18226..3e776889f86c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: otaj <jasek.ota@gmail.com>
 # If you want to set only one GPU target compute capability, set _GPU_TARGET, otherwise leave it commented out and it will build default targets (35, 52, 60 and 61)
 
-_GPU_TARGET=61
+#_GPU_TARGET=61
 _pkgname=faiss
 pkgbase=faiss-cuda-git
 pkgname=('faiss-cuda-git' 'python-faiss-cuda-git' 'python2-faiss-cuda-git')
@@ -10,9 +10,8 @@ url="https://github.com/facebookresearch/faiss"
 license=('BSD')
 pkgver=v1.5.1.r0.g7f5b22b
 pkgrel=1
-source=(${_pkgname}::git+https://github.com/facebookresearch/faiss.git 'cuda10.1.patch')
-sha256sums=('SKIP'
-            '88be494d517b4879e2dfbf91f74d6f9bc851d038639c5f51f4820278f0309e28')
+source=(${_pkgname}::git+https://github.com/facebookresearch/faiss.git)
+sha256sums=('SKIP')
 depends=('blas' 'lapack' 'cuda')
 makedepends=('python' 'python2' 'python-numpy' 'python2-numpy' 'swig' 'python-setuptools' 'python2-setuptools')
 
@@ -27,7 +26,6 @@ prepare() {
   cd "${srcdir}/${_pkgname}"
   cp -ar python python2
   sed -i 's/makefile.inc/makefile2.inc/g' python2/Makefile
-  patch -Np1 < ../cuda10.1.patch
 }
 
 
@@ -36,7 +34,7 @@ build() {
   _CONF_FLAGS="--prefix=/usr --with-cuda=/opt/cuda"
   if ! [ -z "$_GPU_TARGET" ]
   then
-    _CONF_FLAGS="$_CONF_FLAGS --with-cuda-arch=-gencode=arch=compute_$_GPU_TARGET,code=compute_$_GPU_TARGET"
+    _CONF_FLAGS="$_CONF_FLAGS --with-cuda-arch=-gencode=arch=compute_$_GPU_TARGET,code=sm_$_GPU_TARGET"
   fi
   ./configure $_CONF_FLAGS --with-python=python2
   mv makefile.inc makefile2.inc
diff --git a/cuda10.1.patch b/cuda10.1.patch
deleted file mode 100644
index c33e46a26aab..000000000000
--- a/cuda10.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gpu/utils/Tensor.cuh b/gpu/utils/Tensor.cuh
-index f925a37..d116324 100644
---- a/gpu/utils/Tensor.cuh
-+++ b/gpu/utils/Tensor.cuh
-@@ -359,7 +359,7 @@ bool canUseIndexType() {
- 
- template <typename IndexType, typename T, typename... U>
- bool canUseIndexType(const T& arg, const U&... args) {
--  return arg.canUseIndexType<IndexType>() &&
-+  return arg.template canUseIndexType<IndexType>() &&
-     canUseIndexType(args...);
- }
-