Torsten Keßler pushed to branch main at Arch Linux / Packaging / Packages / magma
Commits: cbecba83 by Torsten Keßler at 2024-05-03T08:00:01+02:00 upgpkg: 2.8.0-1 Fix GPU target handling. Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/python-pytorch/-/issues/10 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + hip_device.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,9 +1,9 @@ pkgbase = magma - pkgver = 2.7.2 - pkgrel = 4 + pkgver = 2.8.0 + pkgrel = 1 url = https://icl.utk.edu/magma/ arch = x86_64 - license = custom + license = BSD-3-Clause makedepends = git makedepends = cmake makedepends = ninja @@ -19,10 +19,12 @@ pkgbase = magma optdepends = python: for examples and tests optdepends = gcc-fortran: Fortran interface options = !lto - source = magma::git+https://bitbucket.org/icl/magma.git#commit=a1625ff4d9bc362906bd01f805dbbe12612953f6 + source = magma::git+https://bitbucket.org/icl/magma.git#tag=v2.8.0 source = add_cuda_archs.patch - sha256sums = SKIP + source = hip_device.patch + sha256sums = 781bafd605579512b441664f76c9ba5559268f95f9357247cb8e04b76a72061e sha256sums = 1ed3706a65a124ecef71012273687307aac70bfc80bc99a978002dfb0ee000cc + sha256sums = 86739e85b015f8919e404ad32f5f57a446be86d2b728dba4eff17c536fbaef62 pkgname = magma-cuda pkgdesc = Matrix Algebra on GPU and Multicore Architectures (with CUDA) ===================================== PKGBUILD ===================================== @@ -7,23 +7,24 @@ _pkgname=magma pkgbase=$_pkgname pkgname=(magma-cuda magma-hip) -pkgver=2.7.2 -pkgrel=4 +pkgver=2.8.0 +pkgrel=1 _pkgdesc="Matrix Algebra on GPU and Multicore Architectures" arch=('x86_64') url="https://icl.utk.edu/magma/"; -license=('custom') +license=('BSD-3-Clause') depends=('blas' 'lapack') makedepends=('git' 'cmake' 'ninja' 'python' 'gcc-fortran' 'cuda' 'rocm-core' 'hip-runtime-amd' 'hipblas' 'hipsparse') optdepends=('python: for examples and tests' 'gcc-fortran: Fortran interface') -_commit=a1625ff4d9bc362906bd01f805dbbe12612953f6 # commit after v2.7.2 with ROCm 6 fixes. -source=("${_pkgname}::git+https://bitbucket.org/icl/magma.git#commit=${_commit}"; - 'add_cuda_archs.patch') -sha256sums=('SKIP' - '1ed3706a65a124ecef71012273687307aac70bfc80bc99a978002dfb0ee000cc') +source=("${_pkgname}::git+https://bitbucket.org/icl/magma.git#tag=v${pkgver}"; + 'add_cuda_archs.patch' + 'hip_device.patch') +sha256sums=('781bafd605579512b441664f76c9ba5559268f95f9357247cb8e04b76a72061e' + '1ed3706a65a124ecef71012273687307aac70bfc80bc99a978002dfb0ee000cc' + '86739e85b015f8919e404ad32f5f57a446be86d2b728dba4eff17c536fbaef62') options=(!lto) _valid_sm() { @@ -49,6 +50,7 @@ prepare() { cd "${_pkgname}-${pkgver}-hip" echo -e "BACKEND = hip\nFORT = true\nGPU_TARGET=$(_valid_gfx)" > make.inc make generate + patch -Np1 -i "${srcdir}/hip_device.patch" } build() { @@ -60,7 +62,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/opt/cuda/targets/x86_64-linux \ -DBUILD_SHARED_LIBS=ON \ - -DGPU_TARGET="$(_valid_sm)" + -DGPU_TARGET="$(_valid_sm | tr ' ' ';')" ninja -C build @@ -84,7 +86,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/opt/rocm \ -DBUILD_SHARED_LIBS=ON \ -DMAGMA_ENABLE_HIP=ON \ - -DGPU_TARGET="$(_valid_gfx)" + -DGPU_TARGET="$(_valid_gfx | tr ' ' ';')" \ + -DAMDGPU_TARGETS="$(_valig_gfx | tr ' ' ';')" ninja -C build } ===================================== hip_device.patch ===================================== @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -612,6 +612,7 @@ + hip::host + ${blas_fix} + ${LAPACK_LIBRARIES} ++ hip::device + roc::hipblas + roc::hipsparse + ) View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/magma/-/commit/cbecba83c22d010ad33b9a5b9be476ddb214d59b -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/magma/-/commit/cbecba83c22d010ad33b9a5b9be476ddb214d59b You're receiving this email because of your account on gitlab.archlinux.org.
