Updated to 1.6.2

2 files changed, 20 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f8e1c1e9963..04f303b167b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = magma
 	pkgdesc = Provides a dense linear algebra library similar to LAPACK but for heterogeneous/hybrid architectures, starting with current 'Multicore+GPU' systems.
-	pkgver = 1.4.1
+	pkgver = 1.6.2
 	pkgrel = 1
 	url = http://icl.cs.utk.edu/magma/
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = acml-gfortran
 	depends = cuda>=5.0.0
 	depends = gcc-libs-multilib
 	depends = gsl
 	depends = python
-	depends = acml-gfortran
 	depends = cblas
 	options = staticlibs
-	source = http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-1.4.1.tar.gz
-	sha1sums = 3e6bc7c2d6500508134b6cdf48985f7c8b94c89b
+	source = http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-1.6.2.tar.gz
+	sha1sums = 121bedf6c9fa2243b67fb5ee501a86d566c97a93
 
 pkgname = magma
 
diff --git a/PKGBUILD b/PKGBUILD
index dc2901acce6f..987253d0c197 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,52 +3,46 @@
 
 ##### Configuration Options
 # Specify GPU compute capability Tesla (1.x) or Fermi (2.x) or Kepler (3.x)
-_GPU_TARGET=Tesla
+#_GPU_TARGET=Tesla
 #_GPU_TARGET=Fermi
-#_GPU_TARGET=Kepler
+_GPU_TARGET=Kepler
 ##### End
 
 pkgname=magma
-pkgver=1.4.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="Provides a dense linear algebra library similar to LAPACK but for heterogeneous/hybrid architectures, starting with current 'Multicore+GPU' systems."
 arch=("i686" "x86_64")
 url="http://icl.cs.utk.edu/magma/"
 license=(custom)
-depends=("cuda>=5.0.0" "gcc-libs-multilib" "gsl" "python" "acml-gfortran" "cblas")
-makedepends=("acml-gfortran")
+depends=("cuda>=5.0.0" "gcc-libs-multilib" "gsl" "python" "cblas")
 options=('staticlibs')
-sha1sums=('3e6bc7c2d6500508134b6cdf48985f7c8b94c89b')
+sha1sums=('121bedf6c9fa2243b67fb5ee501a86d566c97a93')
 source=("http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${pkgver}.tar.gz")
 
 build() {
-
 	cd ${srcdir}/magma-${pkgver}
 
 	# Fix Makefile
-	cp make.inc.acml make.inc
-	sed -i "/GPU_TARGET ?=/c GPU_TARGET = ${_GPU_TARGET}" make.inc
+	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 '/#ACMLDIR/c ACMLDIR   = /usr/lib/acml/gfortran' make.inc
-	sed -i '/#CBLASDIR/c CBLASDIR   = /usr/lib' make.inc
-	sed -i 's^_mp^^g' make.inc
-	sed -i 's^_mv^^g' make.inc
-	sed -i 's^-L$(ACMLDIR)/gfortran64/lib^-L$(ACMLDIR)^g' make.inc
-	sed -i 's^-L$(CBLASDIR)/lib^-L$(CBLASDIR)^g' make.inc
-
-	make clean
-	make all
-	make prefix="${srcdir}/install/" install
+	sed -i '/#OPENBLASDIR/c OPENBLASDIR   = /usr/lib' make.inc
+    sed -i 's/^FFLAGS/CXXFLAGS  = $(CFLAGS)\nFFLAGS/g ' make.inc
+	sed -i 's^-L$(OPENBLASDIR)/lib^-L$(OPENBLASDIR)^g' make.inc
 
 	make clean
-	sed -i 's^-O3^-fPIC -O3^g' make.inc
-	sed -i 's^-fopenmp^-fPIC -fopenmp^g' make.inc
-	sed -i '/NVOPTS    =/c NVOPTS    =       -O3 -DADD_ -Xcompiler "-fno-strict-aliasing -fPIC"' make.inc
 	make shared
 	make prefix="${srcdir}/install/" install
 }
 
-package(){
+check() {
+    msg "Making testing"
+    cd ${srcdir}/magma-${pkgver}
+    make testing
+}
+
+package() {
 	mkdir -p ${pkgdir}/opt/magma/testing
 	cp -ru ${srcdir}/magma-${pkgver}/testing/* ${pkgdir}/opt/magma/testing/
 	cp -ru ${srcdir}/install/* ${pkgdir}/opt/magma/
@@ -56,5 +50,4 @@ package(){
 	rm -rf ${pkgdir}/opt/magma/lib/pkgconfig	
 	mkdir -p ${pkgdir}/usr/share/licenses/magma
 	cp ${srcdir}/magma-${pkgver}/COPYRIGHT ${pkgdir}/usr/share/licenses/magma/LICENSE
-
 }