upgpkg: hip-nvcc 4.1.0-1

upstream release

new release

3 files changed, 11 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c582a4089d6c..10ad7d0e05ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
 pkgbase = hip-nvcc
 	pkgdesc = Heterogeneous Interface for Portability ROCm
-	pkgver = 4.0.0
+	pkgver = 4.1.0
 	pkgrel = 1
 	url = https://github.com/ROCm-Developer-Tools/HIP
 	arch = x86_64
 	license = MIT
 	makedepends = libelf
 	makedepends = cmake
+	makedepends = git
 	depends = cuda
 	depends = llvm-amdgpu
 	provides = hip
 	conflicts = hip
-	source = hip-nvcc-4.0.0.tar.gz::https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-4.0.0.tar.gz
-	source = hipinfo.patch
-	sha256sums = d7b78d96cec67c55b74ea3811ce861b16d300410bc687d0629e82392e8d7c857
-	sha256sums = bddced0c770848aaa44514986fed3fe1c01699dffe41d11767a5014f0ebfa69f
+	source = hip-nvcc-4.1.0.tar.gz::https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-4.1.0.tar.gz
+	sha256sums = e21c10b62868ece7aa3c8413ec0921245612d16d86d81fe61797bf9a64bc37eb
 
 pkgname = hip-nvcc
-
diff --git a/PKGBUILD b/PKGBUILD
index 9831faaca3d5..4356416985c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,24 @@
-# Maintainer: acxz <akashpatel2008 at yahoo dot com>
+# Maintainer: Torsten Keßler <t dot kessler at posteo dot de>
+# Contributor: acxz <akashpatel2008 at yahoo dot com>
 pkgname=hip-nvcc
-pkgver=4.0.0
+pkgver=4.1.0
 pkgrel=1
 pkgdesc="Heterogeneous Interface for Portability ROCm"
 arch=('x86_64')
 url="https://github.com/ROCm-Developer-Tools/HIP"
 license=('MIT')
-makedepends=('libelf' 'cmake')
+makedepends=('libelf' 'cmake' 'git')
 depends=('cuda' 'llvm-amdgpu')
 provides=('hip')
 conflicts=('hip')
 _git='https://github.com/ROCm-Developer-Tools/HIP'
-source=("$pkgname-$pkgver.tar.gz::$_git/archive/rocm-$pkgver.tar.gz"
-        "hipinfo.patch")
-sha256sums=('d7b78d96cec67c55b74ea3811ce861b16d300410bc687d0629e82392e8d7c857'
-            'bddced0c770848aaa44514986fed3fe1c01699dffe41d11767a5014f0ebfa69f')
-
-prepare() {
-  cd "${srcdir}/HIP-rocm-$pkgver"
-  patch --forward --strip=1 --input="${srcdir}/hipinfo.patch"
-}
+source=("$pkgname-$pkgver.tar.gz::$_git/archive/rocm-$pkgver.tar.gz")
+sha256sums=('e21c10b62868ece7aa3c8413ec0921245612d16d86d81fe61797bf9a64bc37eb')
 
 build() {
   cmake -B build -Wno-dev \
         -DCMAKE_INSTALL_PREFIX=/opt/rocm/hip \
-        -DHIP_PLATFORM=nvcc \
+        -DHIP_PLATFORM=nvidia \
         -DHIP_COMPILER=clang \
         "$srcdir/HIP-rocm-$pkgver"
   make -C build
diff --git a/hipinfo.patch b/hipinfo.patch
deleted file mode 100644
index 1f3a280008f9..000000000000
--- a/hipinfo.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --unified --recursive --text HIP-rocm-3.9.0/bin/hipconfig HIP-rocm-3.9.0.new/bin/hipconfig
---- HIP-rocm-3.9.0/bin/hipconfig	2020-10-13 02:42:39.000000000 -0400
-+++ HIP-rocm-3.9.0.new/bin/hipconfig	2020-11-02 17:13:56.119076102 -0500
-@@ -98,12 +98,12 @@
-     $HIP_INFO_PATH= "$HIP_PATH/lib/.hipInfo"; # use actual file
- }
- #---
--#HIP_PLATFORM controls whether to use NVCC or HCC for compilation:
--$HIP_PLATFORM=$ENV{'HIP_PLATFORM'};
- # Read .hipInfo
- my %hipInfo = ();
- parse_config_file("$HIP_INFO_PATH", \%hipInfo);
- # Prioritize Env first, otherwise use the hipInfo config file
-+#HIP_PLATFORM controls whether to use NVCC or HCC for compilation:
-+$HIP_PLATFORM = $ENV{'HIP_PLATFORM'} // $hipInfo{'HIP_PLATFORM'} // "hcc";
- $HIP_COMPILER = $ENV{'HIP_COMPILER'} // $hipInfo{'HIP_COMPILER'} // "hcc";
- $HIP_RUNTIME = $ENV{'HIP_RUNTIME'} // $hipInfo{'HIP_RUNTIME'} // "HCC";
- 
-diff --unified --recursive --text HIP-rocm-3.9.0/CMakeLists.txt HIP-rocm-3.9.0.new/CMakeLists.txt
---- HIP-rocm-3.9.0/CMakeLists.txt	2020-10-13 02:42:39.000000000 -0400
-+++ HIP-rocm-3.9.0.new/CMakeLists.txt	2020-11-02 17:12:49.638464570 -0500
-@@ -138,6 +138,7 @@
-     endif()
- endif()
- message(STATUS "HIP Platform: " ${HIP_PLATFORM})
-+add_to_config(_buildInfo HIP_PLATFORM)
- 
- # Determine HIP_COMPILER
- # Either hcc or clang; default is hcc
-@@ -332,7 +333,6 @@
- 
-     include_directories(${PROJECT_SOURCE_DIR}/include)
-     add_subdirectory(rocclr)
--    file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo})
- 
- 
- # set(ROCclr_CXX_FLAGS  "-hc -fno-gpu-rdc --amdgpu-target=gfx803 --amdgpu-target=gfx900 --amdgpu-target=gfx906 --amdgpu-target=gfx908 ")
-@@ -436,14 +436,14 @@
-     else()
-         target_link_libraries(device INTERFACE host)
-     endif()
--
--    # Generate .hipInfo
--    file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo})
- endif()
- 
- if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "rocclr")
-     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lpl_ca)
- endif()
-+# Generate .hipInfo
-+file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo})
-+
- # Generate .hipVersion
- file(WRITE "${PROJECT_BINARY_DIR}/.hipVersion" ${_versionInfo})
- 
-@@ -482,9 +482,7 @@
- endif()
- 
- # Install .hipInfo
--if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "rocclr")
--    install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib)
--endif()
-+install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib)
- 
- # Install .hipVersion
- install(FILES ${PROJECT_BINARY_DIR}/.hipVersion DESTINATION bin)