diff --git a/.gitignore b/.gitignore index 8439c2d..4827bc7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /roc-2.0.0.tar.gz /rocm-3.5.0.tar.gz /rocm-3.9.0.tar.gz +/hsakmt-rocm-4.5.2.tar.gz +/hsakmt-rocm-5.0.0.tar.gz diff --git a/0001-Fix-install-targets.patch b/0001-Fix-install-targets.patch deleted file mode 100644 index 3c919d9..0000000 --- a/0001-Fix-install-targets.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f5e043b30085fb9095a96ea9039fc98b87b65ee1 Mon Sep 17 00:00:00 2001 -From: Philipp Knechtges -Date: Wed, 25 Nov 2020 20:23:56 +0100 -Subject: [PATCH] Fix install targets - ---- - CMakeLists.txt | 15 +++++++-------- - hsakmt-config.cmake.in | 1 + - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7bd07ad..b164bf6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -160,16 +160,14 @@ set ( CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE STRING "Default install - set ( CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Default packaging prefix." ) - set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Default packaging generators." ) - -+set_target_properties(${HSAKMT_TARGET} PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/hsakmt.h;${CMAKE_CURRENT_SOURCE_DIR}/include/hsakmttypes.h;${CMAKE_CURRENT_SOURCE_DIR}/include/linux/kfd_ioctl.h") -+ - # Installs binaries and exports the library usage data to ${HSAKMT_TARGET}Targets - install ( TARGETS ${HSAKMT_TARGET} EXPORT ${HSAKMT_TARGET}Targets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary ) -- --install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary ) -- --# Install public headers --install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -- COMPONENT devel PATTERN "linux" EXCLUDE ) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary -+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libhsakmt -+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libhsakmt ) - - # Record our usage data for clients find_package calls. - install ( EXPORT ${HSAKMT_TARGET}Targets -@@ -192,7 +190,8 @@ include(CMakePackageConfigHelpers) - configure_package_config_file(${HSAKMT_TARGET}-config.cmake.in - ${HSAKMT_TARGET}-config.cmake - INSTALL_DESTINATION -- ${CMAKE_INSTALL_LIBDIR}/cmake/${HSAKMT_TARGET} ) -+ ${CMAKE_INSTALL_LIBDIR}/cmake/${HSAKMT_TARGET} -+ PATH_VARS INCLUDE_INSTALL_DIR ) - - write_basic_package_version_file(${HSAKMT_TARGET}-config-version.cmake - VERSION ${BUILD_VERSION_STRING} -diff --git a/hsakmt-config.cmake.in b/hsakmt-config.cmake.in -index 9b162da..03c1001 100644 ---- a/hsakmt-config.cmake.in -+++ b/hsakmt-config.cmake.in -@@ -10,4 +10,5 @@ include( CMakeFindDependencyMacro ) - # find_dependencies as shown below. - #find_dependency(Bar, 2.0) - -+set_and_check(@HSAKMT_TARGET@_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@/libhsakmt") - include( "${CMAKE_CURRENT_LIST_DIR}/@HSAKMT_TARGET@Targets.cmake" ) --- -2.28.0 - diff --git a/hsakmt.spec b/hsakmt.spec index bb5f8ff..d00265a 100644 --- a/hsakmt.spec +++ b/hsakmt.spec @@ -1,21 +1,20 @@ %define __cmake_in_source_build 1 -%global rocm_version 3.9.0 +%global rocm_version 5.0.0 Name: hsakmt Version: 1.0.6 -Release: 18.rocm%{rocm_version}%{?dist} -Summary: AMD's HSA thunk library +Release: 19.rocm%{rocm_version}%{?dist} +Summary: AMD HSA thunk library License: MIT -URL: https://github.com/RadeonOpenCompute/ROCm -Source0: https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-%{rocm_version}.tar.gz - -Patch0: 0001-Fix-install-targets.patch +URL: https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface +Source0: https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-%{rocm_version}.tar.gz#/%{name}-rocm-%{rocm_version}.tar.gz ExclusiveArch: x86_64 aarch64 BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: pciutils-devel +BuildRequires: libdrm-devel BuildRequires: numactl-devel %if 0%{?epel} == 7 @@ -26,8 +25,7 @@ BuildRequires: cmake3 %endif %description -This package includes the libhsakmt (Thunk) libraries -for AMD KFD +This package includes the libhsakmt (HSA thunk) libraries for AMD KFD %package devel @@ -36,7 +34,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Provides: hsakmt(rocm) = %{rocm_version} %description devel -Development library for hsakmt. +Development library for the libhsakmt (HSA thunk) libraries for AMD KFD %prep %autosetup -n ROCT-Thunk-Interface-rocm-%{rocm_version} -p1 @@ -52,8 +50,8 @@ cd build cd build %cmake_install -mkdir -p %{buildroot}%{_includedir}/libhsakmt/linux -mv %{buildroot}%{_includedir}/libhsakmt/kfd_ioctl.h %{buildroot}%{_includedir}/libhsakmt/linux/ +# We install this via license macro instead: +rm %{buildroot}%{_docdir}/hsakmt/LICENSE.md %ldconfig_scriptlets @@ -65,13 +63,16 @@ mv %{buildroot}%{_includedir}/libhsakmt/kfd_ioctl.h %{buildroot}%{_includedir}/l %files devel %{_libdir}/libhsakmt.so -%{_includedir}/libhsakmt/hsakmt.h -%{_includedir}/libhsakmt/hsakmttypes.h -%{_includedir}/libhsakmt/linux/kfd_ioctl.h +%{_includedir}/hsakmt.h +%{_includedir}/hsakmttypes.h %{_libdir}/cmake/hsakmt/ %{_datadir}/pkgconfig/libhsakmt.pc %changelog +* Fri Feb 11 2022 Jeremy Newton - 1.0.6-19.rocm5.0.0 +- Update to ROCm version 5.0.0 +- General improvements to spec file + * Thu Jan 20 2022 Fedora Release Engineering - 1.0.6-18.rocm3.9.0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 45db663..cb3969e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rocm-3.9.0.tar.gz) = eb0d3abaae1aa92f60eeb58ef07bf6dd0f954488e2e05bcf30cb75aa772430c49a3103b0498208c7f8f8fd35fb5d91f0f8c056064ce595263e1737e8f72ba462 +SHA512 (hsakmt-rocm-5.0.0.tar.gz) = 24155c2cdf2b04738d505cc72dd9f856da5a64eea03765c8510b4fd1ea2c35fd5a48ea5c70366bfffce49e55ff6bc67455ae4651b04d3019dbdb8be1e254d471