diff options
Diffstat (limited to 'sci-libs/rocSPARSE')
| -rw-r--r-- | sci-libs/rocSPARSE/Manifest | 5 | ||||
| -rw-r--r-- | sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch | 34 | ||||
| -rw-r--r-- | sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild | 2 | ||||
| -rw-r--r-- | sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild | 11 |
4 files changed, 44 insertions, 8 deletions
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest index f14ced4683ec..760a1305cc4a 100644 --- a/sci-libs/rocSPARSE/Manifest +++ b/sci-libs/rocSPARSE/Manifest @@ -1,5 +1,6 @@ AUX rocSPARSE-4.3.0-remove-matrices-unpacking.patch 933 BLAKE2B 03e9ded8e313352dcdb181351fb4decc1c1e6d7e2e8019b7624c0d3273182f1ba7b296fdfa862e8be8d13d023561a8febb5b982e4a8b16dc8fc1af3f508d2196 SHA512 1b63b4e2b930b4cde29c41ec9f2a5c6f5f4b8291ba7aa6a5a714a2fbfd2b7978c5cd6b3f4a5f5c63da6765e0696efadc54942096a0a985f1d3cc668477c44969 AUX rocSPARSE-5.0.2-enable-gfx1031.patch 645 BLAKE2B 4e20882057d1f8687f47831cc8945b787606b6f6d1d676ba5e5e12d8ff61e1c22711da57b50d988d44b2962c6001d270ebe2ffcb751901a6eb64635e553a7cd9 SHA512 24fbfed3cafdf00c7e13d25136427b30c573191e32830431f7185fd9a2f537c110f83f4e6f8603f3c17381d316f13c3b626eeaa9331f9035e7bc9b34d0c7c70e +AUX rocSPARSE-5.0.2-remove-incorrect-assert.patch 1658 BLAKE2B 26aa66d7d61657eb591f7b345b64211f3cfb47f0a1b656716b32e299799bb8172483b4898878e532f7c6ca3f99bcb4a8789a1b6a913bc40dfebdc144613b0f27 SHA512 bfae11079c621b3372678ade78bea979b751777a48060b5ef26b3567fb89b1cf8591c998e199be649b03157662ef9b4889ca79498b16cf0bf6fbd1b9a532e485 AUX rocSPARSE-5.0.2-remove-matrices-unpacking.patch 1205 BLAKE2B 0d903453692025f6f239c8b5d2f11dd6f9dfe5c09a63395898920326e0dbd6aeff37fdf2dde8e89ea1cbdc60252ab87b7ef020b56a726853d2f7261addcf00c8 SHA512 52ec3913f89f7886d6b8fb9ef54ca313c64e4c9d374507a0d89a8c7cf846e8f8f6b8a4ad266b23015869a79d2eaadb75c5540ca53e40163cb0fbdc2b1819e645 DIST rocSPARSE-4.0.0.tar.gz 587761 BLAKE2B 25f9f0183c06b574505fe6e9011b32ea4fbe48c0a1883b8991baf45b8a2238312f352e614c0069531c986e548453b6e7b7a77f883dffea82ed41df488964b55d SHA512 4a4acf24a789ea58b53a8d06ea528a6aed8eabac21a7a3cd73011e9b31d03dceb488cc72f29c5513205f2b538d24e9dbaccda1a932bcc466cd04a65606a77b3b DIST rocSPARSE-4.3.0.tar.gz 809183 BLAKE2B 06a83d98572927f0f2c65f4f36194394b66a02a5ce9d3e21da04c53e9ad97809daffe02a35691aa52466f7dfb4d4a8c645b87e1e4da579de7f91323df3a41d59 SHA512 e3ee5a15d36c3002ee60aabd94c7f47b0cb9f0b5a33cefa9061df9f04b1fcc3c1503e4f01e2f36c07477179c6753827b505e9b512e8b5bfca00f76e3efd99c1d @@ -29,6 +30,6 @@ DIST rocSPARSE_shipsec1.tar.gz 22175245 BLAKE2B f1d34482b8c3d3ee48033097d7d6f9b6 DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b10d524c73aeb82f702411b9ebaea3670780e762ed0701aae80c6829e950233f74555523ef2d6c5740b007c7a65c03d4 SHA512 c5a0be2db919a45310a73ea1dd96d0d30168135f887a8c5c3d7ca11e2c3d12ea7d1331be20968d0135bd18da4ef2b043db68eeb7567b6f0f8daf782b87083c3a DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161 EBUILD rocSPARSE-4.0.0-r1.ebuild 1166 BLAKE2B fc45fdaaf8d5f20afcc0d477eac01d30100a3ac3355ddae786ee934f46ef55b4f6ac3b284875fc905f75452cbfbb655ad4cfb9f916905e1a6091e8b97a14f141 SHA512 221e3aea6c45e7d7a6edc3b96db32ed9d2deb040f1f4cafa9cbb139a146aa7500d4619e6e8db39683fed9c0bc34053dc8ede22525340457c1774f6ea90297a98 -EBUILD rocSPARSE-4.3.0-r3.ebuild 4914 BLAKE2B b61c7bca88d7d063d1d0aa80e9cc7340b5d3f7d58361cfd62f9fe6817086a770cf301db4585acf72ee27e773c8a7a6eb0ad2a0565eb2cd272ab852ed4f50fca0 SHA512 d17bc9537d1c3badf56103849009685cad7459891f5f5747a3fde6e708ee609aeb2bf63d9209d5a9b8bc291b1443c0a0c4dddcfb8cad0c19b82c86c23c4757ab -EBUILD rocSPARSE-5.0.2.ebuild 4962 BLAKE2B 01aec045e48dffd6cf959a491da5a434f6ef792e9a0ae8cb1956227ef9fa28bc66a32d47d91bd82f219584b3dbbdf02ff9783649217ea8f9f1beab69a362454b SHA512 293f195844c0e99e3bfb86a20728301a2ef0d5673bc6cf2b7c6c163292760f5045fb3ad17fe5ff2d7b89f1c36967d2113b929f0746bb8d2f41f54094432f20c7 +EBUILD rocSPARSE-4.3.0-r3.ebuild 4916 BLAKE2B 350c192f3fa3456d45564eb6dc48ae405df21221fd4d373ba0fe15abebb7ffbbefa3a3938f88530b929c87064cfccaecb260b16e773dd9a8bcd50878139a6d24 SHA512 913d98214489545a4624e9ad774b33cb954ee1cbe5bf14d4910de00695f340a34dd57ecb6e70ba3a6e7539775af90734033b7518f1bc58c3d4e6de5697251277 +EBUILD rocSPARSE-5.0.2.ebuild 5060 BLAKE2B 5801d8816ecf962150ee8a11512f7d90001f9c271cb8eaa0f0ce44f03430767628105e66ab85426904c3f202021b63820ecc4999e55f91265bb8b7efec6f0308 SHA512 2f60b9d2643063f6b767a6ad3d48a7018ab66c1fa62de7e67264a2731638a5eb6e23df26b39ffd6cfb40b9e229613e68e8fd268903050c8ff966a04c142413fd MISC metadata.xml 695 BLAKE2B db1c67ff216cd9c9a972c9b388f85f6e762e0a7bddffca1336219ce6ebe39f6a841da4c8c78084d91f48a5bb6a26ad0047a2a1a60915da5110b3a41977f3b641 SHA512 2f246ec382d78e414a00aedcd7a2c871ccf5b74d25d160a0f7d6012feb51c6c12861b5152cac32d3e46d0d1acea7e8b10f42f4b501abb9d778cd3c886331f59c diff --git a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch new file mode 100644 index 000000000000..9baa962c05f5 --- /dev/null +++ b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch @@ -0,0 +1,34 @@ +From 48b763f01b658dece7f71784fe4362e56167db2f Mon Sep 17 00:00:00 2001 +From: James Sandham <33790278+jsandham@users.noreply.github.com> +Date: Fri, 28 Jan 2022 10:24:08 -0800 +Subject: [PATCH] remove incorrect assert from spmm_bell (#302) + +Co-authored-by: jsandham <james.sandham@amd.com> +--- + library/src/level3/rocsparse_bellmm_template_general.cpp | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/library/src/level3/rocsparse_bellmm_template_general.cpp b/library/src/level3/rocsparse_bellmm_template_general.cpp +index 81f36a32..bbce9a17 100644 +--- a/library/src/level3/rocsparse_bellmm_template_general.cpp ++++ b/library/src/level3/rocsparse_bellmm_template_general.cpp +@@ -1,6 +1,6 @@ + /*! \file */ + /* ************************************************************************ +- * Copyright (c) 2021 Advanced Micro Devices, Inc. ++ * Copyright (c) 2021-2022 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal +@@ -101,9 +101,8 @@ rocsparse_status rocsparse_bellmm_template_general(rocsparse_handle han + I ldc) + { + hipStream_t stream = handle->stream; +- assert(block_dim > 32); +- dim3 bellmm_blocks((mb - 1) / 1 + 1, (n - 1) / 32 + 1); +- dim3 bellmm_threads(32, 32, 1); ++ dim3 bellmm_blocks((mb - 1) / 1 + 1, (n - 1) / 32 + 1); ++ dim3 bellmm_threads(32, 32, 1); + assert(trans_A == rocsparse_operation_none); + // + // What happends if A needs to be transposed? diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild index f32d34643e14..e9c16ef9287c 100644 --- a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild +++ b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild @@ -88,7 +88,7 @@ src_prepare() { ebegin "$(tc-getCXX) deps/convert.cpp -o deps/convert" $(tc-getCXX) deps/convert.cpp -o deps/convert eend $? - find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 | + find "${WORKDIR}" -maxdepth 2 -regextype grep -E -regex ".*/(.*)/\1\.mtx" -print0 | while IFS= read -r -d '' mtxfile; do destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).csr ebegin "Converting ${mtxfile} to ${destination}" diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild b/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild index 4203ba70e4de..90733f9a5e59 100644 --- a/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild +++ b/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild @@ -59,7 +59,8 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/rocSPARSE-rocm-${PV}" PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-matrices-unpacking.patch" - "${FILESDIR}/${PN}-5.0.2-enable-gfx1031.patch" ) + "${FILESDIR}/${PN}-5.0.2-enable-gfx1031.patch" + "${FILESDIR}/${PN}-5.0.2-remove-incorrect-assert.patch" ) python_check_deps() { if use test; then @@ -81,6 +82,8 @@ src_prepare() { # use python interpreter specifyied by python-any-r1 sed -e "/COMMAND ..\/common\/rocsparse_gentest.py/s,COMMAND ,COMMAND ${EPYTHON} ," -i clients/tests/CMakeLists.txt || die + cmake_src_prepare + # Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5, unpack and convert them into csr format # This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage. if use test; then @@ -89,7 +92,7 @@ src_prepare() { ebegin "$(tc-getCXX) deps/convert.cpp -o deps/convert" $(tc-getCXX) deps/convert.cpp -o deps/convert eend $? - find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 | + find "${WORKDIR}" -maxdepth 2 -regextype grep -E -regex ".*/(.*)/\1\.mtx" -print0 | while IFS= read -r -d '' mtxfile; do destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).csr ebegin "Converting ${mtxfile} to ${destination}" @@ -97,8 +100,6 @@ src_prepare() { eend $? done fi - - cmake_src_prepare } src_configure() { @@ -125,7 +126,7 @@ src_test() { addwrite /dev/kfd addwrite /dev/dri/ cd "${BUILD_DIR}/clients/staging" || die - ./rocsparse-test || die + LD_LIBRARY_PATH="${BUILD_DIR}/library" ./rocsparse-test || die } src_install() { |