diff --git a/0001-offload-compress-option.patch b/0001-offload-compress-option.patch new file mode 100644 index 0000000000000000000000000000000000000000..969c6d0b21f3246e9bdf50c300f1b45865e65547 --- /dev/null +++ b/0001-offload-compress-option.patch @@ -0,0 +1,44 @@ +From 2966285dc09ca9c7e6b95c5212a2d5bd46ab8376 Mon Sep 17 00:00:00 2001 +From: Tom Rix <Tom.Rix@amd.com> +Date: Fri, 27 Sep 2024 05:40:14 -0700 +Subject: [PATCH] offload compress option + +Try out --offload-compress + +Signed-off-by: Tom Rix <Tom.Rix@amd.com> +--- + cmake/build-options.cmake | 2 ++ + library/CMakeLists.txt | 4 ++++ + 2 files changed, 6 insertions(+) + +diff --git a/cmake/build-options.cmake b/cmake/build-options.cmake +index cb35e72fb157..26d04c0aefdb 100755 +--- a/cmake/build-options.cmake ++++ b/cmake/build-options.cmake +@@ -36,6 +36,8 @@ option( BUILD_SHARED_LIBS "Build rocBLAS as a shared library" ON ) + # library without tensile to allow for rapid iteration without GEMM functionality + option( BUILD_WITH_TENSILE "Build full functionality which requires tensile?" ON ) + ++option( BUILD_OFFLOAD_COMPRESS "Build with offload compress?" OFF ) ++ + include(clients/cmake/client-build-options.cmake) + + if (WIN32) +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 90a75dd394d2..0386a3058d45 100755 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -66,6 +66,10 @@ function( rocblas_library_settings lib_target_ ) + # Do not allow Variable Length Arrays (use unique_ptr instead) + target_compile_options( ${lib_target_} PRIVATE -Werror=vla ) + ++ if ( BUILD_OFFLOAD_COMPRESS ) ++ target_compile_options( ${lib_target_} PRIVATE --offload-compress ) ++ endif () ++ + target_compile_definitions( ${lib_target_} PRIVATE ROCM_USE_FLOAT16 ROCBLAS_INTERNAL_API ROCBLAS_BETA_FEATURES_API ) + + # both libraries will use rocblas_EXPORTS +-- +2.46.0 + diff --git a/rocBLAS-6.2.0.tar.gz b/rocBLAS-6.2.2.tar.gz similarity index 81% rename from rocBLAS-6.2.0.tar.gz rename to rocBLAS-6.2.2.tar.gz index 6bbeea8c1472b6a04f9120990353202eea46b97f..5337028d04225ba429f9d9f4f88f470adaad0b91 100644 Binary files a/rocBLAS-6.2.0.tar.gz and b/rocBLAS-6.2.2.tar.gz differ diff --git a/rocblas.spec b/rocblas.spec index 3dce34736e1c86d5544fec5bbdb5880588886de4..ef5ed84ff4e8c94e663f4b7c6b5d666a6c65920d 100644 --- a/rocblas.spec +++ b/rocblas.spec @@ -1,6 +1,6 @@ %global upstreamname rocBLAS %global rocm_release 6.2 -%global rocm_patch 0 +%global rocm_patch 2 %global rocm_version %{rocm_release}.%{rocm_patch} %global toolchain rocm @@ -14,13 +14,31 @@ %if %{with debug} %global build_type DEBUG %else -%global build_type RelWithDebInfo +%global build_type RELEASE +%endif + +%bcond_without compress +%if %{with compress} +%global build_compress ON +%else +%global build_compress OFF %endif %bcond_with test +%if %{with test} +%global build_test ON +%global __brp_check_rpaths %{nil} +%else +%global build_test OFF +%endif -# Enable tensile -%bcond_without tensile +# Tensile blocks general enablement of rocBLAS. +%bcond_with tensile +%if %{with tensile} +%global build_tensile ON +%else +%global build_tensile OFF +%endif Name: rocblas Version: %{rocm_version} @@ -32,6 +50,7 @@ License: MIT AND BSD-3-Clause Source0: %{url}/archive/refs/tags/rocm-%{rocm_version}.tar.gz#/%{upstreamname}-%{rocm_version}.tar.gz Patch0: 0001-fixup-install-of-tensile-output.patch Patch1: 0001-add-gfx1103-support-for-rocBLAS.patch +Patch2: 0001-offload-compress-option.patch Patch1000: Fix-build-on-riscv64.patch @@ -88,33 +107,9 @@ rocBLAS is the AMD library for Basic Linear Algebra Subprograms (BLAS) on the ROCm platform. It is implemented in the HIP programming language and optimized for AMD GPUs. -%package gfx90a -Summary: %{name} for MI200 -%description gfx90a -%{summary} - -%package gfx942 -Summary: %{name} for MI300 -%description gfx942 -%{summary} - -%package gfx1100 -Summary: %{name} for W7900 -%description gfx1100 -%{summary} - -%package gfx1103 -Summary: %{name} for gfx1103 (experimental) -%description gfx1103 -%{summary} - %package devel Summary: Libraries and headers for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-gfx90a%{?_isa} = %{version}-%{release} -Requires: %{name}-gfx942%{?_isa} = %{version}-%{release} -Requires: %{name}-gfx1100%{?_isa} = %{version}-%{release} -Requires: %{name}-gfx1103%{?_isa} = %{version}-%{release} %description devel %{summary} @@ -147,7 +142,8 @@ do mkdir %{_target_platform} pushd %{_target_platform} %cmake .. -G Ninja \ - -DCMAKE_BUILD_TYPE=%build_type \ + -DCMAKE_BUILD_TYPE=%{build_type} \ + -DCMAKE_SKIP_RPATH=ON \ -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF \ -DROCM_SYMLINK_LIBS=OFF \ -DHIP_PLATFORM=amd \ @@ -155,21 +151,12 @@ do -DCMAKE_INSTALL_LIBDIR=$ROCM_LIB \ -DCMAKE_INSTALL_BINDIR=$ROCM_BIN \ %if %{compat_build} - -DCMAKE_C_COMPILER=%{_libdir}/llvm%{maj_ver}/bin/clang \ - -DCMAKE_FIND_ROOT_PATH=%{_libdir}/llvm%{maj_ver} \ - -DCMAKE_CXX_COMPILER=%{_bindir}/hipcc \ -DCMAKE_CXX_FLAGS="--rocm-device-lib-path=%{_prefix}/lib/clang/%{maj_ver}/amdgcn/bitcode" \ %endif -%if %{with test} -DBUILD_CLIENTS_BENCHMARKS=%{build_test} \ -DBUILD_CLIENTS_TESTS=%{build_test} \ -%endif -%if %{with tensile} - -DBUILD_WITH_TENSILE=ON \ + -DBUILD_WITH_TENSILE=%{build_tensile} \ -DBUILD_WITH_PIP=OFF -%else - -DBUILD_WITH_TENSILE=OFF -%endif popd cmake --build %{_target_platform} %{?_smp_mflags} --verbose module purge @@ -181,58 +168,30 @@ do %make_install done -%files -%dir %{_libdir}/cmake/%{name}/ +echo s@%{buildroot}@@ > br.sed +find %{buildroot}%{_libdir} -name '*.so.*.[0-9]' | sed -f br.sed > %{name}.files +find %{buildroot}%{_libdir} -name '*.so.[0-9]' | sed -f br.sed >> %{name}.files +find %{buildroot}%{_libdir} -name 'library' | sed -f br.sed >> %{name}.files +find %{buildroot}%{_libdir} -name '*.so' | sed -f br.sed > %{name}.devel +find %{buildroot}%{_libdir} -name '*.cmake' | sed -f br.sed >> %{name}.devel +find %{buildroot} -name 'rocblas-*' | sed -f br.sed > %{name}.test +find %{buildroot} -name 'rocblas_*' | sed -f br.sed >> %{name}.test + +%files -f %{name}.files %license LICENSE.md %exclude %{_docdir}/%{name}/LICENSE.md -%{_libdir}/lib%{name}.so.* -%{_libdir}/rocm/gfx{8,9,10,11}/lib/lib%{name}.so.* - -%if %{with tensile} -%{_libdir}/rocblas/library/* -%{_libdir}/rocm/gfx{8,9,10,11}/lib/rocblas/library/* -%endif -%files gfx90a -%{_libdir}/rocm/gfx90a/lib/lib%{name}.so.* -%if %{with tensile} -%{_libdir}/rocm/gfx90a/lib/rocblas/library/* -%endif - -%files gfx942 -%{_libdir}/rocm/gfx942/lib/lib%{name}.so.* -%if %{with tensile} -%{_libdir}/rocm/gfx942/lib/rocblas/library/* -%endif - -%files gfx1100 -%{_libdir}/rocm/gfx1100/lib/lib%{name}.so.* -%if %{with tensile} -%{_libdir}/rocm/gfx1100/lib/rocblas/library/* -%endif - -%files gfx1103 -%{_libdir}/rocm/gfx1103/lib/lib%{name}.so.* -%if %{with tensile} -%{_libdir}/rocm/gfx1103/lib/rocblas/library/* -%endif - -%files devel +%files devel -f %{name}.devel %doc README.md -%dir %{_includedir}/%{name} -%dir %{_libdir}/cmake/%{name} -%{_includedir}/%{name}/* -%{_libdir}/cmake/%{name}/* -%{_libdir}/lib%{name}.so -%{_libdir}/rocm/gfx*/lib/lib%{name}.so -%{_libdir}/rocm/gfx*/lib/cmake/%{name}/ +%{_includedir}/%{name} %if %{with test} -%files test -%{_bindir}/%{name}* -%{_libdir}/rocm/gfx*/bin/%{name}* +%files test -f %{name}.test %endif %changelog +* Mon Oct 21 2024 misaka00251 <liuxin@iscas.ac.cn> - 6.2.2-1 +- Update to 6.2.2 + * Fri Sep 20 2024 misaka00251 <liuxin@iscas.ac.cn> - 6.2.0-1 - Init package