summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2021-01-18 15:18:30 +0100
committerMichel Zou2021-01-18 15:18:30 +0100
commit8a06deb1dc6d49c0816500da754b24ad46cfc609 (patch)
tree83b35e6a62b9dc4be6d71264fc276d364126430f
parent3db09905f8d630e5ece21587b5213f7d6ca4a230 (diff)
downloadaur-8a06deb1dc6d49c0816500da754b24ad46cfc609.tar.gz
drop cuda
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD31
2 files changed, 3 insertions, 43 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1dfdbb8eddf2..034dc9bd6ba3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,8 +7,6 @@ pkgbase = dlib
license = custom
makedepends = cmake
makedepends = ninja
- makedepends = cuda
- makedepends = cudnn
depends = cblas
depends = lapack
depends = blas
@@ -22,16 +20,3 @@ pkgbase = dlib
pkgname = dlib
-pkgname = dlib-cuda
- pkgdesc = A general purpose cross-platform C++ library designed using contract programming and modern C++ techniques (with CUDA)
- depends = cblas
- depends = lapack
- depends = blas
- depends = libjpeg-turbo
- depends = libpng
- depends = libx11
- depends = cuda
- depends = cudnn
- provides = dlib
- conflicts = dlib
-
diff --git a/PKGBUILD b/PKGBUILD
index 096456de50ad..884ae3bd625e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,7 @@
# Maintainer: AdriĆ  Arrufat <swiftscythe@gmail.com>
# Contributor: perlawk
-pkgbase=dlib
-pkgname=("dlib" "dlib-cuda")
+pkgname=dlib
pkgver=19.21
pkgrel=5
pkgdesc="A general purpose cross-platform C++ library designed using contract programming and modern C++ techniques"
@@ -18,7 +17,7 @@ depends=('cblas'
'libx11')
optdepends=('giflib: for GIF support'
'sqlite: for sqlite support')
-makedepends=('cmake' 'ninja' 'cuda' 'cudnn')
+makedepends=('cmake' 'ninja')
source=("http://dlib.net/files/${pkgname}-${pkgver}.tar.bz2")
sha256sums=('be728a03ae8c4dc8b48408d90392a3c28bc6642a6eb22f3885895b434d7df53c')
@@ -34,36 +33,12 @@ build() {
-DDLIB_USE_CUDA=OFF \
"../${pkgbase}-${pkgver}"
ninja ${MAKEFLAGS:--j1}
-
- cd "${srcdir}"
- mkdir -p build-cuda && cd build-cuda
- cmake -GNinja \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
- -DBUILD_SHARED_LIBS=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DUSE_AVX_INSTRUCTIONS=ON \
- -DDLIB_USE_CUDA=ON \
- "../${pkgbase}-${pkgver}"
- ninja ${MAKEFLAGS:--j1}
}
-package_dlib() {
+package() {
cd "${srcdir}/build"
DESTDIR=${pkgdir} ninja install
install -Dm644 "../${pkgbase}-${pkgver}/dlib/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
# remove redundant external libraries
rm -r "${pkgdir}/usr/include/dlib/external"
}
-
-package_dlib-cuda() {
- pkgdesc="A general purpose cross-platform C++ library designed using contract programming and modern C++ techniques (with CUDA)"
- depends+=(cuda cudnn)
- conflicts=(dlib)
- provides=(dlib)
- cd "${srcdir}/build-cuda"
- DESTDIR=${pkgdir} ninja install
- install -Dm644 "../${pkgbase}-${pkgver}/dlib/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
- # remove redundant external libraries
- rm -r "${pkgdir}/usr/include/dlib/external"
-}