public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/clpeak] rawhide: update to 2.0.14 + remove upstreamed patch + fix install path + fixes rhbz#2491026
@ 2026-06-23 16:42 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-06-23 16:42 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/clpeak
            Branch : rawhide
            Commit : fa320f171ecdf577c115772ddbac1a93a8ce653d
            Author : Filipe Rosset <filiperosset@fedoraproject.org>
            Date   : 2026-06-23T13:42:32-03:00
            Stats  : +9/-48 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/clpeak/c/fa320f171ecdf577c115772ddbac1a93a8ce653d?branch=rawhide

            Log:
            update to 2.0.14 + remove upstreamed patch + fix install path + fixes rhbz#2491026

Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>

---
diff --git a/clpeak-fix-amx-32bit.patch b/clpeak-fix-amx-32bit.patch
deleted file mode 100644
index b6eeb51..0000000
--- a/clpeak-fix-amx-32bit.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN a/src/cpu/CMakeLists.txt b/src/cpu/CMakeLists.txt
---- a/src/cpu/CMakeLists.txt	2026-06-10 13:49:05.000000000 -0300
-+++ b/src/cpu/CMakeLists.txt	2026-06-13 15:18:12.788239406 -0300
-@@ -220,7 +220,7 @@
-             if(_clpeak_f_fp16x)
-                 clpeak_add_isa_tu(avx512fp16 ${_avx512_core} ${_clpeak_gnuflag}-mavx512fp16)
-             endif()
--            if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+            if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-                 set(_amx ${_avx512_core} -mamx-tile -mamx-int8 -mamx-bf16)
-                 check_cxx_compiler_flag("${_amx}" _clpeak_f_amx)
-                 if(_clpeak_f_amx)
-diff -urN a/src/cpu/cpu_kernels_impl.h b/src/cpu/cpu_kernels_impl.h
---- a/src/cpu/cpu_kernels_impl.h	2026-06-10 13:49:05.000000000 -0300
-+++ b/src/cpu/cpu_kernels_impl.h	2026-06-13 15:18:17.943243777 -0300
-@@ -19,7 +19,7 @@
- #define CLPEAK_ISA_NAME_STR "scalar"
- #endif
- 
--#if (defined(__AMX_INT8__) || defined(__AMX_BF16__)) && defined(__linux__)
-+#if (defined(__AMX_INT8__) || defined(__AMX_BF16__)) && defined(__linux__) && defined(__x86_64__)
- #include <immintrin.h>
- #endif
- 
-@@ -421,7 +421,7 @@
- 
- // ---- Matrix engine: int8 (AMX / SMMLA) and bf16 (AMX / BFMMLA) -------------
- // ops are PER-k; the table multiplies by INNER (the chain loops INNER per outer).
--#if defined(__AMX_INT8__) && defined(__linux__)
-+#if defined(__AMX_INT8__) && defined(__linux__) && defined(__x86_64__)
- #define CPU_MAT_INT8_KERNEL 1
- static constexpr double MAT_I8_OPS_PER_K = 4.0 * 16 * 16 * 64 * 2;
- static thread_local bool g_amxI8Cfg = false;
-@@ -476,7 +476,7 @@
- }
- #endif
- 
--#if defined(__AMX_BF16__) && defined(__linux__)
-+#if defined(__AMX_BF16__) && defined(__linux__) && defined(__x86_64__)
- #define CPU_MAT_FP_KERNEL 1
- static constexpr double MAT_FP_OPS_PER_K = 4.0 * 16 * 16 * 32 * 2;
- static thread_local bool g_amxBf16Cfg = false;

diff --git a/clpeak.spec b/clpeak.spec
index 174c25b..0f6c61f 100644
--- a/clpeak.spec
+++ b/clpeak.spec
@@ -1,13 +1,11 @@
 Name:       clpeak
-Version:    2.0.13
+Version:    2.0.14
 Release:    %autorelease
 Summary:    Measure the peak achievable performance of GPU compute devices
 License:    Apache-2.0
 URL:        https://github.com/krrishnarraj/%{name}
 Source:     %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-# Patch submitted to upstream, may be removed in next version
-# https://github.com/krrishnarraj/clpeak/issues/173
-Patch:      clpeak-fix-amx-32bit.patch
+
 
 BuildRequires: cmake
 BuildRequires: gcc
@@ -34,8 +32,13 @@ scheduling, extension exposure) become visible alongside the raw peak
 numbers.
 
 %prep
-%autosetup -p1
+%autosetup
 
+# Starting with clpeak-2.0.14 below ugly hacks are needed to fix install paths
+# Fix incorrect installation paths in upstream CMakeLists.txt
+sed -i 's/RUNTIME DESTINATION ./RUNTIME DESTINATION bin/' CMakeLists.txt
+# Remove upstream license installation to avoid installing to /usr/LICENSE
+sed -i '/install(FILES LICENSE DESTINATION .)/d' CMakeLists.txt
 
 %build
 %cmake

diff --git a/sources b/sources
index 4f38dc6..d992245 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clpeak-2.0.13.tar.gz) = 11b66725662786fdcc0086540ddb61d37adf4338d6c407b7462ab8187f9cf36091722e7685d689f653a7c50089bb4a54b725e2b8336d85e5abe617627c9867a3
+SHA512 (clpeak-2.0.14.tar.gz) = 0ff6f898a268752dc7c4028de0d0d314be00e47596bde5feacf49ef490fa556d3e6a625efad5437aa7a607801759f76fb73f119b728abe95f1fdc4dc3545e67e

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

only message in thread, other threads:[~2026-06-23 16:42 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-23 16:42 [rpms/clpeak] rawhide: update to 2.0.14 + remove upstreamed patch + fix install path + fixes rhbz#2491026 Filipe Rosset

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