public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/hipblaslt] epel10: Partial update preview to 7.13
@ 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 : 768430294a1e8069ca65ba3d16314b1c287108d7
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-05-27T12:27:04-07:00
            Stats  : +121/-12 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/hipblaslt/c/768430294a1e8069ca65ba3d16314b1c287108d7?branch=epel10

            Log:
            Partial update preview to 7.13

Depends on stinkytofu package.
Checking this in while stinkytofu gets packaged up.

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

---
diff --git a/0001-hipblaslt-preview-find-origami-package.patch b/0001-hipblaslt-preview-find-origami-package.patch
index f985ec7..6d70064 100644
--- a/0001-hipblaslt-preview-find-origami-package.patch
+++ b/0001-hipblaslt-preview-find-origami-package.patch
@@ -1,6 +1,6 @@
-From 6071507ebd8bf8e84ce6fd37f871cb2a9d33b46f Mon Sep 17 00:00:00 2001
+From 72f253a5f1603d6a02e2a5ba160754feca956a45 Mon Sep 17 00:00:00 2001
 From: Tom Rix <Tom.Rix@amd.com>
-Date: Mon, 13 Apr 2026 16:19:54 -0700
+Date: Tue, 26 May 2026 13:49:18 -0700
 Subject: [PATCH] hipblaslt preview find origami package
 
 ---
@@ -8,10 +8,10 @@ Subject: [PATCH] hipblaslt preview find origami package
  1 file changed, 1 insertion(+), 14 deletions(-)
 
 diff --git a/projects/hipblaslt/CMakeLists.txt b/projects/hipblaslt/CMakeLists.txt
-index 166ce3c025e8..43c47dbd7d52 100644
+index 11b8fdfe5c3c..eea341127604 100644
 --- a/projects/hipblaslt/CMakeLists.txt
 +++ b/projects/hipblaslt/CMakeLists.txt
-@@ -238,20 +238,7 @@ if(NOT HIPBLASLT_ENABLE_YAML)
+@@ -244,20 +244,7 @@ if(NOT HIPBLASLT_ENABLE_YAML)
      endif()
  endif()
  
@@ -31,8 +31,8 @@ index 166ce3c025e8..43c47dbd7d52 100644
 -endif()
 +find_package(origami REQUIRED)
  
- add_subdirectory(tensilelite)
- 
+ # 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/hipblaslt.spec b/hipblaslt.spec
index 348543a..e54340c 100644
--- a/hipblaslt.spec
+++ b/hipblaslt.spec
@@ -23,7 +23,7 @@
 
 %bcond_with preview
 %if %{with preview}
-%global rocm_release 7.12
+%global rocm_release 7.13
 %global rocm_patch 0
 %global pkg_src therock-%{rocm_release}
 %else
@@ -143,23 +143,25 @@ 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
 # https://github.com/ROCm/rocm-libraries/issues/2422
-%if %{with preview}
-Patch3:         0001-hipblaslt-preview-find-origami-package.patch
-%else
 Patch3:         0001-hipblaslt-find-origami-package.patch
-%endif
 # 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-static
+BuildRequires:  amdsmi-devel
 %endif
 BuildRequires:  chrpath
 BuildRequires:  cmake
@@ -209,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
@@ -356,12 +363,27 @@ sed -i -e '/#include <omp.h>/d'   clients/common/src/cblas_interface.cpp
 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
+
+%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

^ 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: Partial update preview to 7.13 Tom Rix

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