Better dependency handling

2 files changed, 36 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0be31b569dda..521bfd5e3ac0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,8 +5,12 @@ pkgbase = mxnet
 	url = http://mxnet.io/
 	arch = x86_64
 	license = Apache2
-	depends = cuda
-	depends = cudnn
+	makedepends = git
+	optdepends = cuda: GPU support
+	optdepends = cudnn: GPU support
+	optdepends = intel-mkl: MKL support
+	optdepends = opencv: computer vision support
+	provides = libmxnet
 	source = mxnet::git+https://github.com/dmlc/mxnet
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 0933f14545e1..411741a30645 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,22 +6,44 @@ pkgdesc="Flexible and Efficient Library for Deep Learning"
 arch=('x86_64')
 url="http://mxnet.io/"
 license=('Apache2')
-depends=(cuda cudnn)
-# makedepends=()
+depends=()
+optdepends=('cuda: GPU support'
+            'cudnn: GPU support'
+            'intel-mkl: MKL support'
+            'opencv: computer vision support')
+makedepends=(git)
 # checkdepends=()
-# optdepends=()
-# provides=()
+provides=(libmxnet)
 source=("$pkgname::git+https://github.com/dmlc/mxnet")
 md5sums=('SKIP')
 
 prepare() {
-  cd "$pkgname"
+  cd "$srcdir/$pkgname"
   git checkout "v$pkgver"
   git submodule update --init --recursive
   cp make/config.mk .
-  echo "USE_CUDA=1" >>config.mk
-  echo "USE_CUDA_PATH=/opt/cuda" >>config.mk
-  echo "USE_CUDNN=1" >>config.mk
+  if (pacman -Q cuda &>/dev/null && pacman -Q cudnn &>/dev/null); then
+    msg2 "CUDA support enabled"
+    echo "USE_CUDA=1" >>config.mk
+    echo "USE_CUDA_PATH=/opt/cuda" >>config.mk
+    echo "USE_CUDNN=1" >>config.mk
+  else
+    msg2 "CUDA support disabled"
+  fi
+  if (pacman -Q intel-mkl &>/dev/null); then
+    msg2 "MKL support enabled"
+    echo "USE_BLAS=mkl" >>config.mk
+    echo "USE_INTEL_PATH=/opt/intel/composerxe/linux" >>config.mk
+    echo "USE_STATIC_MKL=1" >>config.mk
+  else
+    msg2 "MKL support disabled"
+  fi
+  if (pacman -Q opencv &>/dev/null); then
+    msg2 "OpenCV support enabled"
+  else
+    msg2 "OpenCV support disabled"
+    echo "USE_OPENCV=0" >>config.mk
+  fi
 }
 
 build() {
@@ -33,4 +55,3 @@ package() {
   cd "$pkgdir"
   install -D "$srcdir/$pkgname/lib/libmxnet.so" "$pkgdir/usr/lib/libmxnet.so"
 }
-