commit: 2eb111ac2769ffd73aecf0688c406d45c041ed78 Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com> AuthorDate: Sun Nov 2 17:18:40 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 4 11:20:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb111ac
sci-libs/hipBLASLt: build tests/benchmark with sci-libs/flexiblas This removes the dependency on cblas-config.cmake, which is already removed in upstream in 7.1.0. Closes: https://bugs.gentoo.org/965310 Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44436 Closes: https://github.com/gentoo/gentoo/pull/44436 Signed-off-by: Sam James <sam <AT> gentoo.org> ...t-7.0.2-r1.ebuild => hipBLASLt-7.0.2-r2.ebuild} | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sci-libs/hipBLASLt/hipBLASLt-7.0.2-r1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-7.0.2-r2.ebuild similarity index 92% rename from sci-libs/hipBLASLt/hipBLASLt-7.0.2-r1.ebuild rename to sci-libs/hipBLASLt/hipBLASLt-7.0.2-r2.ebuild index 8890135e5f56..349d7928c8f1 100644 --- a/sci-libs/hipBLASLt/hipBLASLt-7.0.2-r1.ebuild +++ b/sci-libs/hipBLASLt/hipBLASLt-7.0.2-r2.ebuild @@ -28,8 +28,7 @@ RDEPEND=" roctracer? ( dev-util/roctracer:${SLOT} ) benchmark? ( dev-util/rocm-smi:${SLOT} - sci-libs/lapack - sci-libs/openblas + sci-libs/flexiblas ) " @@ -37,7 +36,9 @@ DEPEND=" ${RDEPEND} dev-cpp/msgpack-cxx sci-libs/hipBLAS-common:${SLOT} + llvm-runtimes/openmp " + BDEPEND=" ${PYTHON_DEPS} dev-build/rocm-cmake:${SLOT} @@ -52,13 +53,9 @@ BDEPEND=" $(llvm_gen_dep "llvm-core/clang:\${LLVM_SLOT}") test? ( dev-cpp/gtest - virtual/blas + sci-libs/flexiblas dev-util/rocm-smi:${SLOT} ) - benchmark? ( - virtual/blas - llvm-runtimes/openmp - ) " PATCHES=( @@ -110,14 +107,15 @@ src_prepare() { -i tensilelite/Tensile/Toolchain/Validators.py \ -i tensilelite/Tensile/Tests/unit/test_MatrixInstructionConversion.py || die - # sed -e "s:rocm_path + \"/bin/amdclang++\":$(get_llvm_prefix)/bin/clang++:" \ - # -i tensilelite/rocisa/test/test_base.py \ - # -i tensilelite/rocisa/test/test_container.py || die - # https://github.com/ROCm/rocm-libraries/commit/48c5e89fd90caff65e62e6a9bcf082d10d8877eb sed -e 's:if(NOT ROCM_FOUND):if(NOT ROCmCMakeBuildTools_FOUND):' \ -i cmake/Dependencies.cmake || die + # https://bugs.gentoo.org/965310 - use normal FindBLAS + # To be removed in 7.1.0 (not used in there anymore) + sed -e '/find_dependency(cblas)/ s/cblas/BLAS/' -i cmake/hipblaslt-config.cmake || die + sed -e 's/cblas REQUIRED CONFIG/BLAS REQUIRED/' -i clients/CMakeLists.txt || die + cmake_src_prepare } @@ -132,18 +130,20 @@ src_configure() { local HIPBLASLT_ENABLE_DEVICE=$([ "${AMDGPU_TARGETS[*]}" != "" ] && echo ON || echo OFF ) local mycmakeargs=( - -DROCM_SYMLINK_LIBS=OFF - -DTensile_SKIP_BUILD=${Tensile_SKIP_BUILD} - -DHIPBLASLT_ENABLE_DEVICE=${HIPBLASLT_ENABLE_DEVICE} - -DTensile_COMPILER=${CXX} -DAMDGPU_TARGETS="${targets}" - -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBLA_PKGCONFIG_BLAS=ON + -DBLA_VENDOR=FlexiBLAS -DBUILD_CLIENTS_BENCHMARKS="$(usex benchmark ON OFF)" - -DPython_EXECUTABLE="${PYTHON}" + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DHIPBLASLT_ENABLE_DEVICE=${HIPBLASLT_ENABLE_DEVICE} -DHIPBLASLT_ENABLE_MARKER="$(usex roctracer ON OFF)"\ -DHIPBLASLT_USE_ROCROLLER=OFF - -DTensile_CPU_THREADS=$(makeopts_jobs) -Dnanobind_DIR="$(python_get_sitedir)/nanobind/cmake" + -DPython_EXECUTABLE="${PYTHON}" + -DROCM_SYMLINK_LIBS=OFF + -DTensile_COMPILER=${CXX} + -DTensile_CPU_THREADS=$(makeopts_jobs) + -DTensile_SKIP_BUILD=${Tensile_SKIP_BUILD} -Wno-dev )
