summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorneeshy2020-03-03 23:55:45 -0500
committerneeshy2020-03-07 14:29:30 -0500
commitc03fea15cf0706f0184520f2a1839667c7b51a8f (patch)
tree00a0645d90b82b9fed1c96a20632ce5ebacabd02
parent76ebe35b61cab3267c95bf3ad5575b34212824ac (diff)
downloadaur-c03fea15cf0706f0184520f2a1839667c7b51a8f.tar.gz
Cleanup
Consistent style across project Remove extraneous dependencies Update packages Update checksums and .SRCINFO Specify proper license Fix prefixes Prefer make to ninja Much more TODO: miopen, rocm-cmake{,-git}, rock-dkms{,-git}, Remove duplicates in makedepends and depends git submodules
-rw-r--r--.SRCINFO23
-rw-r--r--PKGBUILD51
2 files changed, 36 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f7e8e2e5c5b..e87fc19091a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
pkgbase = rocalution
pkgdesc = Next generation library for iterative sparse solvers for ROCm platform.
- pkgver = 3.0.0
+ pkgver = 3.1.0
pkgrel = 1
url = https://github.com/ROCmSoftwarePlatform/rocALUTION
arch = x86_64
- license = NCSAOSL
- makedepends = git
+ license = custom:NCSAOSL
makedepends = cmake
- makedepends = gcc
- makedepends = ninja
- makedepends = hcc>=3.0.0
- makedepends = hip>=3.0.0
- makedepends = rocsparse>=3.0.0
- makedepends = rocblas>=3.0.0
- makedepends = rocprim>=3.0.0
- makedepends = rocm-comgr>=3.0.0
+ makedepends = hcc>=3.1.0
+ makedepends = hip>=3.1.0
+ makedepends = rocsparse>=3.1.0
+ makedepends = rocblas>=3.1.0
+ makedepends = rocprim>=3.1.0
+ makedepends = rocm-comgr>=3.1.0
makedepends = python2
makedepends = rocminfo
depends = hcc
@@ -23,8 +20,8 @@ pkgbase = rocalution
depends = rocblas
depends = rocprim
depends = rocm-comgr
- source = https://github.com/ROCmSoftwarePlatform/rocALUTION/archive/rocm-3.0.tar.gz
- sha256sums = b4666753aef8017c6c09da82880dd68cbff80ab41a967ef543ec344ee6848dc3
+ source = https://github.com/ROCmSoftwarePlatform/rocALUTION/archive/rocm-3.1.tar.gz
+ sha256sums = 45c96916f915fcacab3a94f111912e9511167977678603f3c7253053eeec6513
pkgname = rocalution
diff --git a/PKGBUILD b/PKGBUILD
index aedabbd91f6..70016b50788 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
# Maintainer: Markus Näther <naetherm@informatik.uni-freiburg.de>
pkgname=rocalution
-pkgver=3.0.0
+_pkgver=3.1
+pkgver="$_pkgver.0"
pkgrel=1
pkgdesc="Next generation library for iterative sparse solvers for ROCm platform."
arch=('x86_64')
url="https://github.com/ROCmSoftwarePlatform/rocALUTION"
-license=('NCSAOSL')
-depends=(hcc hip rocsparse rocblas rocprim rocm-comgr)
-makedepends=(git cmake gcc ninja "hcc>=${pkgver}" "hip>=${pkgver}" "rocsparse>=${pkgver}" "rocblas>=${pkgver}" "rocprim>=${pkgver}" "rocm-comgr>=${pkgver}" python2 rocminfo)
-srcver="3.0"
-source=("https://github.com/ROCmSoftwarePlatform/rocALUTION/archive/rocm-$srcver.tar.gz")
-sha256sums=("b4666753aef8017c6c09da82880dd68cbff80ab41a967ef543ec344ee6848dc3")
+license=('custom:NCSAOSL')
+depends=('hcc' 'hip' 'rocsparse' 'rocblas' 'rocprim' 'rocm-comgr')
+makedepends=('cmake' "hcc>=$pkgver" "hip>=$pkgver" "rocsparse>=$pkgver" "rocblas>=$pkgver" "rocprim>=$pkgver" "rocm-comgr>=$pkgver" 'python2' 'rocminfo')
+source=("https://github.com/ROCmSoftwarePlatform/rocALUTION/archive/rocm-$_pkgver.tar.gz")
+sha256sums=('45c96916f915fcacab3a94f111912e9511167977678603f3c7253053eeec6513')
build() {
mkdir -p "$srcdir/build"
@@ -21,33 +21,34 @@ build() {
[[ -e "$srcdir/python" ]] || ln -s /usr/bin/python2 "$srcdir/python"
# fix broken build with stack protection
- export CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-fstack-protector-strong//')
- export CFLAGS=$(echo $CFLAGS | sed -e 's/-fstack-protector-strong//')
- export CPPFLAGS=$(echo $CPPFLAGS | sed -e 's/-fstack-protector-strong//')
+ export CFLAGS="$(sed -e 's/-fstack-protector-strong//' <<< "$CFLAGS")"
+ export CXXFLAGS="$(sed -e 's/-fstack-protector-strong//' <<< "$CXXFLAGS")"
+ export CPPFLAGS="$(sed -e 's/-fstack-protector-strong//' <<< "$CPPFLAGS")"
# compile with HCC
- export CXX=/opt/rocm/hcc/bin/hcc
+ export CXX="/opt/rocm/hcc/bin/hcc"
-# -ROCBLAS_DIR="$pkgdir/opt/rocm/rocblas/lib/cmake/rocblas" \
+# -ROCBLAS_DIR=/opt/rocm/rocblas/lib/cmake/rocblas \
# TODO: fix librocalution.so, it contains references to $srcdir
cmake -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX="$pkgdir/opt/rocm/rocalution" \
- -ROCSPARSE_DIR="$pkgdir/opt/rocm/rocsparse/lib/cmake/rocsparse" \
- -Dhip_DIR="$pkgdir/opt/rocm/hip/lib/cmake/hip" \
- -Dhcc_DIR="$pkgdir/opt/rocm/hcc/lib/cmake/hcc" \
- -Damd_comgr_DIR="/opt/rocm/lib/cmake/amd_comgr" \
+ -DCMAKE_INSTALL_PREFIX=/opt/rocm/rocalution \
+ -ROCSPARSE_DIR=/opt/rocm/rocsparse/lib/cmake/rocsparse \
+ -Dhip_DIR=/opt/rocm/hip/lib/cmake/hip \
+ -Dhcc_DIR=/opt/rocm/hcc/lib/cmake/hcc \
+ -Damd_comgr_DIR=/opt/rocm/lib/cmake/amd_comgr \
-DBUILD_CLIENTS_SAMPLES=OFF \
-DBUILD_CLIENTS_TESTS=OFF \
- -G Ninja \
- "$srcdir/rocALUTION-rocm-$srcver"
- ninja
+ "$srcdir/rocALUTION-rocm-$_pkgver"
+ make
}
package() {
- ninja -C "$srcdir/build" install
+ cd "$srcdir/build"
+
+ make DESTDIR="$pkgdir" install
- mkdir -p $pkgdir/etc/ld.so.conf.d
- cat <<-EOF > $pkgdir/etc/ld.so.conf.d/rocalution.conf
- /opt/rocm/rocalution/lib/
- EOF
+ install -d "$pkgdir/etc/ld.so.conf.d"
+ cat << EOF > "$pkgdir/etc/ld.so.conf.d/rocalution.conf"
+/opt/rocm/rocalution/lib
+EOF
}