update by lilac

2 files changed, 10 insertions, 94 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fa25339ddd2..87fc067986d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = mxnet-git
+pkgbase = mxnet-cuda-git
 	pkgdesc = A flexible and efficient library for deep learning
-	pkgver = 1.5.1.r10323.a37dcd46cb
+	pkgver = 1.5.1.r10334.e3f5dade60
 	pkgrel = 1
 	url = http://mxnet.io/
 	arch = x86_64
@@ -12,7 +12,6 @@ pkgbase = mxnet-git
 	makedepends = git
 	makedepends = gtk3
 	makedepends = nccl
-	makedepends = opencv
 	makedepends = patchelf
 	makedepends = qt5-base
 	depends = curl
@@ -27,44 +26,11 @@ pkgbase = mxnet-git
 	depends = python-numpy
 	depends = python-requests
 	depends = zeromq
-	provides = mxnet=1.5.1.r10323.a37dcd46cb
+	provides = mxnet=1.5.1.r10334.e3f5dade60
 	conflicts = mxnet
 	source = mxnet::git+https://github.com/apache/incubator-mxnet.git
 	sha512sums = SKIP
 
-pkgname = mxnet-git
-	depends = curl
-	depends = cblas
-	depends = double-conversion
-	depends = hdf5
-	depends = intel-tbb
-	depends = lapack
-	depends = openblas
-	depends = protobuf
-	depends = python-graphviz
-	depends = python-numpy
-	depends = python-requests
-	depends = zeromq
-	depends = opencv
-
-pkgname = mxnet-mkl-git
-	pkgdesc = A flexible and efficient library for deep learning (with MKL-DNN)
-	depends = curl
-	depends = cblas
-	depends = double-conversion
-	depends = hdf5
-	depends = intel-tbb
-	depends = lapack
-	depends = openblas
-	depends = protobuf
-	depends = python-graphviz
-	depends = python-numpy
-	depends = python-requests
-	depends = zeromq
-	depends = opencv
-	provides = mxnet
-	conflicts = mxnet
-
 pkgname = mxnet-cuda-git
 	pkgdesc = A flexible and efficient library for deep learning (with CUDA)
 	depends = curl
@@ -82,8 +48,6 @@ pkgname = mxnet-cuda-git
 	depends = cuda
 	depends = cudnn
 	depends = nccl
-	provides = mxnet
-	conflicts = mxnet
 
 pkgname = mxnet-cuda-mkl-git
 	pkgdesc = A flexible and efficient library for deep learning (with CUDA and MKL-DNN)
@@ -102,6 +66,4 @@ pkgname = mxnet-cuda-mkl-git
 	depends = cuda
 	depends = cudnn
 	depends = nccl
-	provides = mxnet
-	conflicts = mxnet
 
diff --git a/PKGBUILD b/PKGBUILD
index 87e413c91401..31e1fe2746b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Butui Hu <hot123tea123@gmail.com>
 
-cudaarch=All
+cudaarch=Common
 _pkgname=mxnet
-pkgname=('mxnet-git' 'mxnet-mkl-git' 'mxnet-cuda-git' 'mxnet-cuda-mkl-git')
+pkgname=('mxnet-cuda-git' 'mxnet-cuda-mkl-git')
 _pkgver=1.5.1
-pkgver=1.5.1.r10323.a37dcd46cb
+pkgver=1.5.1.r10334.e3f5dade60
 pkgrel=1
 pkgdesc="A flexible and efficient library for deep learning"
 arch=('x86_64')
@@ -32,7 +32,6 @@ makedepends=(
   'git'
   'gtk3'
   'nccl'
-  'opencv'
   'patchelf'
   'qt5-base'
 )
@@ -58,8 +57,9 @@ prepare() {
   mkdir "${srcdir}/${_pkgname}/build"
   cp -r "${srcdir}/${_pkgname}" "${srcdir}/mxnet-cuda-git"
   cp -r "${srcdir}/${_pkgname}" "${srcdir}/mxnet-cuda-mkl-git"
-  cp -r "${srcdir}/${_pkgname}" "${srcdir}/mxnet-git"
-  cp -r "${srcdir}/${_pkgname}" "${srcdir}/mxnet-mkl-git"
+  # use gcc version compatible with CUDA
+  export CC=/opt/cuda/bin/gcc
+  export CXX=/opt/cuda/bin/g++
 }
 
 build() {
@@ -84,37 +84,6 @@ build() {
     -DUSE_S3:BOOL=ON
 )
 
-  # building without MKL-DNN and without CUDA
-  cd "${srcdir}/mxnet-git/build"
-  cmake \
-    ${cmake_opts[@]} \
-    -DUSE_CUDA:BOOL=OFF \
-    -DUSE_CUDNN:BOOL=OFF \
-    -DUSE_MKLDNN:BOOL=OFF \
-    -DUSE_NCCL:BOOL=OFF \
-    -DUSE_OPENCV:BOOL=ON \
-    ..
-  make
-  cd ../python
-  python setup.py build --with-cython
-
-  # building with MKL-DNN and without CUDA
-  cd "${srcdir}/mxnet-mkl-git/build"
-  cmake \
-    ${cmake_opts[@]} \
-    -DUSE_CUDA:BOOL=OFF \
-    -DUSE_CUDNN:BOOL=OFF \
-    -DUSE_MKLDNN:BOOL=ON \
-    -DUSE_NCCL:BOOL=OFF \
-    -DUSE_OPENCV:BOOL=ON \
-    ..
-  make
-  cd ../python
-  python setup.py build --with-cython
-
-  # use gcc version compatible with CUDA
-  export CC=/opt/cuda/bin/gcc
-  export CXX=/opt/cuda/bin/g++
   # building with CUDA and without MKL-DNN
   cd "${srcdir}/mxnet-cuda-git/build"
   cmake \
@@ -173,32 +142,17 @@ _package() {
   find "${pkgdir}" -type d -empty -delete
 }
 
-package_mxnet-git() {
-  depends+=(opencv)
-  _package
-}
-
 package_mxnet-cuda-git() {
   pkgdesc="${pkgdesc} (with CUDA)"
   depends+=(cuda cudnn nccl)
-  conflicts=(mxnet)
-  provides=(mxnet)
-  _package
-}
 
-package_mxnet-mkl-git() {
-  pkgdesc="${pkgdesc} (with MKL-DNN)"
-  depends+=(opencv)
-  conflicts=(mxnet)
-  provides=(mxnet)
   _package
 }
 
 package_mxnet-cuda-mkl-git() {
   pkgdesc="${pkgdesc} (with CUDA and MKL-DNN)"
   depends+=(cuda cudnn nccl)
-  conflicts=(mxnet)
-  provides=(mxnet)
+
   _package
 }
 # vim:set ts=2 sw=2 et: