Add Fedora copyright

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

0001-rocblas-remove-roctracer.patch

@@ -0,0 +1,84 @@
+From 92a6ab08c424830e38fb480079eb3bedf4f48224 Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Tue, 12 Aug 2025 08:17:02 -0700
+Subject: [PATCH] rocblas: remove roctracer
+
+Signed-off-by: Tom Rix <Tom.Rix@amd.com>
+---
+ library/CMakeLists.txt          |  3 ---
+ library/src/include/logging.hpp | 24 ------------------------
+ 2 files changed, 27 deletions(-)
+
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 762580d72791..b975ca9a37c8 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -80,9 +80,6 @@ function( rocblas_library_settings lib_target_ )
+     target_link_libraries( ${lib_target_} PRIVATE hip::device )
+   else()
+     target_link_libraries( ${lib_target_} PRIVATE hip::device -lstdc++fs --rtlib=compiler-rt --unwindlib=libgcc)
+-    if (BUILD_SHARED_LIBS)
+-      target_link_libraries(${lib_target_} PRIVATE -lroctx64)
+-    endif()
+   endif()
+     target_link_libraries( ${lib_target_} PRIVATE Threads::Threads )
+   #  -fno-gpu-rdc compiler option was used with hcc, so revisit feature at some point
+diff --git a/library/src/include/logging.hpp b/library/src/include/logging.hpp
+index 352e4e398485..56d8abfcc321 100644
+--- a/library/src/include/logging.hpp
++++ b/library/src/include/logging.hpp
+@@ -40,10 +40,6 @@
+ #include <unordered_map>
+ #include <utility>
+ 
+-#if !defined(ROCBLAS_STATIC_LIB) && !defined(WIN32)
+-#include <roctracer/roctx.h>
+-#endif
+-
+ /************************************************************************************
+  * Profile kernel arguments
+  ************************************************************************************/
+@@ -453,17 +449,6 @@ class Logger
+ public:
+     Logger() = default;
+ 
+-#if !defined(ROCBLAS_STATIC_LIB) && !defined(WIN32)
+-    void log_range(const std::string& name)
+-    {
+-        if(!m_active)
+-        {
+-            roctxRangePush(name.c_str());
+-            m_active = true;
+-        }
+-    }
+-#endif
+-
+     template <typename H, typename... Ts>
+     void log_arguments(rocblas_internal_ostream& os, const char* sep, H&& head, Ts&&... xs)
+     {
+@@ -472,9 +457,6 @@ public:
+         // ((os << sep << std::forward<Ts>(xs)), ...);
+         (void)(int[]){(os << sep << std::forward<Ts>(xs), 0)...};
+ 
+-#if !defined(ROCBLAS_STATIC_LIB) && !defined(WIN32)
+-        log_range(os.str());
+-#endif
+         os << std::endl;
+     }
+ 
+@@ -527,12 +509,6 @@ public:
+ 
+     ~Logger()
+     {
+-#if !defined(ROCBLAS_STATIC_LIB) && !defined(WIN32)
+-        if(m_active)
+-        {
+-            roctxRangePop();
+-        }
+-#endif
+     }
+ 
+ private:
+-- 
+2.50.1
+

changelog

@@ -1,25 +0,0 @@
-* Sun Oct 22 2023 Tom Rix <trix@redhat.com> - 5.7.1-3
-- Change url
-- capitalize AND
-
-* Sat Oct 21 2023 Tom Rix <trix@redhat.com> - 5.7.1-2
-- Fix so location
-- glob gpu family location
-
-* Sun Oct 15 2023 Tom Rix <trix@redhat.com> - 5.7.1-1
-- Update to 5.7.1
-- Use rocm-rpm-macros
-
-* Sat Oct 7 2023 Tom Rix <trix@redhat.com> - 5.7.0-1
-- Update to 5.7
-- Use WIP rocm-rpm-macros
-- Convert to environent modules
-
-* Sun Oct 1 2023 Tom Rix <trix@redhat.com> - 5.6.0-2
-- Split the build into gpu families
-
-* Sat Sep 23 2023 Tom Rix <trix@redhat.com> - 5.6.0-1
-- Update to 5.6
-
-* Tue Jun 6 2023 Tom Rix <trix@redhat.com> - 5.5.1-1
-- Initial package

rocblas.spec

@@ -1,3 +1,24 @@
+#
+# Copyright Fedora Project Authors.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
 %if 0%{?suse_version}
 %global rocblas_name librocblas4
 %else
@@ -17,7 +38,7 @@
 %if %{with debug}
 %global build_type DEBUG
 %else
-%global build_type RELEASE
+%global build_type RelWithDebInfo
 %endif
 
 %bcond_without compress
@@ -49,11 +70,6 @@
 %global build_tensile OFF
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} < 10
-# On CS9: /usr/bin/debugedit: Cannot handle 8-byte build ID
-%global debug_package %{nil}
-%endif
-
 # Compression type and level for source/binary package payloads.
 #  "w7T0.xzdio"	xz level 7 using %%{getncpus} threads
 %global _source_payload w7T0.xzdio
@@ -82,6 +98,8 @@
 %endif
 
 %global cmake_config \\\
+  -DBLAS_INCLUDE_DIR=%{_includedir}/%{blaslib} \\\
+  -DBLAS_LIBRARY=%{blaslib} \\\
   -DCMAKE_CXX_COMPILER=hipcc \\\
   -DCMAKE_C_COMPILER=hipcc \\\
   -DCMAKE_LINKER=%rocmllvm_bindir/ld.lld \\\
@@ -98,7 +116,6 @@
   -DBUILD_CLIENTS_TESTS=%{build_test} \\\
   -DBUILD_CLIENTS_TESTS_OPENMP=OFF \\\
   -DBUILD_FORTRAN_CLIENTS=OFF \\\
-  -DBLAS_LIBRARY=cblas \\\
   -DBUILD_OFFLOAD_COMPRESS=%{build_compress} \\\
   -DBUILD_WITH_HIPBLASLT=OFF \\\
   -DTensile_COMPILER=hipcc \\\
@@ -106,7 +123,6 @@
   -DTensile_LIBRARY_FORMAT=%{tensile_library_format} \\\
   -DTensile_VERBOSE=%{tensile_verbose} \\\
   -DTensile_DIR=${TP}/cmake \\\
-  -DDISABLE_ROCTRACER=ON \\\
   -DBUILD_WITH_PIP=OFF
 
 %bcond_with generic
@@ -119,7 +135,7 @@
 
 Name:           %{rocblas_name}
 Version:        %{rocm_version}
-Release:        4%{?dist}
+Release:        10%{?dist}
 Summary:        BLAS implementation for ROCm
 Url:            https://github.com/ROCmSoftwarePlatform/%{upstreamname}
 License:        MIT AND BSD-3-Clause
@@ -127,7 +143,7 @@ License:        MIT AND BSD-3-Clause
 Source0:        %{url}/archive/refs/tags/rocm-%{rocm_version}.tar.gz#/%{upstreamname}-%{rocm_version}.tar.gz
 Patch2:         0001-fixup-install-of-tensile-output.patch
 Patch4:         0001-offload-compress-option.patch
-Patch6:         0001-option-to-disable-roctracer-logging.patch
+Patch6:         0001-rocblas-remove-roctracer.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -137,19 +153,15 @@ BuildRequires:  rocm-compilersupport-macros
 BuildRequires:  rocm-hip-devel
 BuildRequires:  rocm-runtime-devel
 BuildRequires:  rocm-rpm-macros
-BuildRequires:  rocm-rpm-macros-modules
 
 %if %{with tensile}
 %if 0%{?suse_version}
-%if %{suse_version} < 1699
-BuildRequires:  python3-tensile-devel
-BuildRequires:  python3-joblib
-%else
-BuildRequires:  python311-tensile-devel
-%endif # suse_version < 1699
+BuildRequires:  msgpack-cxx-devel
+%global tensile_library_format msgpack
 # OBS vm times out without console output
 %global tensile_verbose 2
-%global tensile_library_format yaml
+BuildRequires: %{python_module tensile-devel}
+BuildRequires: %{python_module joblib}
 %else
 BuildRequires:  python3dist(tensile)
 %if 0%{?rhel}
@@ -172,21 +184,28 @@ BuildRequires:  pkgconfig(libzstd)
 
 %if %{with test}
 
-BuildRequires:  blas-devel
 BuildRequires:  libomp-devel
-BuildRequires:  python3dist(pyyaml)
 BuildRequires:  rocminfo
 BuildRequires:  rocm-smi-devel
-BuildRequires:  roctracer-devel
 
 %if 0%{?suse_version}
-BuildRequires:  cblas-devel
-BuildRequires:  gcc-fortran
+BuildRequires:  openblas-devel
 BuildRequires:  gtest
+BuildRequires:  gcc-fortran
+BuildRequires: %{python_module PyYAML}
+%global blaslib openblas
 %else
+BuildRequires:  gcc-gfortran
 BuildRequires:  gtest-devel
+BuildRequires:  python3dist(pyyaml)
+%if 0%{?rhel}
+BuildRequires:  flexiblas-devel
+%global blaslib flexiblas
+%else
+BuildRequires:  blas-devel
+%global blaslib cblas
+%endif
 %endif
-
 %endif
 
 %if %{with ninja}
@@ -225,6 +244,7 @@ Provides:       rocblas-devel = %{version}-%{release}
 %package test
 Summary:        Tests for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       diffutils
 
 %description test
 %{summary}
@@ -232,8 +252,8 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %prep
 %autosetup -p1 -n %{upstreamname}-rocm-%{version}
-sed -i -e 's@set( BLAS_LIBRARY "blas" )@set( BLAS_LIBRARY "cblas" )@' clients/CMakeLists.txt
-sed -i -e 's@target_link_libraries( rocblas-test PRIVATE ${BLAS_LIBRARY} ${GTEST_BOTH_LIBRARIES} roc::rocblas )@target_link_libraries( rocblas-test PRIVATE cblas ${GTEST_BOTH_LIBRARIES} roc::rocblas )@' clients/gtest/CMakeLists.txt
+sed -i -e 's@set( BLAS_LIBRARY "blas" )@set( BLAS_LIBRARY "%blaslib" )@' clients/CMakeLists.txt
+sed -i -e 's@target_link_libraries( rocblas-test PRIVATE ${BLAS_LIBRARY} ${GTEST_BOTH_LIBRARIES} roc::rocblas )@target_link_libraries( rocblas-test PRIVATE %blaslib ${GTEST_BOTH_LIBRARIES} roc::rocblas )@' clients/gtest/CMakeLists.txt
 
 # no git in this build
 sed -i -e 's@find_package(Git REQUIRED)@find_package(Git)@' library/CMakeLists.txt
@@ -286,9 +306,7 @@ fi
 %install
 %cmake_install
 
-if [ -f %{buildroot}%{_prefix}/share/doc/rocblas/LICENSE.md ]; then
-    rm %{buildroot}%{_prefix}/share/doc/rocblas/LICENSE.md
-fi
+rm -f %{buildroot}%{_prefix}/share/doc/rocblas/LICENSE.md
 
 %check
 %if %{with test}
@@ -327,6 +345,28 @@ export LD_LIBRARY_PATH=%{_vpath_builddir}/library/src:$LD_LIBRARY_PATH
 %endif
 
 %changelog
+* Wed Aug 27 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.2-10
+- Add Fedora copyright
+
+* Mon Aug 25 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.2-9
+- Simplify file removal
+
+* Wed Aug 20 2025 Egbert Eich <eich@suse.com> - 6.4.2-8
+- Consoldiate Python module BuildRequires for SUSE.
+
+* Sat Aug 16 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.2-7
+- set default build type to RelWithDebInfo
+
+* Sat Aug 16 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.2-6
+- Use msgpack on SUSE
+
+* Wed Aug 13 2025 Egbert Eich <eich@suse.com> - 6.4.2-5
+- Fix build and runtime dependencies of test package.
+ 
+* Tue Aug 12 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.2-5
+- remove roctracer
+- Use distro appropriate blas libs
+
 * Tue Jul 29 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.2-4
 - Remove -mtls-dialect cflag