update by lilac

2 files changed, 15 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86ce21dd79d4..9bf4de54e1cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = mxnet-git
 	pkgdesc = A flexible and efficient library for deep learning
-	pkgver = 2.0.0.r10843.b7f7525cba
+	pkgver = 2.0.0.r10875.0bff90dcfe
 	pkgrel = 1
 	url = http://mxnet.io/
 	arch = x86_64
 	license = Apache
+	makedepends = chrpath
 	makedepends = cmake
 	makedepends = cuda
 	makedepends = cudnn
@@ -18,13 +19,14 @@ pkgbase = mxnet-git
 	depends = hdf5
 	depends = intel-mkl
 	depends = intel-tbb
+	depends = libjpeg-turbo
 	depends = opencv
 	depends = protobuf
 	depends = python-graphviz
 	depends = python-numpy
 	depends = python-requests
 	depends = zeromq
-	provides = mxnet=2.0.0.r10843.b7f7525cba
+	provides = mxnet=2.0.0.r10875.0bff90dcfe
 	conflicts = mxnet
 	source = mxnet::git+https://github.com/apache/incubator-mxnet.git
 	sha512sums = SKIP
@@ -38,6 +40,7 @@ pkgname = mxnet-cuda-git
 	depends = hdf5
 	depends = intel-mkl
 	depends = intel-tbb
+	depends = libjpeg-turbo
 	depends = opencv
 	depends = protobuf
 	depends = python-graphviz
@@ -47,8 +50,8 @@ pkgname = mxnet-cuda-git
 	depends = cuda
 	depends = cudnn
 	depends = nccl
-	provides = mxnet=2.0.0.r10843.b7f7525cba
-	provides = mxnet-cuda=2.0.0.r10843.b7f7525cba
+	provides = mxnet=2.0.0.r10875.0bff90dcfe
+	provides = mxnet-cuda=2.0.0.r10875.0bff90dcfe
 	conflicts = mxnet
-	conflicts = mxnet-cuda=2.0.0.r10843.b7f7525cba
+	conflicts = mxnet-cuda
 
diff --git a/PKGBUILD b/PKGBUILD
index 78e115da9f90..4022c4182610 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _cudaarch="6.0;6.1;7.0;7.5"
 _pkgname=mxnet
 pkgname=('mxnet-git' 'mxnet-cuda-git')
 _pkgver=2.0.0
-pkgver=2.0.0.r10843.b7f7525cba
+pkgver=2.0.0.r10875.0bff90dcfe
 pkgrel=1
 pkgdesc='A flexible and efficient library for deep learning'
 arch=('x86_64')
@@ -17,6 +17,7 @@ depends=(
   'hdf5'
   'intel-mkl'
   'intel-tbb'
+  'libjpeg-turbo'
   'opencv'
   'protobuf'
   'python-graphviz'
@@ -25,6 +26,7 @@ depends=(
   'zeromq'
 )
 makedepends=(
+  'chrpath'
   'cmake'
   'cuda'
   'cudnn'
@@ -73,6 +75,7 @@ build() {
     -DCMAKE_INSTALL_PREFIX:PATH=/usr
     -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
     -DINSTALL_DOCUMENTATION:BOOL=OFF
+    -DINSTALL_MKLDNN:BOOL=OFF
     -DMKL_USE_SINGLE_DYNAMIC_LIBRARY:BOOL=ON
     -DUSE_BLAS=mkl
     -DUSE_CPP_PACKAGE:BOOL=ON
@@ -81,6 +84,7 @@ build() {
     -DUSE_GPERFTOOLS:BOOL=OFF
     -DUSE_JEMALLOC:BOOL=OFF
     -DUSE_LAPACK:BOOL=ON
+    -DUSE_LIBJPEG_TURBO:BOOL=ON
     -DUSE_MKLDNN:BOOL=ON
     -DUSE_MKL_IF_AVAILABLE:BOOL=ON
     -DUSE_OPENCV:BOOL=ON
@@ -88,8 +92,6 @@ build() {
     -DUSE_S3:BOOL=ON
 )
 
-  # use gcc version compatible with CUDA
-
   # building with CUDA
   cd "${srcdir}/mxnet-cuda-git/build"
   cmake \
@@ -125,6 +127,7 @@ _package() {
 
   if [ -f "${srcdir}/${pkgname}/build/im2rec" ]; then
     install -Dm755 "${srcdir}/${pkgname}/build/im2rec" "${pkgdir}/usr/bin/im2rec"
+    chrpath --delete "${pkgdir}/usr/bin/im2rec"
   fi
 
   # install python binding
@@ -134,14 +137,12 @@ _package() {
 
   # create neccesarry soft links
   ln -sf '/usr/lib/libmxnet.so' "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/mxnet/libmxnet.so"
-  ln -s "/usr/include" "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/mxnet/include"
 
   # remove unwantted files
   rm -rfv "${pkgdir}/usr/mxnet"
   rm -rfv "${pkgdir}/usr/lib/cmake" "${pkgdir}/usr/share/doc"
   find "${pkgdir}" -type f -name '*dnn*' -delete
   find "${pkgdir}" -name '*.a' -delete
-  find "${pkgdir}" -type d -empty -delete
 }
 
 
@@ -153,7 +154,7 @@ package_mxnet-cuda-git() {
   pkgdesc="${pkgdesc} (with CUDA)"
   depends+=(cuda cudnn nccl)
   provides+=(mxnet-cuda=${pkgver})
-  conflicts+=(mxnet-cuda=${pkgver})
+  conflicts+=(mxnet-cuda)
 
   _package
 }