Changes
4 changed files (+18/-101)
-
-
@@ -1,6 +1,6 @@pkgbase = hip-runtime-amd pkgdesc = Heterogeneous Interface for Portability ROCm pkgver = 4.5.2 pkgver = 5.0.0 pkgrel = 1 url = https://rocmdocs.amd.com/en/latest/Installation_Guide/HIP.html arch = x86_64
-
@@ -15,17 +15,13 @@ pkgbase = hip-runtime-amddepends = libelf provides = hip conflicts = hip source = hip-runtime-amd-4.5.2.tar.gz::https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-4.5.2.tar.gz source = hip-runtime-amd-opencl-4.5.2.tar.gz::https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.5.2.tar.gz source = hip-runtime-amd-rocclr-4.5.2.tar.gz::https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.5.2.tar.gz source = hip-runtime-amd-hipamd-4.5.2.tar.gz::https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-4.5.2.tar.gz source = disable-testing.patch source = vector_oob.patch sha256sums = c2113dc3c421b8084cd507d91b6fbc0170765a464b71fb0d96bb875df368f160 sha256sums = 96b43f314899707810db92149caf518bdb7cf39f7c0ad86e98ad687ffb0d396d sha256sums = 6581916a3303a31f76454f12f86e020fb5e5c019f3dbb0780436a8f73792c4d1 sha256sums = b6f35b1a1d0c466b5af28e26baf646ae63267eccc4852204db1e0c7222a39ce2 sha256sums = 3f158fb78296477db176c53a8df60b8034004c400b6c62f558c94663a5246883 sha256sums = 8295e2d1b1d48da821f280e6a44f8376cbe73b77bd58bdceed38dbc2a100569f source = hip-runtime-amd-5.0.0.tar.gz::https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.0.0.tar.gz source = hip-runtime-amd-opencl-5.0.0.tar.gz::https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.0.0.tar.gz source = hip-runtime-amd-rocclr-5.0.0.tar.gz::https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.0.0.tar.gz source = hip-runtime-amd-hipamd-5.0.0.tar.gz::https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-5.0.0.tar.gz sha256sums = ae12fcda2d955f04a51c9e794bdb0fa96539cda88b6de8e377850e68e7c2a781 sha256sums = 2aa3a628b336461f83866c4e76225ef5338359e31f802987699d6308515ae1be sha256sums = 6b72faf8819628a5c109b2ade515ab9009606d10f11316f0d7e4c4c998d7f724 sha256sums = cbd95a577abfd7cbffee14a4848f7789a417c6e5e5a713f42eb75d7948abcdf9 pkgname = hip-runtime-amd
-
-
-
@@ -1,7 +1,7 @@# Maintainer: Torsten Keßler <t dot kessler at posteo dot de> # Contributor: acxz <akashpatel2008 at yahoo dot com> pkgname=hip-runtime-amd pkgver=4.5.2 pkgver=5.0.0 pkgrel=1 pkgdesc="Heterogeneous Interface for Portability ROCm" arch=('x86_64')
-
@@ -18,37 +18,27 @@ _hipamd='https://github.com/ROCm-Developer-Tools/hipamd'source=("$pkgname-$pkgver.tar.gz::$_hip/archive/rocm-$pkgver.tar.gz" "$pkgname-opencl-$pkgver.tar.gz::$_opencl/archive/rocm-$pkgver.tar.gz" "$pkgname-rocclr-$pkgver.tar.gz::$_rocclr/archive/rocm-$pkgver.tar.gz" "$pkgname-hipamd-$pkgver.tar.gz::$_hipamd/archive/rocm-$pkgver.tar.gz" 'disable-testing.patch' 'vector_oob.patch') sha256sums=('c2113dc3c421b8084cd507d91b6fbc0170765a464b71fb0d96bb875df368f160' '96b43f314899707810db92149caf518bdb7cf39f7c0ad86e98ad687ffb0d396d' '6581916a3303a31f76454f12f86e020fb5e5c019f3dbb0780436a8f73792c4d1' 'b6f35b1a1d0c466b5af28e26baf646ae63267eccc4852204db1e0c7222a39ce2' '3f158fb78296477db176c53a8df60b8034004c400b6c62f558c94663a5246883' '8295e2d1b1d48da821f280e6a44f8376cbe73b77bd58bdceed38dbc2a100569f') "$pkgname-hipamd-$pkgver.tar.gz::$_hipamd/archive/rocm-$pkgver.tar.gz") sha256sums=('ae12fcda2d955f04a51c9e794bdb0fa96539cda88b6de8e377850e68e7c2a781' '2aa3a628b336461f83866c4e76225ef5338359e31f802987699d6308515ae1be' '6b72faf8819628a5c109b2ade515ab9009606d10f11316f0d7e4c4c998d7f724' 'cbd95a577abfd7cbffee14a4848f7789a417c6e5e5a713f42eb75d7948abcdf9') _dirhip="$(basename "$_hip")-$(basename "${source[0]}" ".tar.gz")" _diropencl="$(basename "$_opencl")-$(basename "${source[1]}" ".tar.gz")" _dirrocclr="$(basename "$_rocclr")-$(basename "${source[2]}" ".tar.gz")" _dirhipamd="$(basename "$_hipamd")-$(basename "${source[3]}" ".tar.gz")" prepare() { cd "$_dirhipamd" # Tests are broken with cmake 3.21 patch -Np1 -i "$srcdir/disable-testing.patch" cd "$srcdir/$_dirrocclr" # https://github.com/ROCm-Developer-Tools/HIP/issues/2426 patch -Np1 -i "$srcdir/vector_oob.patch" } build() { # build fails if cmake and make are called from outside the build directory mkdir build && cd build # Pass empty OFFLOAD_ARCH_STR to mitigate a problem with rocm_agent_enumerator (only needed for tests) cmake -Wno-dev \ -S "$srcdir/$_dirhipamd" \ -DHIP_COMMON_DIR="$srcdir/$_dirhip" \ -DAMD_OPENCL_PATH="$srcdir/$_diropencl" \ -DROCCLR_PATH="$srcdir/$_dirrocclr" \ -DHIP_PLATFORM=amd \ -DOFFLOAD_ARCH_STR='' \ -DCMAKE_INSTALL_PREFIX=/opt/rocm/hip make
-
-
hip-runtime-amd/disable-testing.patch (deleted)
-
@@ -1,40 +0,0 @@*** hipamd-rocm-4.5.0/CMakeLists.txt.bak 2021-11-06 16:23:12.117891364 +0100 --- hipamd-rocm-4.5.0/CMakeLists.txt 2021-11-06 16:23:31.879582654 +0100 *************** *** 485,519 **** endif() ############################# - # Testing steps - ############################# - # HIT is not compatible with Windows - if(NOT WIN32) - set(HIP_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}) - set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}) - if(HIP_PLATFORM STREQUAL "nvidia") - execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${HIP_ROOT_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET) - endif() - execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_COMMON_INCLUDE_DIR}/hip/" "${HIP_ROOT_DIR}/include/hip/" RESULT_VARIABLE RUN_HIT ERROR_QUIET) - execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_COMMON_DIR}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET) - if(${RUN_HIT} EQUAL 0) - execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_COMMON_BIN_DIR}" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET) - endif() - if(HIP_CATCH_TEST EQUAL "1") - enable_testing() - add_subdirectory(${HIP_COMMON_DIR}/tests/catch ${PROJECT_BINARY_DIR}/catch) - else() - if(${RUN_HIT} EQUAL 0) - set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH}) - include(${HIP_COMMON_DIR}/tests/hit/HIT.cmake) - include(${HIP_COMMON_DIR}/tests/Tests.cmake) - else() - message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location") - endif() - endif() - endif() - - ############################# # Code analysis ############################# # Target: clang --- 485,490 ----
-
-
hip-runtime-amd/vector_oob.patch (deleted)
-
@@ -1,29 +0,0 @@--- ROCclr-rocm-4.5.0/device/rocm/rocblit.cpp 2021-11-25 22:38:12.837707706 +0100 +++ ROCclr-rocm-4.5.0/device/rocm/rocblit.cpp 2021-11-25 22:40:00.699796341 +0100 @@ -460,7 +460,7 @@ std::this_thread::get_id(), (wait_events.size() != 0) ? wait_events[0].handle : 0, active.handle); hsa_status_t status = hsa_amd_memory_async_copy_rect(&dstMem, &offset, - &srcMem, &offset, &dim, agent, direction, wait_events.size(), &wait_events[0], active); + &srcMem, &offset, &dim, agent, direction, wait_events.size(), wait_events.data(), active); if (status != HSA_STATUS_SUCCESS) { gpu().Barriers().ResetCurrentSignal(); LogPrintfError("DMA buffer failed with code %d", status); @@ -484,7 +484,7 @@ hsa_status_t status = hsa_amd_memory_async_copy( (reinterpret_cast<address>(dst) + dstOffset), dstAgent, (reinterpret_cast<const_address>(src) + srcOffset), srcAgent, - size[0], wait_events.size(), &wait_events[0], active); + size[0], wait_events.size(), wait_events.data(), active); if (status != HSA_STATUS_SUCCESS) { gpu().Barriers().ResetCurrentSignal(); LogPrintfError("DMA buffer failed with code %d", status); @@ -671,7 +671,7 @@ active.handle); status = hsa_amd_memory_async_copy(dst, dstAgent, src, srcAgent, - size[0], wait_events.size(), &wait_events[0], active); + size[0], wait_events.size(), wait_events.data(), active); if (status == HSA_STATUS_SUCCESS) { gpu().addSystemScope(); } else {
-