Version bump to 7.1.1

2 files changed, 47 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37f3b86817b9..30f7af8238ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = superlu_dist
-	pkgdesc = Set of subroutines to solve a sparse linear system (MPI parallel version)
-	pkgver = 6.2.0
+	pkgdesc = Distributed memory, MPI based SuperLU
+	pkgver = 7.1.1
 	pkgrel = 1
 	url = https://github.com/xiaoyeli/superlu_dist
 	arch = x86_64
@@ -9,10 +9,9 @@ pkgbase = superlu_dist
 	makedepends = gcc-fortran
 	depends = lapack
 	depends = parmetis
-	depends = combblas
+	depends = openblas
 	options = staticlibs
-	source = https://github.com/xiaoyeli/superlu_dist/archive/v6.2.0.tar.gz
-	sha512sums = ed60abc68bec718e20c53f902708bd38462db6e816cf50d87d89b45f48210c21c94dedf174af42f51c7aa8060203454d2a5f0788efed7e30d4d7c91254dbec8f
+	source = superlu_dist-7.1.1::https://github.com/xiaoyeli/superlu_dist/archive/v7.1.1.tar.gz
+	sha512sums = b5e4c6a99a0f71bb81170f6f90e6300d584ada608dd31d43f8bb3aa5ad6e4ba00f75043bbe14899d6f8bdb597552ef6eeb3cc1db20e06798421de71d810b32ee
 
 pkgname = superlu_dist
-
diff --git a/PKGBUILD b/PKGBUILD
index 6fb82c979678..c6279e7a6cfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,56 @@
-# Maintainer: Christian Pfeiffer <cpfeiffer at live dot de>
+# Maintainer: Carlos Aznarán <caznaranl@uni.pe>
+# Maintainer: Gianluca Pettinello <g_pet at hotmail dot com>
+# Contributor: Christian Pfeiffer <cpfeiffer at live dot de>
 pkgname=superlu_dist
-pkgver=6.2.0
+pkgver=7.1.1
 pkgrel=1
-pkgdesc="Set of subroutines to solve a sparse linear system (MPI parallel version)"
+pkgdesc="Distributed memory, MPI based SuperLU"
 arch=('x86_64')
-url="https://github.com/xiaoyeli/superlu_dist"
+url="https://github.com/xiaoyeli/${pkgname}"
 license=('custom')
-depends=('lapack' 'parmetis' 'combblas')
-makedepends=('cmake' 'gcc-fortran')
-source=(${url}/archive/v$pkgver.tar.gz)
-
-sha512sums=('ed60abc68bec718e20c53f902708bd38462db6e816cf50d87d89b45f48210c21c94dedf174af42f51c7aa8060203454d2a5f0788efed7e30d4d7c91254dbec8f')
+depends=('lapack' 'parmetis' 'openblas') # 'combblas'
+makedepends=('cmake' 'gcc-fortran')      # 'ninja'
+source=(${pkgname}-${pkgver}::${url}/archive/v${pkgver}.tar.gz)
+sha512sums=('b5e4c6a99a0f71bb81170f6f90e6300d584ada608dd31d43f8bb3aa5ad6e4ba00f75043bbe14899d6f8bdb597552ef6eeb3cc1db20e06798421de71d810b32ee')
 options=('staticlibs')
 
-prepare() {
-  mkdir -p build
+# prepare() {
+#   # CombBLAS uses C++14 in its headers. Otherwise the code won't build
+#   sed -i "s/set(CMAKE_CXX_STANDARD 11)/set(CMAKE_CXX_STANDARD 14)/" "${pkgname}-${pkgver}/CMakeLists.txt"
+# }
 
-  # CombBLAS uses C++14 in its headers. Otherwise the code won't build
-  sed -i "s/set(CMAKE_CXX_STANDARD 11)/set(CMAKE_CXX_STANDARD 14)/" "$srcdir/$pkgname-$pkgver/CMakeLists.txt"
-}
+# -DTPL_ENABLE_COMBBLASLIB=ON \
+# -DTPL_COMBBLAS_INCLUDE_DIRS="/usr/include/CombBLAS;/usr/include/CombBLAS/BipartiteMatchings" \
+# -DTPL_COMBBLAS_LIBRARIES="/usr/lib/libCombBLAS.so" \
+# -DCMAKE_INSTALL_LIBDIR=lib \
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver/ \
-  	-DTPL_PARMETIS_INCLUDE_DIRS="/usr/include" \
-  	-DTPL_PARMETIS_LIBRARIES="/usr/lib/libparmetis.so" \
-  	-DTPL_ENABLE_COMBBLASLIB=ON \
-  	-DTPL_COMBBLAS_INCLUDE_DIRS="/usr/include/CombBLAS;/usr/include/CombBLAS/BipartiteMatchings" \
-  	-DTPL_COMBBLAS_LIBRARIES="/usr/lib/libCombBLAS.so" \
-  	-DTPL_ENABLE_BLASLIB=OFF \
-  	-DTPL_ENABLE_LAPACKLIB=ON \
-  	-DBUILD_SHARED_LIBS=ON \
-	-DCMAKE_BUILD_TYPE=Release \
-  	-DCMAKE_INSTALL_LIBDIR=lib \
+  cmake \
+    -S ${pkgname}-${pkgver} \
+    -B build-cmake \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_CXX_STANDARD=14 \
+    -DCMAKE_C_COMPILER=gcc \
+    -DCMAKE_CXX_COMPILER=g++ \
+    -DCMAKE_Fortran_COMPILER=gfortran \
+    -DTPL_PARMETIS_INCLUDE_DIRS="/usr/include" \
+    -DTPL_PARMETIS_LIBRARIES="/usr/lib/libparmetis.so" \
+    -DTPL_ENABLE_INTERNAL_BLASLIB=OFF \
+    -DTPL_ENABLE_LAPACKLIB=ON \
     -DCMAKE_INSTALL_INCLUDEDIR=include/superlu_dist \
-  	-DCMAKE_INSTALL_PREFIX=/usr
-
-  make
+    -Wno-dev
+  cmake --build build-cmake --target all
 }
 
-package() {
-  cd build
-
-  make DESTDIR="${pkgdir}" install
-
-  mkdir -p $pkgdir/usr/share/doc/$pkgname \
-           $pkgdir/usr/share/licenses/$pkgname
+# check() {
+#   ctest -E "pdtest_*" --test-dir build-cmake
+# }
 
-  install -m644 $srcdir/$pkgname-$pkgver/README.md $pkgdir/usr/share/doc/$pkgname
-  install -m644 $srcdir/$pkgname-$pkgver/License.txt $pkgdir/usr/share/licenses/$pkgname
-  install -m644 $srcdir/$pkgname-$pkgver/DOC/ug.pdf $pkgdir/usr/share/doc/$pkgname/ug.pdf
+package() {
+  DESTDIR="${pkgdir}" cmake --build build-cmake --target install
+  install -Dm644 ${pkgname}-${pkgver}/README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+  install -Dm644 ${pkgname}-${pkgver}/License.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 ${pkgname}-${pkgver}/DOC/ug.pdf "${pkgdir}/usr/share/doc/${pkgname}/ug.pdf"
 }
-