upgpkg: hipmagma 2.6.2-1

2 files changed, 21 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ff506d2149b..50bf487f63ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hipmagma
 	pkgdesc = Matrix Algebra on GPU and Multicore Architectures
-	pkgver = 2.0.0
+	pkgver = 2.6.2
 	pkgrel = 1
 	url = https://icl.cs.utk.edu/magma/
 	arch = x86_64
@@ -10,14 +10,11 @@ pkgbase = hipmagma
 	makedepends = ninja
 	depends = blas
 	depends = lapack
-	depends = rocm
-	depends = rocm-libs
+	depends = rocm-hip-sdk
 	optdepends = python: for examples and tests
 	optdepends = gcc-fortran: Fortran interface
-	source = hipmagma-2.0.0.tar.gz::https://bitbucket.org/icl/magma/get/hipMAGMAv2.0.0.tar.gz
-	source = disable_magma_sparse.patch
-	sha256sums = 81a16042b81561155189c1450f08d9282ad1ac1e7212ec5015a2063ee52ba3b2
-	sha256sums = 259c38004b26395278cdaf431591974e0589dedc0f8bfc14413f854c2a10424f
+	options = !lto
+	source = magma-2.6.2.tar.gz::http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-2.6.2.tar.gz
+	sha256sums = f7892a14067d92f73714196e4d76e0354c8dc3da80053612ec98965ce6793627
 
 pkgname = hipmagma
-
diff --git a/PKGBUILD b/PKGBUILD
index 54c60f8b9136..624139e5db7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,59 +5,41 @@
 # Contributor: cornholio <vigo.the.unholy.carpathian@gmail.com>
 
 pkgname=hipmagma
-pkgver=2.0.0
+pkgver=2.6.2
 pkgrel=1
 pkgdesc="Matrix Algebra on GPU and Multicore Architectures"
 arch=('x86_64')
 url="https://icl.cs.utk.edu/magma/"
 license=('custom')
-depends=('blas' 'lapack' 'rocm' 'rocm-libs')
+depends=('blas' 'lapack' 'rocm-hip-sdk')
 makedepends=('gcc-fortran' 'cmake' 'ninja')
 optdepends=('python: for examples and tests'
             'gcc-fortran: Fortran interface')
-source=("${pkgname}-${pkgver}.tar.gz::https://bitbucket.org/icl/magma/get/hipMAGMAv${pkgver}.tar.gz"
-        'disable_magma_sparse.patch')
-sha256sums=('81a16042b81561155189c1450f08d9282ad1ac1e7212ec5015a2063ee52ba3b2'
-            '259c38004b26395278cdaf431591974e0589dedc0f8bfc14413f854c2a10424f')
-
-_dir="icl-magma-dda09490fbae"
-
-prepare() {
-  cd ${_dir}
-
-  # Temporarily disable magma-sparse until it's fixed by magma upstream:
-  # https://bugs.archlinux.org/task/67094
-  patch -Np1 -i "${srcdir}/disable_magma_sparse.patch"
-}
+_pkgname="magma"
+source=("${_pkgname}-${pkgver}.tar.gz::http://icl.cs.utk.edu/projectsfiles/${_pkgname}/downloads/${_pkgname}-${pkgver}.tar.gz")
+sha256sums=('f7892a14067d92f73714196e4d76e0354c8dc3da80053612ec98965ce6793627')
+options=(!lto)
 
 build() {
-  cd ${_dir}
-  mkdir -p build
-
-  cp make.inc-examples/make.inc.hip_openblas make.inc
-
-  export CC=/usr/bin/gcc
-  export CXX=/usr/bin/g++
-  export FC=/usr/bin/gfortran
-  export OPENBLASDIR=/usr
-
-  make -f make.gen.hipMAGMA
-  make generate
+  cd ${_pkgname}-${pkgver}
 
+  CC=/usr/bin/gcc \
+  CXX=/opt/rocm/g++ \
+  FC=/usr/bin/gfortran \
+  CXXFLAGS="${CXXFLAGS} -fcf-protection=none" \
   cmake \
-    -B build \
-    -G Ninja \
+    -Bbuild \
+    -GNinja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_SHARED_LIBS=ON \
-    .
-
+    -DMAGMA_ENABLE_HIP=ON \
+    -DCMAKE_CXX_COMPILER=/usr/bin/hipcc
   ninja -C build
-
 }
 
 package() {
-  cd ${_dir}
+  cd "${_pkgname}-${pkgver}"
   DESTDIR="${pkgdir}" ninja -Cbuild install
 
   install -d "${pkgdir}"/usr/share/magma/example