public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/hipblaslt] epel10: Merge branch 'rawhide' into epel10
@ 2026-06-14 12:38 Tom Rix
0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-06-14 12:38 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/hipblaslt
Branch : epel10
Commit : ad5864994184eb8454e46451070627e2aa35ec3b
Author : Tom Rix <Tom.Rix@amd.com>
Date : 2026-06-14T05:37:09-07:00
Stats : +290/-131 in 11 file(s)
URL : https://src.fedoraproject.org/rpms/hipblaslt/c/ad5864994184eb8454e46451070627e2aa35ec3b?branch=epel10
Log:
Merge branch 'rawhide' into epel10
---
diff --git a/.gitignore b/.gitignore
index 3146ade..86b170f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/nanobind-2.9.2.tar.gz
/robin-map-1.3.0.tar.gz
/hipblaslt-7.1.1.tar.gz
+/hipblaslt-7.2.0.tar.gz
diff --git a/0001-hipblaslt-cmake-compile-and-link-pools.patch b/0001-hipblaslt-cmake-compile-and-link-pools.patch
index 264e0b7..775df08 100644
--- a/0001-hipblaslt-cmake-compile-and-link-pools.patch
+++ b/0001-hipblaslt-cmake-compile-and-link-pools.patch
@@ -1,17 +1,17 @@
-From 8b2c3e3316334a2b251cdcd3f73130d2dfea2d0d Mon Sep 17 00:00:00 2001
+From 5784a6ffeb2b4c7be27a7b24f68ef658cab21de3 Mon Sep 17 00:00:00 2001
From: Tom Rix <Tom.Rix@amd.com>
-Date: Sun, 7 Dec 2025 07:13:20 -0800
+Date: Tue, 27 Jan 2026 14:44:47 -0800
Subject: [PATCH] hipblaslt cmake compile and link pools
---
- CMakeLists.txt | 26 ++++++++++++++++++++++++++
+ projects/hipblaslt/CMakeLists.txt | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d02df50540c2..8e8173fc4205 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,6 +62,32 @@ option(HIPBLASLT_BUNDLE_PYTHON_DEPS "Build python dependencies requied for devic
+diff --git a/projects/hipblaslt/CMakeLists.txt b/projects/hipblaslt/CMakeLists.txt
+index 1a4484af456e..a06f9ff0d3b7 100644
+--- a/projects/hipblaslt/CMakeLists.txt
++++ b/projects/hipblaslt/CMakeLists.txt
+@@ -57,6 +57,32 @@ option(HIPBLASLT_BUNDLE_PYTHON_DEPS "Build python dependencies requied for devic
option(HIPBLASLT_ENABLE_COVERAGE "Build coverage support." OFF)
option(HIPBLASLT_ENABLE_THEROCK "Build hipBLASLt for TheRock." OFF)
diff --git a/0001-hipblaslt-find-origami-package.patch b/0001-hipblaslt-find-origami-package.patch
index 380bc62..f9f6537 100644
--- a/0001-hipblaslt-find-origami-package.patch
+++ b/0001-hipblaslt-find-origami-package.patch
@@ -1,21 +1,28 @@
-From 43c4a61c5d8836a16feb8e53c72f255790523ff3 Mon Sep 17 00:00:00 2001
+From a048fa75e46f1046751f0d134f50c03128d80086 Mon Sep 17 00:00:00 2001
From: Tom Rix <Tom.Rix@amd.com>
-Date: Mon, 3 Nov 2025 06:11:40 -0800
+Date: Tue, 27 Jan 2026 10:55:44 -0800
Subject: [PATCH] hipblaslt find origami package
---
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ projects/hipblaslt/CMakeLists.txt | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dbccca92c84f..d02df50540c2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -218,7 +218,7 @@ if(HIPBLASLT_ENABLE_MSGPACK)
+diff --git a/projects/hipblaslt/CMakeLists.txt b/projects/hipblaslt/CMakeLists.txt
+index 489205819a85..1a4484af456e 100644
+--- a/projects/hipblaslt/CMakeLists.txt
++++ b/projects/hipblaslt/CMakeLists.txt
+@@ -213,14 +213,7 @@ if(HIPBLASLT_ENABLE_MSGPACK)
endif()
endif()
--add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../../shared/origami" origami)
+-if(NOT ROCM_LIBS_SUPERBUILD)
+- # TODO: This is a temporary solution to prevent the installation of the origami license files.
+- block(SCOPE_FOR VARIABLES)
+- set(ORIGAMI_ENABLE_INSTALL OFF)
+- add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../../shared/origami" origami)
+- endblock()
+-endif()
+-
+find_package(origami CONFIG REQUIRED)
add_subdirectory(tensilelite)
diff --git a/0001-hipblaslt-preview-find-origami-package.patch b/0001-hipblaslt-preview-find-origami-package.patch
new file mode 100644
index 0000000..6d70064
--- /dev/null
+++ b/0001-hipblaslt-preview-find-origami-package.patch
@@ -0,0 +1,38 @@
+From 72f253a5f1603d6a02e2a5ba160754feca956a45 Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Tue, 26 May 2026 13:49:18 -0700
+Subject: [PATCH] hipblaslt preview find origami package
+
+---
+ projects/hipblaslt/CMakeLists.txt | 15 +--------------
+ 1 file changed, 1 insertion(+), 14 deletions(-)
+
+diff --git a/projects/hipblaslt/CMakeLists.txt b/projects/hipblaslt/CMakeLists.txt
+index 11b8fdfe5c3c..eea341127604 100644
+--- a/projects/hipblaslt/CMakeLists.txt
++++ b/projects/hipblaslt/CMakeLists.txt
+@@ -244,20 +244,7 @@ if(NOT HIPBLASLT_ENABLE_YAML)
+ endif()
+ endif()
+
+-if(NOT ROCM_LIBS_SUPERBUILD)
+- # TODO: Temporarily disabled TheRock origami integration to allow TheRock CI to pass.
+- # Re-enable once origami is available in TheRock.
+- # if(HIPBLASLT_ENABLE_THEROCK)
+- # find_package(origami REQUIRED)
+- if(FALSE)
+- else()
+- # TODO: This is a temporary solution to prevent the installation of the origami license files.
+- block(SCOPE_FOR VARIABLES)
+- set(ORIGAMI_ENABLE_INSTALL OFF)
+- add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../../shared/origami" origami)
+- endblock()
+- endif()
+-endif()
++find_package(origami REQUIRED)
+
+ # INTERFACE library that owns the public hipblaslt API headers (the in-tree
+ # `library/include` subtree plus its build-tree counterpart, where
+--
+2.53.0
+
diff --git a/0001-hipblaslt-preview-tensilelit-remove-yappi-dependency.patch b/0001-hipblaslt-preview-tensilelit-remove-yappi-dependency.patch
new file mode 100644
index 0000000..795b56c
--- /dev/null
+++ b/0001-hipblaslt-preview-tensilelit-remove-yappi-dependency.patch
@@ -0,0 +1,59 @@
+From ac7d71d06f7938d51dd9455a5145372e48dcd49d Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Tue, 26 May 2026 13:36:58 -0700
+Subject: [PATCH] hipblaslt preview tensilelit remove yappi dependency
+
+---
+ .../Tensile/TensileCreateLibrary/Run.py | 15 ---------------
+ projects/hipblaslt/tensilelite/requirements.txt | 2 +-
+ 2 files changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/projects/hipblaslt/tensilelite/Tensile/TensileCreateLibrary/Run.py b/projects/hipblaslt/tensilelite/Tensile/TensileCreateLibrary/Run.py
+index c4356c07273f..bbe18e369447 100644
+--- a/projects/hipblaslt/tensilelite/Tensile/TensileCreateLibrary/Run.py
++++ b/projects/hipblaslt/tensilelite/Tensile/TensileCreateLibrary/Run.py
+@@ -329,12 +329,6 @@ def writeSolutionsAndKernels(
+ generateSourcesAndExit: bool=False,
+ compress: bool=True,
+ ):
+- if globalParameters["PythonProfile"]:
+- globalParameters["CpuThreads"] = 0
+- printWarning("Python profiling is enabled. CpuThreads set to 0.")
+- import yappi
+- yappi.start()
+-
+ codeObjectFiles = []
+
+ with timing_context("python_kernel_setup"):
+@@ -407,15 +401,6 @@ def writeSolutionsAndKernels(
+ writeHelpers(outputPath, kernelHelperObjs, KERNEL_HELPER_FILENAME_CPP, KERNEL_HELPER_FILENAME_H)
+ srcKernelFile = Path(outputPath) / "Kernels.cpp"
+
+- if globalParameters["PythonProfile"]:
+- yappi.stop()
+- yappi.get_func_stats().save("yappi_results.profile", type="callgrind")
+- with open("yappi_results.txt", "w") as f:
+- yappi.get_func_stats().print_all(out=f)
+- if globalParameters["CpuThreads"] != 0:
+- with open("yappi_thread_stats.txt", "w") as f:
+- yappi.get_thread_stats().print_all(out=f)
+-
+ if not generateSourcesAndExit:
+ with timing_context("python_kernel_build_co"):
+ codeObjectFiles += buildAssemblyCodeObjectFiles(
+diff --git a/projects/hipblaslt/tensilelite/requirements.txt b/projects/hipblaslt/tensilelite/requirements.txt
+index 2eb38e4a99fe..7b53039e3a55 100644
+--- a/projects/hipblaslt/tensilelite/requirements.txt
++++ b/projects/hipblaslt/tensilelite/requirements.txt
+@@ -5,7 +5,7 @@ joblib>=1.4.0
+ simplejson
+ ujson
+ orjson
+-yappi
++
+ tox
+ invoke
+ numpy
+--
+2.53.0
+
diff --git a/0001-hipblaslt-preview-tensilelit-use-nanobind-tarball.patch b/0001-hipblaslt-preview-tensilelit-use-nanobind-tarball.patch
new file mode 100644
index 0000000..bfe87f7
--- /dev/null
+++ b/0001-hipblaslt-preview-tensilelit-use-nanobind-tarball.patch
@@ -0,0 +1,28 @@
+From 401ddee4f2e8416742b44b0ecfa9dd5c69e91bab Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Tue, 26 May 2026 14:01:43 -0700
+Subject: [PATCH] hipblaslt preview tensilelit use nanobind tarball
+
+---
+ projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt b/projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt
+index 4bef48e03d6b..fec8e2c70db7 100644
+--- a/projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt
++++ b/projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt
+@@ -39,8 +39,9 @@ if(HIPBLASLT_BUNDLE_PYTHON_DEPS OR ROCISA_STANDALONE)
+ include(FetchContent)
+ FetchContent_Declare(
+ nanobind
+- GIT_REPOSITORY https://github.com/wjakob/nanobind.git
+- GIT_TAG 9b3afa9dbdc23641daf26fadef7743e7127ff92f # v2.6.1
++# GIT_REPOSITORY https://github.com/wjakob/nanobind.git
++# GIT_TAG 9b3afa9dbdc23641daf26fadef7743e7127ff92f # v2.6.1
++ URL file://${CMAKE_CURRENT_SOURCE_DIR}/../../nanobind.tar.gz
+ )
+ FetchContent_MakeAvailable(nanobind)
+ endif()
+--
+2.53.0
+
diff --git a/0001-hipblaslt-tensilelite-remove-yappi-dependency.patch b/0001-hipblaslt-tensilelite-remove-yappi-dependency.patch
index db0e208..3dfb651 100644
--- a/0001-hipblaslt-tensilelite-remove-yappi-dependency.patch
+++ b/0001-hipblaslt-tensilelite-remove-yappi-dependency.patch
@@ -1,21 +1,20 @@
-From 72521fcca77c010b9c8b9ce91cde925164502d6f Mon Sep 17 00:00:00 2001
+From ecc1faa0def8d8a6a4b69ae9856e50b82ab03661 Mon Sep 17 00:00:00 2001
From: Tom Rix <Tom.Rix@amd.com>
-Date: Thu, 25 Sep 2025 13:02:55 -0700
+Date: Tue, 27 Jan 2026 10:50:13 -0800
Subject: [PATCH] hipblaslt tensilelite remove yappi dependency
-Signed-off-by: Tom Rix <Tom.Rix@amd.com>
---
- tensilelite/Tensile/TensileCreateLibrary/Run.py | 15 ---------------
- tensilelite/requirements.txt | 2 +-
+ .../Tensile/TensileCreateLibrary/Run.py | 15 ---------------
+ projects/hipblaslt/tensilelite/requirements.txt | 2 +-
2 files changed, 1 insertion(+), 16 deletions(-)
-diff --git a/tensilelite/Tensile/TensileCreateLibrary/Run.py b/tensilelite/Tensile/TensileCreateLibrary/Run.py
-index 835ed9c01916..a02705f6554a 100644
---- a/tensilelite/Tensile/TensileCreateLibrary/Run.py
-+++ b/tensilelite/Tensile/TensileCreateLibrary/Run.py
-@@ -231,12 +231,6 @@ def writeSolutionsAndKernels(
- generateSourcesAndExit=False,
- compress=True,
+diff --git a/projects/hipblaslt/tensilelite/Tensile/TensileCreateLibrary/Run.py b/projects/hipblaslt/tensilelite/Tensile/TensileCreateLibrary/Run.py
+index 22d19851a3fb..46da951d0fbc 100644
+--- a/projects/hipblaslt/tensilelite/Tensile/TensileCreateLibrary/Run.py
++++ b/projects/hipblaslt/tensilelite/Tensile/TensileCreateLibrary/Run.py
+@@ -232,12 +232,6 @@ def writeSolutionsAndKernels(
+ generateSourcesAndExit: bool=False,
+ compress: bool=True,
):
- if globalParameters["PythonProfile"]:
- globalParameters["CpuThreads"] = 0
@@ -26,7 +25,7 @@ index 835ed9c01916..a02705f6554a 100644
codeObjectFiles = []
outputPath = Path(outputPath)
-@@ -299,15 +293,6 @@ def writeSolutionsAndKernels(
+@@ -304,15 +298,6 @@ def writeSolutionsAndKernels(
writeHelpers(outputPath, kernelHelperObjs, KERNEL_HELPER_FILENAME_CPP, KERNEL_HELPER_FILENAME_H)
srcKernelFile = Path(outputPath) / "Kernels.cpp"
@@ -42,10 +41,10 @@ index 835ed9c01916..a02705f6554a 100644
if not generateSourcesAndExit:
codeObjectFiles += buildAssemblyCodeObjectFiles(
asmToolchain.linker,
-diff --git a/tensilelite/requirements.txt b/tensilelite/requirements.txt
+diff --git a/projects/hipblaslt/tensilelite/requirements.txt b/projects/hipblaslt/tensilelite/requirements.txt
index 60c4c1144537..e87db8445411 100644
---- a/tensilelite/requirements.txt
-+++ b/tensilelite/requirements.txt
+--- a/projects/hipblaslt/tensilelite/requirements.txt
++++ b/projects/hipblaslt/tensilelite/requirements.txt
@@ -7,4 +7,4 @@ joblib>=1.1.1; python_version < '3.8'
simplejson
ujson
diff --git a/0001-hipblaslt-tensilelite-use-fedora-paths.patch b/0001-hipblaslt-tensilelite-use-fedora-paths.patch
deleted file mode 100644
index 0a92e7b..0000000
--- a/0001-hipblaslt-tensilelite-use-fedora-paths.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1ac117ac0591a0f1bb67c34f537354c21412b2d8 Mon Sep 17 00:00:00 2001
-From: Tom Rix <Tom.Rix@amd.com>
-Date: Sat, 1 Nov 2025 09:43:58 -0700
-Subject: [PATCH] hipblaslt tensilelite use fedora paths
-
----
- tensilelite/Tensile/Common/GlobalParameters.py | 2 +-
- tensilelite/Tensile/Toolchain/Validators.py | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tensilelite/Tensile/Common/GlobalParameters.py b/tensilelite/Tensile/Common/GlobalParameters.py
-index 567188da59bd..1f8037c183a6 100644
---- a/tensilelite/Tensile/Common/GlobalParameters.py
-+++ b/tensilelite/Tensile/Common/GlobalParameters.py
-@@ -538,7 +538,7 @@ def assignGlobalParameters(config, isaInfoMap: Dict[IsaVersion, IsaInfo]):
- else:
- print2(" %24s: %8s (unspecified)" % (key, defaultValue))
-
-- globalParameters["ROCmPath"] = "/opt/rocm"
-+ globalParameters["ROCmPath"] = "/usr"
- if "ROCM_PATH" in os.environ:
- globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH")
- if "TENSILE_ROCM_PATH" in os.environ:
-diff --git a/tensilelite/Tensile/Toolchain/Validators.py b/tensilelite/Tensile/Toolchain/Validators.py
-index fd5dab5324c0..3ce024d31f52 100644
---- a/tensilelite/Tensile/Toolchain/Validators.py
-+++ b/tensilelite/Tensile/Toolchain/Validators.py
-@@ -30,8 +30,8 @@ from typing import List, NamedTuple, Union
-
- from Tensile.Common.Utilities import isRhel8
-
--DEFAULT_ROCM_BIN_PATH_POSIX = Path("/opt/rocm/bin")
--DEFAULT_ROCM_LLVM_BIN_PATH_POSIX = Path("/opt/rocm/lib/llvm/bin")
-+DEFAULT_ROCM_BIN_PATH_POSIX = Path("/usr/bin")
-+DEFAULT_ROCM_LLVM_BIN_PATH_POSIX = Path("/usr/lib64/rocm/llvm/bin")
- DEFAULT_ROCM_BIN_PATH_WINDOWS = Path("C:/Program Files/AMD/ROCm")
-
-
---
-2.52.0
-
diff --git a/0001-hipblaslt-tensilelite-use-nanobind-tarball.patch b/0001-hipblaslt-tensilelite-use-nanobind-tarball.patch
index f4c8773..aaa2f2c 100644
--- a/0001-hipblaslt-tensilelite-use-nanobind-tarball.patch
+++ b/0001-hipblaslt-tensilelite-use-nanobind-tarball.patch
@@ -1,16 +1,16 @@
-From db6ea0edb963cef7e4c62cabc8f991d8176d045b Mon Sep 17 00:00:00 2001
+From 015247e04e2744640511b47360fe3708f7bd6e3a Mon Sep 17 00:00:00 2001
From: Tom Rix <Tom.Rix@amd.com>
-Date: Sun, 23 Nov 2025 08:19:04 -0800
+Date: Tue, 27 Jan 2026 10:56:33 -0800
Subject: [PATCH] hipblaslt tensilelite use nanobind tarball
---
- tensilelite/rocisa/CMakeLists.txt | 5 +++--
+ projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/tensilelite/rocisa/CMakeLists.txt b/tensilelite/rocisa/CMakeLists.txt
+diff --git a/projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt b/projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt
index 3918f1820d01..7705891bb7f0 100644
---- a/tensilelite/rocisa/CMakeLists.txt
-+++ b/tensilelite/rocisa/CMakeLists.txt
+--- a/projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt
++++ b/projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt
@@ -20,8 +20,9 @@ if(HIPBLASLT_BUNDLE_PYTHON_DEPS)
include(FetchContent)
FetchContent_Declare(
diff --git a/hipblaslt.spec b/hipblaslt.spec
index 7a27f76..e54340c 100644
--- a/hipblaslt.spec
+++ b/hipblaslt.spec
@@ -19,28 +19,26 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#
-%if 0%{!?suse_version:1}
-%define python_exec python3
-%define python_expand python3
-%endif
+%global upstreamname hipblaslt
-%bcond_with gitcommit
-%if %{with gitcommit}
-%global commit0 2584e35062ad9c2edb68d93c464cf157bc57e3b0
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global date0 20250926
+%bcond_with preview
+%if %{with preview}
+%global rocm_release 7.13
+%global rocm_patch 0
+%global pkg_src therock-%{rocm_release}
+%else
+%global rocm_release 7.2
+%global rocm_patch 0
+%global pkg_src rocm-%{rocm_release}.%{rocm_patch}
%endif
-%global upstreamname hipblaslt
-%global rocm_release 7.1
-%global rocm_patch 1
%global rocm_version %{rocm_release}.%{rocm_patch}
%bcond_with compat
%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}
@@ -49,7 +47,7 @@
%global pkg_module default
%endif
%if 0%{?suse_version}
-%global hipblaslt_name libhipblaslt0%{pkg_suffix}
+%global hipblaslt_name libhipblaslt1%{pkg_suffix}
%else
%global hipblaslt_name hipblaslt%{pkg_suffix}
%endif
@@ -89,7 +87,7 @@
# https://github.com/ROCm/hipBLASLt/issues/908
# Compression type and level for source/binary package payloads.
-# "w7T0.xzdio" xz level 7 using %%{getncpus} threads
+# "w7T0.xzdio" xz level 7 using %%{getncpus} threads
%global _source_payload w7T0.xzdio
%global _binary_payload w7T0.xzdio
@@ -120,23 +118,23 @@
%bcond_with nanobind
%endif
+%if 0%{!?suse_version:1}
+%define python_exec python3
+%define python_expand python3
+%endif
+
Name: %{hipblaslt_name}
-%if %{with gitcommit}
-Version: git%{date0}.%{shortcommit0}
-Release: 1%{?dist}
-%else
Version: %{rocm_version}
-Release: 6%{?dist}
+%if %{with preview}
+Release: 0%{?dist}
+%else
+Release: 5%{?dist}
%endif
Summary: ROCm general matrix operations beyond BLAS
License: MIT AND BSD-3-Clause
URL: https://github.com/ROCm/rocm-libraries
-%if %{with gitcommit}
-Source0: %{url}/archive/%{commit0}/rocm-libraries-%{shortcommit0}.tar.gz
-%else
-Source0: %{url}/releases/download/rocm-%{version}/%{upstreamname}.tar.gz#/%{upstreamname}-%{version}.tar.gz
-%endif
+Source0: %{url}/releases/download/%{pkg_src}/%{upstreamname}.tar.gz#/%{upstreamname}-%{version}.tar.gz
%global nanobind_version 2.9.2
%global nanobind_giturl https://github.com/wjakob/nanobind
@@ -145,19 +143,31 @@ Source1: %{nanobind_giturl}/archive/v%{nanobind_version}/nanobind-%{nanob
%global robinmap_giturl https://github.com/Tessil/robin-map
Source2: %{robinmap_giturl}/archive/v%{robinmap_version}/robin-map-%{robinmap_version}.tar.gz
+%if %{with preview}
+Patch1: 0001-hipblaslt-preview-tensilelit-remove-yappi-dependency.patch
+Patch3: 0001-hipblaslt-preview-find-origami-package.patch
+Patch4: 0001-hipblaslt-preview-tensilelit-use-nanobind-tarball.patch
+%else
# yappi was removed from fedora
# 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
# 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
Patch4: 0001-hipblaslt-tensilelite-use-nanobind-tarball.patch
+%endif
# compile and link jobpools
Patch5: 0001-hipblaslt-cmake-compile-and-link-pools.patch
+
+%if %{with preview}
+BuildRequires: amdsmi-devel
+%endif
+BuildRequires: chrpath
BuildRequires: cmake
+%if 0%{?fedora} || 0%{?suse_version}
+BuildRequires: fdupes
+%endif
BuildRequires: gcc-c++
%if 0%{?suse_version}
BuildRequires: gcc-fortran
@@ -183,6 +193,7 @@ BuildRequires: zlib-devel
# For tensilelite
%if 0%{?suse_version}
BuildRequires: python-rpm-macros
+BuildRequires: %{python_module devel}
BuildRequires: %{python_module joblib}
BuildRequires: %{python_module msgpack}
BuildRequires: %{python_module PyYAML}
@@ -200,6 +211,11 @@ BuildRequires: python3dist(pyyaml)
%if %{with nanobind}
BuildRequires: python3dist(nanobind)
%endif
+%if %{with preview}
+BuildRequires: python3dist(packaging)
+BuildRequires: python3dist(pip)
+BuildRequires: python3dist(wheel)
+%endif
%global tensile_verbose 1
BuildRequires: python3dist(joblib)
# https://github.com/ROCm/hipBLASLt/issues/1734
@@ -266,14 +282,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%endif
%prep
-%if %{with gitcommit}
-%setup -q -n rocm-libraries-%{commit0}
-cd projects/hipblaslt
-%patch -P1 -p1
-%patch -P2 -p1
-%else
-%autosetup -p1 -n %{upstreamname}
-%endif
+%autosetup -p3 -n %{upstreamname}
# Use PATH to find where TensileGetPath and other tensile bins are
sed -i -e 's@${Tensile_PREFIX}/bin/TensileGetPath@TensileGetPath@g' tensilelite/Tensile/cmake/TensileConfig.cmake
@@ -284,8 +293,28 @@ sed -i -e 's@set(CMAKE_INSTALL_LIBDIR@#set(CMAKE_INSTALL_LIBDIR@' CMakeLists.txt
# Do not use virtualenv_install
sed -i -e 's@virtualenv_install@#virtualenv_install@' CMakeLists.txt
+%if %{without preview}
# Disable trying to download rocm-cmake
sed -i -e 's@if(NOT ROCmCMakeBuildTools_FOUND)@if(FALSE)@' cmake/dependencies.cmake
+%endif
+
+# 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
@@ -329,19 +358,32 @@ sed -i -e '/#include <omp.h>/d' clients/common/include/testing_matmul.hpp
sed -i -e '/#include <omp.h>/d' clients/common/include/hipblaslt_init.hpp
sed -i -e '/#include <omp.h>/d' clients/common/src/cblas_interface.cpp
+%if %{without preview}
# We are building from a tarball, not a git repo
sed -i -e 's@find_package(Git REQUIRED)@#find_package(Git REQUIRED)@' cmake/dependencies.cmake
+%endif
+
+%if %{with preview}
+# do not pin version of tensilelite
+rm tensilelite/uv.lock
+# take care of requirements manually
+rm tensilelite/requirements.txt
+rm tensilelite/requirements-dev.txt
+sed -i -e '/packaging/,+10d' tensilelite/pyproject.toml
-%build
-%if %{with gitcommit}
-cd projects/hipblaslt
%endif
+%build
# Do a manual install instead of cmake's virtualenv
cd tensilelite
TL=$PWD
+%if %{with preview}
+/usr/bin/python3 -m pip install -vvv --no-build-isolation --no-index --find-links /usr/lib/python%{python3_version}/site-packages --find-links /usr/lib64/python%{python3_version}/site-packages --target $TL .
+%else
%python_exec setup.py install --root $TL
+%endif
+
cd ..
# Should not have to do this
@@ -430,28 +472,33 @@ fi
%cmake_build
%install
-%if %{with gitcommit}
-cd projects/hipblaslt
-%endif
-
%cmake_install
# Extra license
rm -f %{buildroot}%{pkg_prefix}/share/doc/hipblaslt/LICENSE.md
+# hipblaslt.x86_64: W: unstripped-binary-or-object /usr/lib64/hipblaslt/library/extop_gfx1201.co
+%{rocmllvm_bindir}/llvm-strip %{buildroot}%{pkg_prefix}/%{pkg_libdir}/hipblaslt/library/Kernels.so-000-*.hsaco
+%{rocmllvm_bindir}/llvm-strip %{buildroot}%{pkg_prefix}/%{pkg_libdir}/hipblaslt/library/extop_*.co
+
+# hipblaslt.x86_64: E: binary-or-shlib-defines-rpath /usr/lib64/libhipblaslt.so.1.2 (RUNPATH: $ORIGIN/../lib:$ORIGIN/../llvm/lib:$ORIGIN/../lib:$ORIGIN/../lib/hipblaslt/lib)
+chrpath -d %{buildroot}%{pkg_prefix}/%{pkg_libdir}/libhipblaslt.so.*
+
+# hipblaslt-devel.x86_64: W: cross-directory-hard-link /usr/include/hipblaslt/hipblaslt-export.h /usr/include/hipblaslt-export.h
+# Clean up dupes:
+%if 0%{?fedora} || 0%{?suse_version}
+%fdupes %{buildroot}%{pkg_prefix}
+%endif
+
+%if 0%{?suse_version}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%endif
%files
-%if %{with gitcommit}
-%doc projects/hipblaslt/README.md
-%license projects/hipblaslt/LICENSE.md
-%else
%doc README.md
%license LICENSE.md
-%endif
-
-%{pkg_prefix}/%{pkg_libdir}/libhipblaslt.so.*
+%{pkg_prefix}/%{pkg_libdir}/libhipblaslt.so.1{,.*}
%{pkg_prefix}/%{pkg_libdir}/hipblaslt/
%files devel
@@ -465,9 +512,30 @@ rm -f %{buildroot}%{pkg_prefix}/share/doc/hipblaslt/LICENSE.md
%files test
%{pkg_prefix}/bin/hipblaslt*
%{pkg_prefix}/bin/sequence.yaml
+%if %{with preview}
+%{pkg_prefix}/share/hipblaslt/
+%endif
%endif
%changelog
+* Mon Apr 13 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-5
+- Change --with gitcommit to preview
+
+* 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
+
+* Thu Feb 19 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-2
+- Cleanup specfile
+
+* Tue Jan 27 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-1
+- Update to 7.2.0
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
* Wed Dec 31 2025 Tom Rix <Tom.Rix@amd.com> - 7.1.1-6
- Remove build requires git
diff --git a/sources b/sources
index 6252bda..717354f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (hipblaslt-7.1.1.tar.gz) = 3185e399836452549330b0692fc2698b6415fab912f43a8236579ffff3cabc012688dcbc42f6b82870a6e0c7397874c65ca06277a5d3221e7a3c4d70b82be09a
SHA512 (robin-map-1.3.0.tar.gz) = 862cb98d771d1acb692e27d1cc8a4f2cda0883b66af7b38b63ea702ed2d4fc4d49e5700ca4d5f5148fee132f36e111c4839d4f8c52c96a9c60f3937d941b2320
SHA512 (nanobind-2.9.2.tar.gz) = 05b2541896e64bb513f915ebc09820b2d3659efa9a1a4bdda9da79a761a23d84e41db22031c02ae816b1f729dab95efcb7c888e926dbb89fb4b34c8a329d59bf
+SHA512 (hipblaslt-7.2.0.tar.gz) = 1866113e64b5ad3c5a31531b295413c4d03ffec6adc70b588590d77ee48713792a7d592fcee026193eb3fa6d43f09c573d54c475025b2f16e2b46787be448aaa
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-14 12:38 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:38 [rpms/hipblaslt] epel10: Merge branch 'rawhide' into epel10 Tom Rix
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox