Add cblas-devel as build dependency on SUSE when test is enabled

Signed-off-by: Egbert Eich <eich@suse.com>

hipblaslt.spec

@@ -54,21 +54,23 @@
 
 # Use ninja if it is available
 # Ninja is available on suse but obs times out with ninja build, make doesn't
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version}
 %bcond_without ninja
 %else
 %bcond_with ninja
 %endif
 
 %if %{with ninja}
-%global cmake_generator -G Ninja
+%if 0%{?suse_version}
+%define __builder ninja
 %else
-%global cmake_generator %{nil}
+%global cmake_generator -G Ninja
+%endif
 %endif
 
 Name:           %{hipblaslt_name}
 Version:        %{rocm_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        ROCm general matrix operations beyond BLAS
 Url:            https://github.com/ROCmSoftwarePlatform/%{upstreamname}
 License:        MIT
@@ -98,6 +100,7 @@ BuildRequires:  rocm-llvm-devel
 BuildRequires:  rocm-runtime-devel
 BuildRequires:  rocm-rpm-macros
 BuildRequires:  rocm-smi-devel
+BuildRequires:  roctracer-devel
 BuildRequires:  zlib-devel
 
 # For tensilelite
@@ -108,58 +111,51 @@ BuildRequires:  %{python_module msgpack}
 BuildRequires:  %{python_module PyYAML}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  msgpack-cxx-devel
-%global tensile_verbose 2
 BuildRequires:  %{python_module dataclasses if %python-base < 3.11}
 BuildRequires:  %{python_module ujson}
 BuildRequires:  %{python_module distro}
 BuildRequires:  %{python_module simplejson}
+%{?with_ninja:BuildRequires:  ninja}
 %else # %suse_version
 BuildRequires:  python3-devel
 BuildRequires:  python3dist(setuptools)
 BuildRequires:  python3dist(pyyaml)
-%if 0%{?rhel}
-%global tensile_verbose 2
-%else
-%global tensile_verbose 1
+%if 0%{!?rhel:1}
 BuildRequires:  python3dist(joblib)
 %endif
 # https://github.com/ROCm/hipBLASLt/issues/1734
 BuildRequires:  python3dist(msgpack)
 BuildRequires:  msgpack-devel
+%{?with_ninja:BuildRequires:  ninja-build}
 %endif
 
 %if %{with test}
-BuildRequires:  rocm-omp-devel
 %if 0%{?suse_version}
+BuildRequires:  blas-devel
 BuildRequires:  gcc-fortran
-BuildRequires:  gmock
 BuildRequires:  gtest
-BuildRequires:  openblas-devel
-%global blaslib openblas
-%else
-BuildRequires:  gcc-gfortran
-BuildRequires:  gmock-devel
-BuildRequires:  gtest-devel
-%if 0%{?rhel}
-BuildRequires:  flexiblas-devel
-%global blaslib flexiblas
+BuildRequires:  gmock
+BuildRequires:  lapack-devel
+BuildRequires:  cblas-devel
 %else
 BuildRequires:  blas-static
+BuildRequires:  gcc-gfortran
+BuildRequires:  gtest-devel
+BuildRequires:  gmock-devel
 BuildRequires:  lapack-static
-%global blaslib cblas
-%endif
 %endif
 %endif
 
 %if %{with ninja}
-%if 0%{?fedora}
-BuildRequires:  ninja-build
-%endif
 %if 0%{?suse_version}
-BuildRequires:  ninja
 %define __builder ninja
 %endif
 %endif
+%if 0%{?rhel} || 0%{?suse_version}
+%global tensile_verbose 2
+%else
+%global tensile_verbose 1
+%endif
 
 Provides:       hipblaslt = %{version}-%{release}
 Provides:       bundled(python-tensile) = %{tensile_version}
@@ -262,13 +258,6 @@ if [ "$GPUS" -lt "$HIP_JOBS" ]; then
 fi
 sed -i -e "s@--offload-arch@-parallel-jobs=${HIP_JOBS} --offload-arch@" library/src/amd_detail/rocblaslt/src/kernels/compile_code_object.sh
 
-# change looking for cblas to blaslib
-sed -i -e 's@find_package( cblas REQUIRED CONFIG )@#find_package( cblas REQUIRED CONFIG )@' clients/CMakeLists.txt
-sed -i -e 's@set( BLAS_LIBRARY "blas" )@set( BLAS_LIBRARY "%blaslib" )@' clients/CMakeLists.txt
-%if ! 0%{?fedora}
-sed -i -e 's@lapack cblas@%blaslib@' clients/gtest/CMakeLists.txt
-%endif
-
 %build
 
 # Do a manual install instead of cmake's virtualenv
@@ -295,14 +284,13 @@ export PATH=${TL}/%{_bindir}:$PATH
 export PYTHONPATH=${TL}%{python3_sitelib}:$PYTHONPATH
 export Tensile_DIR=${TL}%{python3_sitelib}/Tensile
 %endif
+%{?suse_version:export LLVM_DIR=%{rocmllvm_cmakedir}}
 # Uncomment and see if the path is sane
 # TensileGetPath
 
 # Use ld.lld to work around a problem with ld
-%cmake %{cmake_generator} \
+%cmake %{?cmake_generator} \
        -DAMDGPU_TARGETS=%{amdgpu_targets} \
-       -DBLAS_INCLUDE_DIR=%{_includedir}/%{blaslib} \
-       -DBLAS_LIBRARY=%{blaslib} \
        -DBUILD_CLIENTS_TESTS=%{build_test} \
        -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF \
        -DBUILD_VERBOSE=ON \
@@ -313,7 +301,6 @@ export Tensile_DIR=${TL}%{python3_sitelib}/Tensile
        -DCMAKE_CXX_FLAGS="-fuse-ld=%{rocmllvm_bindir}/ld.lld" \
        -DCMAKE_VERBOSE_MAKEFILE=ON \
        -DHIP_PLATFORM=amd \
-       -DHIPBLASLT_ENABLE_MARKER=OFF \
        -DROCM_SYMLINK_LIBS=OFF \
        -DBUILD_WITH_TENSILE=ON \
        -DTensile_COMPILER=%{rocmllvm_bindir}/clang++ \
@@ -354,14 +341,19 @@ fi
 %endif
 
 %changelog
-* Wed Aug 20 2025 Egbert Eich <eich@suse.com> - 6.4.3-3
+* Fri Aug 15 2025 Egbert Eich <eich@suse.com> - 6.4.3-4
+- Add cblas-devel as build requires on SUSE when test is enabled.
+
+* Wed Aug 13 2025 Egbert Eich <eich@suse.com> - 6.4.3-3
+- Fix a number of dependencies on SUSE when test is enabled.
+
+* Sun Aug 10 2025 Egbert Eich <eich@suse.com> - 6.4.3-2
 - On SLE-15 exclusively use python 3.6.
   This is since joblib is not even available on PackageHub.
+- Enable Ninja on SUSE.
 - On SUSE check for msgpack-cxx instead of msgpack.
-
-* Wed Aug 13 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.3-2
-- Remove roctracer
-- Build on EPEL
+- Fix build on SUSE.
+- Restructure to enhance readability.
 
 * Thu Aug 7 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.3-1
 - Update to 6.4.3