public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/hipblaslt] epel10: Rework fedora path handling for compat
@ 2026-06-14 12:37 Tom Rix
  0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-06-14 12:37 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/hipblaslt
            Branch : epel10
            Commit : 025e33636b74d2c9999a6a2d50f9212ce334dd66
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-03-04T09:00:03-08:00
            Stats  : +24/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/hipblaslt/c/025e33636b74d2c9999a6a2d50f9212ce334dd66?branch=epel10

            Log:
            Rework fedora path handling for compat

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/hipblaslt.spec b/hipblaslt.spec
index 98266fe..70d9a4a 100644
--- a/hipblaslt.spec
+++ b/hipblaslt.spec
@@ -40,7 +40,7 @@
 %if %{with compat}
 %global pkg_libdir lib
 %global pkg_prefix %{_prefix}/lib64/rocm/rocm-%{rocm_release}
-%global pkg_suffix -%{rocm_release}
+%global pkg_suffix %{rocm_release}
 %global pkg_module rocm%{pkg_suffix}
 %else
 %global pkg_libdir %{_lib}
@@ -126,7 +126,7 @@ Version:        git%{date0}.%{shortcommit0}
 Release:        2%{?dist}
 %else
 Version:        %{rocm_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 %endif
 Summary:        ROCm general matrix operations beyond BLAS
 License:        MIT AND BSD-3-Clause
@@ -149,7 +149,7 @@ Source2:        %{robinmap_giturl}/archive/v%{robinmap_version}/robin-map-%{robi
 # yappi is used in tensilelite to generate profiling data, we are not using that in the build
 Patch1:         0001-hipblaslt-tensilelite-remove-yappi-dependency.patch
 # change hard coded vendor paths to fedoras
-Patch2:         0001-hipblaslt-tensilelite-use-fedora-paths.patch
+# Patch2:         0001-hipblaslt-tensilelite-use-fedora-paths.patch
 # https://github.com/ROCm/rocm-libraries/issues/2422
 Patch3:         0001-hipblaslt-find-origami-package.patch
 # do not try to fetch, point to the nanobind tarball
@@ -292,6 +292,24 @@ sed -i -e 's@virtualenv_install@#virtualenv_install@'                          C
 # Disable trying to download rocm-cmake
 sed -i -e 's@if(NOT ROCmCMakeBuildTools_FOUND)@if(FALSE)@' cmake/dependencies.cmake
 
+# compat has this issue
+# /usr/lib64/rocm/rocm-7.2/llvm/bin/amdclang++ -x hip .../device-library/matrix-transform/matrix_transform.cpp
+# In file included from /builddir/build/BUILD/hipblaslt7.2-7.2.0-build/hipblaslt/device-library/matrix-transform/matrix_transform.cpp:26:
+# /builddir/build/BUILD/hipblaslt7.2-7.2.0-build/hipblaslt/device-library/matrix-transform/matrix_transform.h:27:10: fatal error: 'hip/hip_bfloat16.h' file not found
+#   27 | #include <hip/hip_bfloat16.h>
+#      |          ^~~~~~~~~~~~~~~~~~~~
+#
+# Add include path to the custom build command
+sed -i -e 's@${CMAKE_CXX_COMPILER} -x hip @${CMAKE_CXX_COMPILER} -x hip -I%{pkg_prefix}/include @' device-library/matrix-transform/CMakeLists.txt
+# Similar on tensile command
+sed -i -e 's@"--offload-device-only",@"--offload-device-only", "-I%{pkg_prefix}/include",@' tensilelite/Tensile/Toolchain/Component.py
+
+# tensile path to tools need to change
+sed -i -e 's@globalParameters["ROCmPath"] = "/opt/rocm"@globalParameters["ROCmPath"] = "%{pkg_prefix}"@' tensilelite/Tensile/Common/GlobalParameters.py
+sed -i -e 's@DEFAULT_ROCM_BIN_PATH_POSIX = Path("/opt/rocm/bin")@DEFAULT_ROCM_BIN_PATH_POSIX = Path("%{pkg_prefix}/bin")@' tensilelite/Tensile/Toolchain/Validators.py
+sed -i -e 's@DEFAULT_ROCM_LLVM_BIN_PATH_POSIX = Path("/opt/rocm/lib/llvm/bin")@DEFAULT_ROCM_LLVM_BIN_PATH_POSIX = Path("%{rocmllvm_bindir}")@' tensilelite/Tensile/Toolchain/Validators.py
+
+
 %if %{with nanobind}
 # Disable download of nanobind
 sed -i -e 's@FetchContent_MakeAvailable(nanobind)@find_package(nanobind)@' tensilelite/rocisa/CMakeLists.txt
@@ -488,6 +506,9 @@ chrpath -d %{buildroot}%{pkg_prefix}/%{pkg_libdir}/libhipblaslt.so.*
 %endif
 
 %changelog
+* Wed Mar 4 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-4
+- Rework fedora path handling for compat
+
 * Mon Feb 23 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-3
 - Fix TW
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-14 12:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-14 12:37 [rpms/hipblaslt] epel10: Rework fedora path handling for compat Tom Rix

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox