Changes

3 changed files (+24/-38)

• rocblas/.SRCINFO
  • @@ -1,24 +1,24 @@
    pkgbase = rocblas pkgdesc = Next generation BLAS implementation for ROCm platform - pkgver = 3.3.0 - pkgrel = 5 + pkgver = 3.5.0 + pkgrel = 1 url = https://rocblas.readthedocs.io/en/latest arch = x86_64 license = MIT makedepends = cmake - makedepends = hcc makedepends = python makedepends = python-virtualenv makedepends = python-pyaml makedepends = perl-file-which + makedepends = rocm-cmake makedepends = llvm-amdgpu - depends = hip-hcc + depends = hip-rocclr depends = openmp options = !strip - source = rocblas-3.3.0.tar.gz::https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-3.3.0.tar.gz - source = rocm-tensile-3.3.0.tar.gz::https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-3.3.0.tar.gz - sha256sums = aaa8f0479202bdbe94d2ec5655a76055656f743b0d36816501cb84a533084034 - sha256sums = 25386b26c75fc27234b6a7773b2ac36f1605e82dff8dab5accd8ba842320b6b3 + source = rocblas-3.5.0.tar.gz::https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-3.5.0.tar.gz + source = rocm-tensile-3.5.0.tar.gz::https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-3.5.0.tar.gz + sha256sums = 3e372c7c0504c0f18b5e69989083e68a45131e675912082961a736cb3b1222fb + sha256sums = 1afd2e28065849dc418efdc79fc3216208963cabc0c4efb870440b1c051a0f20 pkgname = rocblas
• rocblas/PKGBUILD
  • @@ -1,19 +1,19 @@
    # Maintainer: Markus Näther <naether.markus@gmail.com> pkgname=rocblas - pkgver=3.3.0 - pkgrel=5 + pkgver=3.5.0 + pkgrel=1 pkgdesc='Next generation BLAS implementation for ROCm platform' arch=('x86_64') url='https://rocblas.readthedocs.io/en/latest' license=('MIT') - depends=('hip-hcc' 'openmp') - makedepends=('cmake' 'hcc' 'python' 'python-virtualenv' 'python-pyaml' 'perl-file-which' 'llvm-amdgpu') + depends=('hip-rocclr' 'openmp') + makedepends=('cmake' 'python' 'python-virtualenv' 'python-pyaml' 'perl-file-which' 'rocm-cmake' 'llvm-amdgpu') _rocblas='https://github.com/ROCmSoftwarePlatform/rocBLAS' _tensile='https://github.com/ROCmSoftwarePlatform/Tensile' source=("$pkgname-$pkgver.tar.gz::$_rocblas/archive/rocm-$pkgver.tar.gz" "rocm-tensile-$pkgver.tar.gz::$_tensile/archive/rocm-$pkgver.tar.gz") - sha256sums=('aaa8f0479202bdbe94d2ec5655a76055656f743b0d36816501cb84a533084034' - '25386b26c75fc27234b6a7773b2ac36f1605e82dff8dab5accd8ba842320b6b3') + sha256sums=('3e372c7c0504c0f18b5e69989083e68a45131e675912082961a736cb3b1222fb' + '1afd2e28065849dc418efdc79fc3216208963cabc0c4efb870440b1c051a0f20') options=(!strip) prepare() {
  • @@ -24,36 +24,36 @@ prepare() {
    } build() { - mkdir -p build - cd build - # fix broken build with stack protection 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")" - CXX=/opt/rocm/hcc/bin/hcc \ - cmake -DCMAKE_INSTALL_PREFIX=/opt/rocm/rocblas \ + CXX=/opt/rocm/hip/bin/hipcc \ + cmake -B build -Wno-dev \ + -DCMAKE_INSTALL_PREFIX=/opt/rocm \ -DCMAKE_PREFIX_PATH=/opt/rocm/llvm/lib/cmake/llvm \ -Damd_comgr_DIR=/opt/rocm/lib/cmake/amd_comgr \ - -DDETECT_LOCAL_VIRTUALENV=ON \ + -DBUILD_WITH_TENSILE=ON \ -DTensile_TEST_LOCAL_PATH="$srcdir/Tensile-rocm-$pkgver" \ + -DTensile_COMPILER=hipcc \ + -DTensile_ARCHITECTURE=all \ + -DTensile_LOGIC=asm_full \ -DBUILD_CLIENTS_TESTS=OFF \ -DBUILD_CLIENTS_BENCHMARKS=OFF \ -DBUILD_CLIENTS_SAMPLES=OFF \ + -DBUILD_TESTING=OFF \ "$srcdir/rocBLAS-rocm-$pkgver" # Fix for latest llvm sed -i 's/Impl::inputOne(io, key, \*value)/Impl::inputOne(io, key.str(), \*value)/g' \ $srcdir/build/virtualenv/lib/python*/site-packages/Tensile/Source/lib/include/Tensile/llvm/YAML.hpp - make + make -C build } package() { - cd "$srcdir/build" - - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" make -C build install install -Dm644 /dev/stdin "$pkgdir/etc/ld.so.conf.d/rocblas.conf" << EOF /opt/rocm/rocblas/lib
• rocblas/hcc_workweek.patch (deleted)
  • @@ -1,14 +0,0 @@
    - *** rocBLAS-rocm-3.3.0/CMakeLists.txt.bak 2020-05-10 15:58:01.475190329 +0200 - --- rocBLAS-rocm-3.3.0/CMakeLists.txt 2020-05-10 16:00:18.879954059 +0200 - *************** - *** 188,193 **** - --- 188,196 ---- - file (STRINGS "tensile_tag.txt" read_tensile_tag) - set( tensile_tag ${read_tensile_tag} CACHE STRING "Tensile tag to download" ) - virtualenv_install("git+https://github.com/${tensile_fork}/Tensile.git@${tensile_tag}") - + execute_process( - + COMMAND bash -c "sed -i 's/__hcc_workweek__/99999/g' $(grep -rIl __hcc_workweek__ ${VIRTUALENV_HOME_DIR})" - + ) - message (STATUS "using GIT Tensile fork=${tensile_fork} from branch=${tensile_tag}") - endif() - list(APPEND CMAKE_PREFIX_PATH ${VIRTUALENV_HOME_DIR})