Compare commits

...

10 Commits

4 changed files with 91 additions and 54 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d4585b8adbc299f3fdc2c74bb20ffd4285027b861a759c3e62ce564589465da
size 125256

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7464c1e48f4e1a97a5e5978146641971d068886038810876b60acb5dfb6c4d39
size 125500

BIN
hipRAND-6.4.0.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -1,6 +1,12 @@
%if 0%{?suse_version}
%global hiprand_name libhiprand1
%else
%global hiprand_name hiprand
%endif
%global upstreamname hipRAND %global upstreamname hipRAND
%global rocm_release 6.3 %global rocm_release 6.4
%global rocm_patch 0 %global rocm_patch 0
%global rocm_version %{rocm_release}.%{rocm_patch} %global rocm_version %{rocm_release}.%{rocm_patch}
@@ -8,9 +14,6 @@
# hipcc does not support some clang flags # hipcc does not support some clang flags
%global build_cxxflags %(echo %{optflags} | sed -e 's/-fstack-protector-strong/-Xarch_host -fstack-protector-strong/' -e 's/-fcf-protection/-Xarch_host -fcf-protection/') %global build_cxxflags %(echo %{optflags} | sed -e 's/-fstack-protector-strong/-Xarch_host -fstack-protector-strong/' -e 's/-fcf-protection/-Xarch_host -fcf-protection/')
# $gpu will be evaluated in the loops below
%global _vpath_builddir %{_vendor}-%{_target_os}-build-${gpu}
%bcond_with debug %bcond_with debug
%if %{with debug} %if %{with debug}
%global build_type DEBUG %global build_type DEBUG
@@ -26,20 +29,23 @@
%global build_test OFF %global build_test OFF
%endif %endif
# Option to test suite for testing on real HW:
%bcond_with check
# For docs
%bcond_with doc %bcond_with doc
# Compression type and level for source/binary package payloads. # Compression type and level for source/binary package payloads.
# "w7T0.xzdio" xz level 7 using %%{getncpus} threads # "w7T0.xzdio" xz level 7 using %%{getncpus} threads
%define _source_payload w7T0.xzdio %global _source_payload w7T0.xzdio
%define _binary_payload w7T0.xzdio %global _binary_payload w7T0.xzdio
Name: hiprand Name: %{hiprand_name}
Version: %{rocm_version} Version: %{rocm_version}
Release: 4%{?dist} Release: 4%{?dist}
Summary: HIP random number generator Summary: HIP random number generator
Url: https://github.com/ROCm/%{upstreamname} Url: https://github.com/ROCm/%{upstreamname}
License: MIT and BSD License: MIT AND BSD-3-Clause
Source0: %{url}/archive/rocm-%{version}.tar.gz#/%{upstreamname}-%{version}.tar.gz Source0: %{url}/archive/rocm-%{version}.tar.gz#/%{upstreamname}-%{version}.tar.gz
BuildRequires: cmake BuildRequires: cmake
@@ -53,13 +59,19 @@ BuildRequires: rocm-runtime-devel
BuildRequires: rocrand-devel BuildRequires: rocrand-devel
%if %{with test} %if %{with test}
%if 0%{?suse_version}
BuildRequires: gtest
%else
BuildRequires: gtest-devel BuildRequires: gtest-devel
%endif %endif
%endif
%if %{with doc} %if %{with doc}
BuildRequires: doxygen BuildRequires: doxygen
%endif %endif
Provides: hiprand = %{version}-%{release}
# Only x86_64 works right now: # Only x86_64 works right now:
ExclusiveArch: x86_64 ExclusiveArch: x86_64
@@ -70,10 +82,14 @@ into the backend and results back to the application. hipRAND exports an
interface that does not require the client to change, regardless of the chosen interface that does not require the client to change, regardless of the chosen
backend. Currently, hipRAND supports either rocRAND or cuRAND. backend. Currently, hipRAND supports either rocRAND or cuRAND.
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%package devel %package devel
Summary: The hipRAND development package Summary: The hipRAND development package
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: rocrand-devel Requires: rocrand-devel
Provides: hiprand-devel = %{version}-%{release}
%description devel %description devel
The hipRAND development package. The hipRAND development package.
@@ -93,12 +109,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
#Remove RPATH: #Remove RPATH:
sed -i '/INSTALL_RPATH/d' CMakeLists.txt sed -i '/INSTALL_RPATH/d' CMakeLists.txt
%build # On Tumbleweed Q2,2025
for gpu in %{rocm_gpu_list} # /usr/include/gtest/internal/gtest-port.h:279:2: error: C++ versions less than C++14 are not supported.
do # 279 | #error C++ versions less than C++14 are not supported.
module load rocm/$gpu # https://github.com/ROCm/hipRAND/issues/222
# Convert the c++11's to c++14
sed -i -e 's@set(CMAKE_CXX_STANDARD 11)@set(CMAKE_CXX_STANDARD 14)@' {,test/package/}CMakeLists.txt
%cmake \ %build
%cmake \
-DCMAKE_CXX_COMPILER=hipcc \ -DCMAKE_CXX_COMPILER=hipcc \
-DCMAKE_C_COMPILER=hipcc \ -DCMAKE_C_COMPILER=hipcc \
-DCMAKE_LINKER=%rocmllvm_bindir/ld.lld \ -DCMAKE_LINKER=%rocmllvm_bindir/ld.lld \
@@ -108,30 +128,15 @@ do
-DCMAKE_PREFIX_PATH=%{rocmllvm_cmakedir}/.. \ -DCMAKE_PREFIX_PATH=%{rocmllvm_cmakedir}/.. \
-DCMAKE_SKIP_RPATH=ON \ -DCMAKE_SKIP_RPATH=ON \
-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF \ -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF \
-DAMDGPU_TARGETS=${ROCM_GPUS} \ -DAMDGPU_TARGETS=%{rocm_gpu_list_default} \
-DCMAKE_INSTALL_LIBDIR=$ROCM_LIB \ -DCMAKE_INSTALL_LIBDIR=%_libdir \
-DCMAKE_INSTALL_BINDIR=$ROCM_BIN \
-DBUILD_TEST=%{build_test} \ -DBUILD_TEST=%{build_test} \
-DROCM_SYMLINK_LIBS=OFF -DROCM_SYMLINK_LIBS=OFF
%cmake_build %cmake_build
module purge
done
%install %install
for gpu in %{rocm_gpu_list} %cmake_install
do
%cmake_install
done
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 '*.so' | sed -f br.sed > %{name}.devel
find %{buildroot}%{_libdir} -name '*.cmake' | sed -f br.sed >> %{name}.devel
%if %{with test}
find %{buildroot} -name 'test_*' | sed -f br.sed > %{name}.test
%endif
if [ -f %{buildroot}%{_prefix}/share/doc/hiprand/LICENSE.txt ]; then if [ -f %{buildroot}%{_prefix}/share/doc/hiprand/LICENSE.txt ]; then
rm %{buildroot}%{_prefix}/share/doc/hiprand/LICENSE.txt rm %{buildroot}%{_prefix}/share/doc/hiprand/LICENSE.txt
@@ -140,20 +145,55 @@ if [ -f %{buildroot}%{_prefix}/bin/hipRAND/CTestTestfile.cmake ]; then
rm %{buildroot}%{_prefix}/bin/hipRAND/CTestTestfile.cmake rm %{buildroot}%{_prefix}/bin/hipRAND/CTestTestfile.cmake
fi fi
%files -f %{name}.files %check
%if %{with test}
%if %{with check}
%if 0%{?suse_version}
export LD_LIBRARY_PATH=$PWD/build/library:$LD_LIBRARY_PATH
%endif
%ctest
%endif
%endif
%files
%doc README.md %doc README.md
%license LICENSE.txt %license LICENSE.txt
%{_libdir}/libhiprand.so.1{,.*}
%files devel -f %{name}.devel %files devel
%dir %{_libdir}/cmake/%{name} %dir %{_libdir}/cmake/hiprand
%dir %{_includedir}/%{name} %dir %{_includedir}/hiprand
%{_includedir}/%{name}/* %{_includedir}/hiprand/*
%{_libdir}/libhiprand.so
%{_libdir}/cmake/hiprand/*.cmake
%if %{with test} %if %{with test}
%files test -f %{name}.test %files test
%{_bindir}/test*
%endif %endif
%changelog %changelog
* Mon Jun 16 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.0-4
- Remove suse check of ldconfig
* Mon May 12 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.0-3
- Cleanup module build
* Sun Apr 27 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.0-2
- Improve testing on suse
* Sat Apr 19 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.0-1
- Update to 6.4.0
* Fri Apr 4 2025 Tom Rix <Tom.Rix@amd.com> - 6.3.0-6
- Use correct spdx license
- cleanup
* Tue Feb 11 2025 Tom Rix <Tom.Rix@amd.com> - 6.3.0-5
- Remove split building
- Fix SLE 15.6
* Mon Jan 20 2025 Tom Rix <Tom.Rix@amd.com> - 6.3.0-4 * Mon Jan 20 2025 Tom Rix <Tom.Rix@amd.com> - 6.3.0-4
- multithread compress - multithread compress