Updated to 2.2.0

2 files changed, 41 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ade3f75b912e..85851c67e963 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Oct 26 15:17:51 UTC 2016
+# Sat Dec  3 06:01:45 UTC 2016
 pkgbase = magma
 	pkgdesc = Provides a dense linear algebra library similar to LAPACK but for heterogeneous/hybrid architectures, starting with current 'Multicore+GPU' systems. (with CUDA)
-	pkgver = 2.1.0
-	pkgrel = 2
+	pkgver = 2.2.0
+	pkgrel = 1
 	url = http://icl.cs.utk.edu/magma/
 	arch = i686
 	arch = x86_64
@@ -13,10 +13,10 @@ pkgbase = magma
 	depends = gcc-libs-multilib
 	depends = gsl
 	depends = python
-	depends = cblas
+	depends = openblas-lapack
 	options = staticlibs
-	source = http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-2.1.0.tar.gz
-	sha1sums = 8bf2dce79bc55e414aae0bc858956f8bd08b9c91
+	source = http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-2.2.0.tar.gz
+	sha1sums = 7f884e4c80dd296939174282d69d19cc1cca71a5
 
 pkgname = magma
 
diff --git a/PKGBUILD b/PKGBUILD
index b4c2d7eb0022..5b8f3268e24b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,50 +8,59 @@
 #_GPU_TARGET=Maxwell
 # Can also be one of these: sm20 sm30 sm35 sm50
 _GPU_TARGET=sm30
+# Set _USE_CMAKE=1 to use CMake
+_USE_CMAKE=0
 ##### End
 
 pkgname=magma
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Provides a dense linear algebra library similar to LAPACK but for heterogeneous/hybrid architectures, starting with current 'Multicore+GPU' systems. (with CUDA)"
 arch=("i686" "x86_64")
 url="http://icl.cs.utk.edu/magma/"
 license=(custom)
-depends=("cuda>=6.5.0" "gcc-libs-multilib" "gsl" "python" "cblas")
+depends=("cuda>=6.5.0" "gcc-libs-multilib" "gsl" "python" "openblas-lapack")
 makedepends=("gcc-fortran")
 options=('staticlibs')
-sha1sums=('8bf2dce79bc55e414aae0bc858956f8bd08b9c91')
+sha1sums=('7f884e4c80dd296939174282d69d19cc1cca71a5')
 source=("http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${pkgver}.tar.gz")
 
 build() {
 	cd "${srcdir}/magma-${pkgver}"
 
-    # Fix Makefile
-    cp make.inc.openblas make.inc
-    sed -i "/#GPU_TARGET ?=/c GPU_TARGET = ${_GPU_TARGET}" make.inc
-    sed -i '/#CUDADIR/c CUDADIR   = /opt/cuda' make.inc
-    sed -i '/#OPENBLASDIR/c OPENBLASDIR   = /usr/lib' make.inc
-    sed -i 's^-L$(OPENBLASDIR)/lib^-L$(OPENBLASDIR)^g' make.inc
+    if ((_USE_CMAKE == 0))
+    then
+        # Modify Makefile
+        cp make.inc-examples/make.inc.openblas make.inc
+        sed -i "/#GPU_TARGET ?=/c GPU_TARGET = ${_GPU_TARGET}" make.inc
+        sed -i '/#CUDADIR/c CUDADIR   = /opt/cuda' make.inc
+        sed -i '/#OPENBLASDIR/c OPENBLASDIR   = /usr/lib' make.inc
+        sed -i 's^-L$(OPENBLASDIR)/lib^-L$(OPENBLASDIR)^g' make.inc
 
-    make clean
-    make lib
-    #make test
-    make sparse
-
-    # FIXME: there is no shared library
-    #mkdir build && cd build
-    #cmake -DGPU_TARGET=${_GPU_TARGET} \
-    #    -DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc \
-    #    -DCMAKE_INSTALL_PREFIX=/opt/magma ..
-    #make
+        make clean
+        make lib
+        make sparse
+        make test
+    else
+        # FIXME: there is no shared library
+        mkdir build && cd build
+        cmake -DGPU_TARGET=${_GPU_TARGET} \
+            -DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc \
+            -DCMAKE_INSTALL_PREFIX=/opt/magma ..
+        make
+    fi
 }
 
 package() {
-    cd "${srcdir}/magma-${pkgver}"
-    make prefix="${pkgdir}/opt/magma" install
-
-    #cd "${srcdir}/magma-${pkgver}/build"
-    #make DESTDIR="${pkgdir}" install
+    if ((_USE_CMAKE == 0))
+    then
+        cd "${srcdir}/magma-${pkgver}"
+        make prefix="${pkgdir}/opt/magma" install
+        #rm "${pkgdir}/opt/magma/include/*.mod"
+    else
+        cd "${srcdir}/magma-${pkgver}/build"
+        make DESTDIR="${pkgdir}" install
+    fi
 
     mkdir -p ${pkgdir}/opt/magma/example
     cp -ru ${srcdir}/magma-${pkgver}/example/* ${pkgdir}/opt/magma/example/