hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ROCm 5.3.0 updates (#33320)

Browse source 
* ROCm 5.3.0 updates
* New patches for 5.3.0 on hip and hsakmt
* Adding additional build arguments in hip and llvm
* RVS updates for 5.3.0 release
* New patches and rocm-tensile, rocprofiler-dev, roctracer-dev recipe updates for 5.3.0
* Reverting OPENMP fix from rocm-tensile
* Removing the patch to compile without git and adding witout it
* Install library in to lib directory instead of lib64 across all platform
* Setting lib install directory to lib
* Disable gallivm coroutine for libllvm15
* Update llvm-amdgpu prefix path in hip-config.cmake.in
  Removing libllvm15 from Mesa dependency removing
* hip-config.cmake.in update required from 5.2
* hip-config.cmake.in update required from 5.2 and above
* hip-config.cmake.in update required for all 5.2 release above
* Style check correction in hip update
* ginkgo: add missing include
* Patching hsa include path for rocm 5.3
* Restricting patch for llvm-15
* Style check error correction
* PIC flag required for the new test applications
* Passing -DCMAKE_POSITION_INDEPENDENT_CODE=ON in the cmake_args instead of setting -fPIC in CFLAGS

Co-authored-by: Cordell Bloor <Cordell.Bloor@amd.com>
This commit is contained in:
renjithravindrankannath 2022-12-12 11:46:20 -08:00 committed by GitHub
parent fcc2ab8b4b
commit 0578ccc0e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 867 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
var/spack/repos/builtin/packages/atmi/package.py
View file

@ -15,11 +15,12 @@ class Atmi(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/atmi"
git = "https://github.com/RadeonOpenCompute/atmi.git"
url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-5.2.0.tar.gz"
url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
version("5.3.0", sha256="dffc0eb0bc1617843e7f728dbd6c8b12326c5c8baa34369aa267aab40f5deb6a")
version("5.2.3", sha256="5f66c59e668cf968e86b556a0a52ee0202d1b370d8406e291a874cbfd200ee17")
version("5.2.1", sha256="6b33445aa67444c038cd756f855a58a72dd35db57e7b63da37fe78a8585b982b")
version("5.2.0", sha256="33e77905a607734157d46c736c924c7c50b6b13f2b2ddbf711cb08e37f2efa4f")
@ -126,6 +127,7 @@ class Atmi(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("comgr@" + ver, type="link", when="@" + ver)
depends_on("hsa-rocr-dev@" + ver, type="link", when="@" + ver)

4
var/spack/repos/builtin/packages/comgr/package.py
View file

@ -14,7 +14,7 @@ class Comgr(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
git = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport.git"
url = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath", "haampie"]
@ -22,6 +22,7 @@ class Comgr(CMakePackage):
version("master", branch="amd-stg-open")
version("5.3.0", sha256="072f849d79476d87d31d62b962e368762368d540a9da02ee2675963dc4942b2c")
version("5.2.3", sha256="36d67dbe791d08ad0a02f0f3aedd46059848a0a232c5f999670103b0410c89dc")
version("5.2.1", sha256="ebeaea8e653fc2b9d67d3271be44690ac7876ee679baa01d47863e75362b8c85")
version("5.2.0", sha256="5f63fa93739ee9230756ef93c53019474b6cdddea3b588492d785dae1b08c087")
@ -138,6 +139,7 @@ class Comgr(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
"master",
]:
# llvm libs are linked statically, so this *could* be a build dep

3
var/spack/repos/builtin/packages/ginkgo/package.py
View file

@ -87,6 +87,9 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage):
patch("1.4.0_dpcpp_use_old_standard.patch", when="+oneapi @master")
patch("1.4.0_dpcpp_use_old_standard.patch", when="+oneapi @1.4.0")
# Add missing include statement
patch("thrust-count-header.patch", when="+rocm @1.5.0:")
def setup_build_environment(self, env):
spec = self.spec
if "+oneapi" in spec:

12
var/spack/repos/builtin/packages/ginkgo/thrust-count-header.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/hip/distributed/partition_kernels.hip.cpp b/hip/distributed/partition_kernels.hip.cpp
index 94d167a00..9422b70d8 100644
--- a/hip/distributed/partition_kernels.hip.cpp
+++ b/hip/distributed/partition_kernels.hip.cpp
@@ -33,6 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "core/distributed/partition_kernels.hpp"
+#include <thrust/count.h>
#include <thrust/device_ptr.h>
#include <thrust/execution_policy.h>
#include <thrust/iterator/zip_iterator.h>

3
var/spack/repos/builtin/packages/hip-rocclr/package.py
View file

@ -27,6 +27,7 @@ def url_for_version(self, version):
return url.format(version)
version("master", branch="main")
version("5.3.0", sha256="2bf14116b5e2270928265f5d417b3d0f0f2e13cbc8ec5eb8c80d4d4a58ff7e94")
version("5.2.3", sha256="0493c414d4db1af8e1eb30a651d9512044644244488ebb13478c2138a7612998")
version("5.2.1", sha256="465ca9fa16869cd89dab8c2d66d9b9e3c14f744bbedaa1d215b0746d77a500ba")
version("5.2.0", sha256="37f5fce04348183bce2ece8bac1117f6ef7e710ca68371ff82ab08e93368bafb")
@ -135,6 +136,7 @@ def url_for_version(self, version):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
"master",
]:
depends_on("hsakmt-roct@" + ver, when="@" + ver)
@ -157,6 +159,7 @@ def url_for_version(self, version):
# Add opencl sources thru the below
for d_version, d_shasum in [
("5.3.0", "d251e2efe95dc12f536ce119b2587bed64bbda013969fa72be58062788044a9e"),
("5.2.3", "932ea3cd268410010c0830d977a30ef9c14b8c37617d3572a062b5d4595e2b94"),
("5.2.1", "eb4ff433f8894ca659802f81792646034f8088b47aca6ad999292bcb8d6381d5"),
("5.2.0", "80f73387effdcd987a150978775a87049a976aa74f5770d4420847b004dd59f0"),

39
var/spack/repos/builtin/packages/hip/0013-remove-compiler-rt-linkage-for-host.5.3.0.patch Normal file
View file

@ -0,0 +1,39 @@
From 2eb146f180cd6ff35685ac23f79da4fe16dd295b Mon Sep 17 00:00:00 2001
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
Date: Fri, 21 Oct 2022 14:02:37 -0700
Subject: [PATCH] New patch removing the fix for the compilation without git
---
bin/hipcc.pl | 3 ++-
hipamd/hip-config.cmake.in | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/hipcc.pl b/bin/hipcc.pl
index 645ae62..d3cf824 100755
--- a/bin/hipcc.pl
+++ b/bin/hipcc.pl
@@ -612,7 +612,8 @@ if($HIP_PLATFORM eq "amd"){
$targetsStr = $ENV{HCC_AMDGPU_TARGET};
} elsif (not $isWindows) {
# Else try using rocm_agent_enumerator
- $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator";
+ $ROCMINFO_PATH = $ENV{'ROCMINFO_PATH'} // $ROCM_PATH;
+ $ROCM_AGENT_ENUM = "${ROCMINFO_PATH}/bin/rocm_agent_enumerator";
$targetsStr = `${ROCM_AGENT_ENUM} -t GPU`;
$targetsStr =~ s/\n/,/g;
}
diff --git a/hipamd/hip-config.cmake.in b/hipamd/hip-config.cmake.in
index 89d1224..8c4f9b7 100755
--- a/hipamd/hip-config.cmake.in
+++ b/hipamd/hip-config.cmake.in
@@ -306,7 +306,6 @@ if(HIP_COMPILER STREQUAL "clang")
if(NOT CLANGRT_BUILTINS)
message(FATAL_ERROR "clangrt builtins lib not found")
else()
- set_property(TARGET hip::host APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}")
set_property(TARGET hip::device APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}")
endif()
endif()
--
2.22.0

22
var/spack/repos/builtin/packages/hip/package.py
View file

@ -18,7 +18,7 @@ class Hip(CMakePackage):
homepage = "https://github.com/ROCm-Developer-Tools/HIP"
git = "https://github.com/ROCm-Developer-Tools/HIP.git"
url = "https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.2.0.tar.gz"
url = "https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath", "haampie"]
@ -26,6 +26,7 @@ class Hip(CMakePackage):
version("master", branch="master")
version("5.3.0", sha256="05225832fb5a4d24f49a773ac27e315239943a6f24291a50d184e2913f2cdbe0")
version("5.2.3", sha256="5b83d1513ea4003bfad5fe8fa741434104e3e49a87e1d7fad49e5a8c1d06e57b")
version("5.2.1", sha256="7d4686a2f8a9124bb21f7f3958e451c57019f48a0cbb42ffdc56ed02860a46c3")
version("5.2.0", sha256="a6e0515d4d25865c037b546035df9c51f0882cd2700e759c266ff7e199f37c3a")
@ -147,6 +148,7 @@ class Hip(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hsakmt-roct@" + ver, when="@" + ver)
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
@ -165,6 +167,7 @@ class Hip(CMakePackage):
# Add hip-amd sources thru the below
for d_version, d_shasum in [
("5.3.0", "81e9bd5209a7b400c986f9bf1d7079bcf7169bbcb06fc4fe843644559a4d612e"),
("5.2.3", "5031d07554ce07620e24e44d482cbc269fa972e3e35377e935d2694061ff7c04"),
("5.2.1", "4feaa3883cbc54ddcd5d2d5becbe0f3fe3edd5b3b468dc73b5104893029eefac"),
("5.2.0", "8774958bebc29a4b7eb9dc2d38808d79d9a24bf9c1f44e801ff99d2d5ba82240"),
@ -188,6 +191,7 @@ class Hip(CMakePackage):
)
# Add opencl sources thru the below
for d_version, d_shasum in [
("5.3.0", "d251e2efe95dc12f536ce119b2587bed64bbda013969fa72be58062788044a9e"),
("5.2.3", "932ea3cd268410010c0830d977a30ef9c14b8c37617d3572a062b5d4595e2b94"),
("5.2.1", "eb4ff433f8894ca659802f81792646034f8088b47aca6ad999292bcb8d6381d5"),
("5.2.0", "80f73387effdcd987a150978775a87049a976aa74f5770d4420847b004dd59f0"),
@ -210,6 +214,7 @@ class Hip(CMakePackage):
when="@{0}".format(d_version),
)
for d_version, d_shasum in [
("5.3.0", "2bf14116b5e2270928265f5d417b3d0f0f2e13cbc8ec5eb8c80d4d4a58ff7e94"),
("5.2.3", "0493c414d4db1af8e1eb30a651d9512044644244488ebb13478c2138a7612998"),
("5.2.1", "465ca9fa16869cd89dab8c2d66d9b9e3c14f744bbedaa1d215b0746d77a500ba"),
("5.2.0", "37f5fce04348183bce2ece8bac1117f6ef7e710ca68371ff82ab08e93368bafb"),
@ -260,7 +265,11 @@ class Hip(CMakePackage):
patch(
"0012-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host"
".5.2.1.patch",
when="@5.2.1:",
when="@5.2.1:5.2.3",
)
patch(
"0013-remove-compiler-rt-linkage-for-host.5.3.0.patch",
when="@5.3.0:",
)
# See https://github.com/ROCm-Developer-Tools/HIP/pull/2141
@ -463,6 +472,13 @@ def patch(self):
"hip-config.cmake.in",
string=True,
)
if self.spec.satisfies("@5.2:"):
filter_file(
'"${ROCM_PATH}/llvm"',
self.spec["llvm-amdgpu"].prefix,
"hipamd/hip-config.cmake.in",
string=True,
)
perl = self.spec["perl"].command
kwargs = {"ignore_absent": False, "backup": False, "string": False}
@ -538,5 +554,7 @@ def cmake_args(self):
args.append(self.define("HIP_CATCH_TEST", "OFF"))
args.append(self.define("ROCCLR_PATH", self.stage.source_path + "/rocclr"))
args.append(self.define("AMD_OPENCL_PATH", self.stage.source_path + "/opencl"))
if "@5.3.0:" in self.spec:
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
return args

6
var/spack/repos/builtin/packages/hipblas/package.py
View file

@ -14,7 +14,7 @@ class Hipblas(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/hipBLAS"
git = "https://github.com/ROCmSoftwarePlatform/hipBLAS.git"
url = "https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath", "haampie"]
@ -23,6 +23,7 @@ class Hipblas(CMakePackage):
version("develop", branch="develop")
version("master", branch="master")
version("5.3.0", sha256="873d55749479873994679840906c4257316dfb09a6200411204ad4a8c2480565")
version("5.2.3", sha256="4d66db9b000b6207b5270d90556b724bfdb08ebbfcc675f014287e0be7ee6344")
version("5.2.1", sha256="ccae36b118b7a1eb4b2f7d65fb163f54ab9c5cf774dbe2ec60971d4f78ae8308")
version("5.2.0", sha256="5e9091dc4ef83896f5c3bc5ade1cb5db8e1a6afc451dbba4da19d8a7ec2b6f29")
@ -149,6 +150,7 @@ def check(self):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("rocsolver@" + ver, when="@" + ver)
@ -185,6 +187,8 @@ def cmake_args(self):
args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake))
elif self.spec.satisfies("@5.2.0:"):
args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True))
if self.spec.satisfies("@5.3.0:"):
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
return args

4
var/spack/repos/builtin/packages/hipcub/package.py
View file

@ -11,11 +11,12 @@ class Hipcub(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB"
git = "https://github.com/ROCmSoftwarePlatform/hipCUB.git"
url = "https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
version("5.3.0", sha256="4016cfc240b3cc1a97b549ecc4a5b76369610d46247661834630846391e5fad2")
version("5.2.3", sha256="cab929f10c649f8fd76df989a16d0cd9301bc6aaad91cd2f84498c831378d559")
version("5.2.1", sha256="07b34d8cdf885838dde264c2a70044505e7b9632cb6efbdb52e2569f95112970")
version("5.2.0", sha256="ac4dc2310f0eb657e1337c93d8cc4a5d8396f9544a7336eeceb455678a1f9139")
@ -123,6 +124,7 @@ class Hipcub(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("rocprim@" + ver, when="@" + ver)

4
var/spack/repos/builtin/packages/hipfort/package.py
View file

@ -11,11 +11,12 @@ class Hipfort(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/hipfort"
git = "https://github.com/ROCmSoftwarePlatform/hipfort.git"
url = "https://github.com/ROCmSoftwarePlatform/hipfort/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/hipfort/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath"]
version("5.3.0", sha256="9e2aa142de45b2d2c29449d6f82293fb62844d511fbf51fa597845ba05c700fa")
version("5.2.3", sha256="6648350ca4edc8757f0ae51d73a05a9a536808f19ad45f5b5ab84d420c72c9ec")
version("5.2.1", sha256="ed53c9914d326124482751b81c4a353c6e64e87c1111124169a33513a3c49b42")
version("5.2.0", sha256="a0af1fe62757993600a41af6bb6c4b8c6cfdfba650389645ac1f995f7623785c")
@ -111,6 +112,7 @@ class Hipfort(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, type="build", when="@" + ver)

4
var/spack/repos/builtin/packages/hipify-clang/package.py
View file

@ -12,13 +12,14 @@ class HipifyClang(CMakePackage):
homepage = "https://github.com/ROCm-Developer-Tools/HIPIFY"
git = "https://github.com/ROCm-Developer-Tools/HIPIFY.git"
url = "https://github.com/ROCm-Developer-Tools/HIPIFY/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCm-Developer-Tools/HIPIFY/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
version("master", branch="master")
version("5.3.0", sha256="7674900d2b9319d91fa8f469252c5acb5bedf339142417cdcb64f33ee8482e00")
version("5.2.3", sha256="1314a37ab544b68fd51858b77d2d4b30ecff82ef3f90de6e80891a95f6749849")
version("5.2.1", sha256="4d658d00b219f7ef40e832da3680852aeb4c258c0a114f1779fa4cda99ee23b1")
version("5.2.0", sha256="dcd5f44daceb984bb654a209e78debf81e1cdeaf9202444a1e110b45ad6c3f4f")
@ -127,6 +128,7 @@ class HipifyClang(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
"master",
]:
depends_on("llvm-amdgpu@" + ver, when="@" + ver)

7
var/spack/repos/builtin/packages/hipsparse/package.py
View file

@ -14,12 +14,13 @@ class Hipsparse(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE"
git = "https://github.com/ROCmSoftwarePlatform/hipSPARSE.git"
url = "https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath", "haampie"]
libraries = ["libhipsparse"]
version("5.3.0", sha256="691b32b916952ed9af008aa29f60cc190322b73cfc098bb2eda3ff68c89c7b35")
version("5.2.3", sha256="f70d3deff13188adc4105ef3ead53510e4b54075b9ffcfe3d3355d90d4b6eadd")
version("5.2.1", sha256="7b8e4ff264285ae5aabb3c5c2b38bf28f90b2af44efb0398fcf13ffc24bc000a")
version("5.2.0", sha256="4fdab6ec953c6d2d000687c5979077deafd37208cd722554b5a6ede1e5ba170c")
@ -126,6 +127,7 @@ class Hipsparse(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
depends_on("hip@" + ver, when="@" + ver)
@ -148,6 +150,7 @@ class Hipsparse(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("rocprim@" + ver, when="@" + ver)
@ -180,6 +183,8 @@ def cmake_args(self):
args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake))
elif self.spec.satisfies("@5.2.0:"):
args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True))
if self.spec.satisfies("@5.3.0:"):
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
return args
def setup_build_environment(self, env):

15
var/spack/repos/builtin/packages/hpctoolkit/package.py
View file

@ -166,6 +166,21 @@ class Hpctoolkit(AutotoolsPackage):
flag_handler = AutotoolsPackage.build_system_flags
def patch(self):
if self.spec.satisfies("^hip@5.3.0:"):
filter_file(
'ROCM_HSA_IFLAGS="-I$ROCM_HSA/include/hsa"',
'ROCM_HSA_IFLAGS="-I$ROCM_HSA/include"',
"configure",
string=True,
)
filter_file(
"#include <hsa.h>",
"#include <hsa/hsa.h>",
"src/tool/hpcrun/gpu/amd/roctracer-api.c",
string=True,
)
def configure_args(self):
spec = self.spec

6
var/spack/repos/builtin/packages/hsa-rocr-dev/package.py
View file

@ -17,14 +17,14 @@ class HsaRocrDev(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"
git = "https://github.com/RadeonOpenCompute/ROCR-Runtime.git"
url = "https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath", "haampie"]
libraries = ["libhsa-runtime64"]
version("master", branch="master")
version("5.3.0", sha256="b51dbedbe73390e0be748b92158839c82d7fa0e514fede60aa7696dc498facf0")
version("5.2.3", sha256="978de85d3455207bb82bef2254a4624e9116b1258a8c164d7a7e21a644eff12f")
version("5.2.1", sha256="448a7409bdc6618332a42b9503122996f26b91768140b710ba99bff8a8c03dd9")
version("5.2.0", sha256="529e49693dd9f6459586dd0a26f14dd77dbdf8c0b45fb54830b294eba7babd27")
@ -111,6 +111,7 @@ class HsaRocrDev(CMakePackage):
variant("image", default=True, description="build with or without image support")
depends_on("cmake@3:", type="build")
depends_on("pkgconfig", type="build", when="@5.3.0:")
# Note, technically only necessary when='@3.7: +image', but added to all
# to work around https://github.com/spack/spack/issues/23951
@ -137,6 +138,7 @@ class HsaRocrDev(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
"master",
]:
depends_on("hsakmt-roct@" + ver, when="@" + ver)

28
var/spack/repos/builtin/packages/hsakmt-roct/0002-Remove-compiler-support-libraries-and-libudev-as-req-5.3.patch Normal file
View file

@ -0,0 +1,28 @@
From 9763a6410f21fa2e2a09eb00c23fc18009d084fb Mon Sep 17 00:00:00 2001
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
Date: Tue, 4 Oct 2022 17:55:57 -0700
Subject: [PATCH] Remove compiler support libraries as required in 5.3
---
CMakeLists.txt | 5 -----
1 file changed, 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d00248e..14addb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,11 +187,6 @@ target_link_libraries ( ${HSAKMT_TARGET}
)
target_compile_options(${HSAKMT_TARGET} PRIVATE ${DRM_CFLAGS} ${HSAKMT_C_FLAGS})
-if(NOT DISTRO_ID MATCHES "ubuntu")
- find_library(LIBGCC NAMES libgcc_s.so.1 REQUIRED)
- message(STATUS "LIBGCC:" ${LIBGCC})
- target_link_libraries( ${HSAKMT_TARGET} PRIVATE ${LIBGCC} )
-endif()
## Define default paths and packages.
if( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT )
--
2.25.1

6
var/spack/repos/builtin/packages/hsakmt-roct/package.py
View file

@ -14,12 +14,13 @@ class HsakmtRoct(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
git = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface.git"
url = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.2.0.tar.gz"
url = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "arjun-raj-kuppala", "renjithravindrankannath"]
version("master", branch="master")
version("5.3.0", sha256="c150be3958fd46e57bfc9db187819ec34b1db8f0cf9b69f8c3f8915001800ab8")
version("5.2.3", sha256="8d313b8fd945a8d7248c00a2de9a2ee896fe77e464430a91b63400a986ec0bf0")
version("5.2.1", sha256="13c4a6748c4ae70f87869f10fda101d67c9dbaecf040687f7f5d9bb8b6d0506c")
version("5.2.0", sha256="3797cb0eafbec3fd3d4a2b53f789eb8cdbab30729f13dbcca0a10bc1bafd2187")
@ -111,7 +112,8 @@ class HsakmtRoct(CMakePackage):
# See https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/issues/72
# and https://github.com/spack/spack/issues/28398
patch("0001-Remove-compiler-support-libraries-and-libudev-as-req.patch", when="@4.5.0:")
patch("0001-Remove-compiler-support-libraries-and-libudev-as-req.patch", when="@4.5.0:5.2")
patch("0002-Remove-compiler-support-libraries-and-libudev-as-req-5.3.patch", when="@5.3.0:")
@property
def install_targets(self):

15
var/spack/repos/builtin/packages/llvm-amdgpu/package.py
View file

@ -15,13 +15,13 @@ class LlvmAmdgpu(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/llvm-project"
git = "https://github.com/RadeonOpenCompute/llvm-project.git"
url = "https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath", "haampie"]
version("master", branch="amd-stg-open")
version("5.3.0", sha256="4e3fcddb5b8ea8dcaa4417e0e31a9c2bbdc9e7d4ac3401635a636df32905c93e")
version("5.2.3", sha256="1b852711aec3137b568fb65f93606d37fdcd62e06f5da3766f2ffcd4e0c646df")
version("5.2.1", sha256="3644e927d943d61e22672422591c47a62ff83e3d87ced68439822156d8f79abf")
version("5.2.0", sha256="0f892174111b78a02d1a00f8f46d9f80b9abb95513a7af38ecf2a5a0882fe87f")
@ -128,7 +128,8 @@ class LlvmAmdgpu(CMakePackage):
provides("libllvm@11", when="@3.5:3.8")
provides("libllvm@12", when="@3.9:4.2")
provides("libllvm@13", when="@4.3:4.9")
provides("libllvm@14", when="@5:")
provides("libllvm@14", when="@5:5.2")
provides("libllvm@15", when="@5.3:")
depends_on("cmake@3.4.3:", type="build", when="@:3.8")
depends_on("cmake@3.13.4:", type="build", when="@3.9.0:")
@ -163,6 +164,7 @@ class LlvmAmdgpu(CMakePackage):
# Add device libs sources so they can be an external LLVM project
for d_version, d_shasum in [
("5.3.0", "f7e1665a1650d3d0481bec68252e8a5e68adc2c867c63c570f6190a1d2fe735c"),
("5.2.3", "16b7fc7db4759bd6fb54852e9855fa16ead76c97871d7e1e9392e846381d611a"),
("5.2.1", "e5855387ce73ed483ed0d03dbfef31f297c6ca66cf816f6816fd5ee373fc8225"),
("5.2.0", "901674bc941115c72f82c5def61d42f2bebee687aefd30a460905996f838e16c"),
@ -231,7 +233,9 @@ def cmake_args(self):
if self.spec.satisfies("@5.0.0:"):
args.append(self.define("CLANG_ENABLE_AMDCLANG", "ON"))
if self.spec.satisfies("@5.3.0:"):
args.append(self.define("LLVM_TARGETS_TO_BUILD", "AMDGPU;X86"))
args.append(self.define("LLLVM_AMDGPU_ALLOW_NPI_TARGETS", True))
# Enable rocm-device-libs as a external project
if "+rocm-device-libs" in self.spec:
dir = os.path.join(self.stage.source_path, "rocm-device-libs")
@ -247,6 +251,7 @@ def cmake_args(self):
if "+link_llvm_dylib" in self.spec:
args.append("-DLLVM_LINK_LLVM_DYLIB:Bool=ON")
args.append("-DDCLANG_LINK_CLANG_DYLIB:Bool=ON")
# Get the GCC prefix for LLVM.
if self.compiler.name == "gcc":
@ -258,7 +263,7 @@ def cmake_args(self):
def post_install(self):
# TODO:Enabling LLVM_ENABLE_RUNTIMES for libcxx,libcxxabi did not build.
# bootstraping the libcxx with the just built clang
if self.spec.satisfies("@4.5.0:"):
if self.spec.satisfies("@4.5.0:5.2"):
spec = self.spec
define = self.define
libcxxdir = "build-bootstrapped-libcxx"

77
var/spack/repos/builtin/packages/mesa/disable-gallivm-coroutine-for-libllvm15.patch Normal file
View file

@ -0,0 +1,77 @@
From 0ff8ee6678a74f243c6c2b9a24a80fb7458f3da8 Mon Sep 17 00:00:00 2001
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
Date: Tue, 8 Nov 2022 17:19:51 -0800
Subject: [PATCH] disable gallivm for libllvm15
---
src/gallium/auxiliary/gallivm/lp_bld.h | 51 +++++++++++++++++++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld.h b/src/gallium/auxiliary/gallivm/lp_bld.h
index 9144428..e1f6200 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld.h
@@ -81,10 +81,59 @@
#define LLVMInsertBasicBlock ILLEGAL_LLVM_FUNCTION
#define LLVMCreateBuilder ILLEGAL_LLVM_FUNCTION
-#if LLVM_VERSION_MAJOR >= 8
+#if LLVM_VERSION_MAJOR >= 15
+#define GALLIVM_HAVE_CORO 0
+#define GALLIVM_USE_NEW_PASS 1
+#elif LLVM_VERSION_MAJOR >= 8
#define GALLIVM_HAVE_CORO 1
+#define GALLIVM_USE_NEW_PASS 0
#else
#define GALLIVM_HAVE_CORO 0
+#define GALLIVM_USE_NEW_PASS 0
#endif
+#define GALLIVM_COROUTINES (GALLIVM_HAVE_CORO || GALLIVM_USE_NEW_PASS)
+
+/* LLVM is transitioning to "opaque pointers", and as such deprecates
+ * LLVMBuildGEP, LLVMBuildCall, LLVMBuildLoad, replacing them with
+ * LLVMBuildGEP2, LLVMBuildCall2, LLVMBuildLoad2 respectivelly.
+ * These new functions were added in LLVM 8.0; so for LLVM before 8.0 we
+ * simply forward to the non-opaque-pointer variants.
+ */
+#if LLVM_VERSION_MAJOR < 8
+
+static inline LLVMValueRef
+LLVMBuildGEP2(LLVMBuilderRef B, LLVMTypeRef Ty,
+ LLVMValueRef Pointer, LLVMValueRef *Indices,
+ unsigned NumIndices, const char *Name)
+{
+ return LLVMBuildGEP(B, Pointer, Indices, NumIndices, Name);
+}
+
+static inline LLVMValueRef
+LLVMBuildInBoundsGEP2(LLVMBuilderRef B, LLVMTypeRef Ty,
+ LLVMValueRef Pointer, LLVMValueRef *Indices,
+ unsigned NumIndices, const char *Name)
+{
+ return LLVMBuildInBoundsGEP(B, Pointer, Indices, NumIndices, Name);
+}
+
+static inline LLVMValueRef
+LLVMBuildLoad2(LLVMBuilderRef B, LLVMTypeRef Ty,
+ LLVMValueRef PointerVal, const char *Name)
+{
+ LLVMValueRef val = LLVMBuildLoad(B, PointerVal, Name);
+ return LLVMTypeOf(val) == Ty ? val : LLVMBuildBitCast(B, val, Ty, Name);
+}
+
+static inline LLVMValueRef
+LLVMBuildCall2(LLVMBuilderRef B, LLVMTypeRef Ty, LLVMValueRef Fn,
+ LLVMValueRef *Args, unsigned NumArgs,
+ const char *Name)
+{
+ return LLVMBuildCall(B, Fn, Args, NumArgs, Name);
+}
+
+#endif /* LLVM_VERSION_MAJOR < 8 */
+
#endif /* LP_BLD_H */
--
2.25.1

5
var/spack/repos/builtin/packages/mesa/package.py
View file

@ -148,6 +148,11 @@ class Mesa(MesonPackage):
# the existence of the function and call it only if it is available.
patch("handle_missing_set_override_stack_alignment.patch", when="@21.2.3:")
# ROCm 5.3.0 is providing llvm15. Gallivm coroutine is disabled in mesa upstream version
# for llvm-15. Until mesa release is available with this changes below patch is required
# in order to move on with ROCm 5.3.0.
patch("disable-gallivm-coroutine-for-libllvm15.patch", when="@22.1.2: ^libllvm@15:")
# Explicitly use the llvm-config tool
def patch(self):
filter_file(r"_llvm_method = 'auto'", "_llvm_method = 'config-tool'", "meson.build")

18
var/spack/repos/builtin/packages/rccl/package.py
View file

@ -16,12 +16,13 @@ class Rccl(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/rccl"
git = "https://github.com/ROCmSoftwarePlatform/rccl.git"
url = "https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
libraries = ["librccl"]
version("5.3.0", sha256="51da5099fa58c2be882319cebe9ceabe2062feebcc0c5849e8c109030882c10a")
version("5.2.3", sha256="ecba09f4c95b4b2dae81b88231a972ac956d29909b5e712e21cf2a74bd251ff4")
version("5.2.1", sha256="cfd17dc003f19900e44928d81111570d3720d4905321f2a18c909909c4bee822")
version("5.2.0", sha256="6ee3a04da0d16eb53f768a088633a7d8ecc4416a2d0c07f7ba8426ab7892b060")
@ -133,6 +134,7 @@ class Rccl(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
depends_on("hip@" + ver, when="@" + ver)
@ -158,9 +160,21 @@ class Rccl(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("numactl@2:", when="@" + ver)
for ver in ["4.5.0", "4.5.2", "5.0.0", "5.0.2", "5.1.0", "5.1.3", "5.2.0", "5.2.1", "5.2.3"]:
for ver in [
"4.5.0",
"4.5.2",
"5.0.0",
"5.0.2",
"5.1.0",
"5.1.3",
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("rocm-smi-lib@" + ver, when="@" + ver)
@classmethod

10
var/spack/repos/builtin/packages/rocalution/package.py
View file

@ -18,12 +18,13 @@ class Rocalution(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/rocALUTION"
git = "https://github.com/ROCmSoftwarePlatform/rocALUTION.git"
url = "https://github.com/ROCmSoftwarePlatform/rocALUTION/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/rocALUTION/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath"]
libraries = ["librocalution_hip"]
version("5.3.0", sha256="f623449789a5c9c9137ae51d4dbbee5c6940d8813826629cb4b7e84f07fab494")
version("5.2.3", sha256="8e0d77099bf7dc0d00505e1c936b072a59719102c75398dc1416cbef31902253")
version("5.2.1", sha256="f246bd5b5d1b5821c29b566610a1c1d5c5cc361e0e5c373b8b04168b05e9b26f")
version("5.2.0", sha256="a5aac471bbec87d019ad7c6db779c73327ad40ecdea09dc5ab2106e62cd6b7eb")
@ -131,6 +132,7 @@ class Rocalution(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("rocprim@" + ver, when="@" + ver)
@ -163,6 +165,7 @@ class Rocalution(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
for tgt in itertools.chain(["auto"], amdgpu_targets):
depends_on(
@ -173,7 +176,7 @@ class Rocalution(CMakePackage):
depends_on("googletest@1.10.0:", type="test")
# This fix is added to address the compilation failure and it is
# already taken in 5.2.3 rocm release.
patch("0003-fix-compilation-for-rocalution-5.2.0.patch", when="@5.2.0:")
patch("0003-fix-compilation-for-rocalution-5.2.0.patch", when="@5.2")
# Fix build for most Radeon 5000 and Radeon 6000 series GPUs.
patch("0004-fix-navi-1x.patch", when="@5.2.0:")
@ -225,4 +228,7 @@ def cmake_args(self):
if self.spec.satisfies("@5.2.0:"):
args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True))
if self.spec.satisfies("@5.3.0:"):
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
return args

7
var/spack/repos/builtin/packages/rocblas/package.py
View file

@ -13,7 +13,7 @@ class Rocblas(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS/"
git = "https://github.com/ROCmSoftwarePlatform/rocBLAS.git"
url = "https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath", "haampie"]
@ -22,6 +22,7 @@ class Rocblas(CMakePackage):
version("develop", branch="develop")
version("master", branch="master")
version("5.3.0", sha256="8ea7269604cba949a6ea84b78dc92a44fa890427db88334da6358813f6512e34")
version("5.2.3", sha256="36f74ce53b82331a756c42f95f3138498d6f4a66f2fd370cff9ab18281bb12d5")
version("5.2.1", sha256="6be804ba8d9e491a85063c220cd0ddbf3d13e3b481eee31041c35a938723f4c6")
version("5.2.0", sha256="b178b7db5f0af55b21b5f744b8825f5e002daec69b4688e50df2bca2fac155bd")
@ -167,6 +168,7 @@ def check(self):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("llvm-amdgpu@" + ver, type="build", when="@" + ver)
@ -205,6 +207,7 @@ def check(self):
("@5.2.0", "9ca08f38c4c3bfe6dfa02233637e7e3758c7b6db"),
("@5.2.1", "9ca08f38c4c3bfe6dfa02233637e7e3758c7b6db"),
("@5.2.3", "9ca08f38c4c3bfe6dfa02233637e7e3758c7b6db"),
("@5.3.0", "b33ca97af456cda14f7b1ec9bcc8aeab3ed6dd08"),
]:
resource(
name="Tensile",
@ -284,5 +287,7 @@ def cmake_args(self):
if self.spec.satisfies("@5.2.0:"):
args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True))
if self.spec.satisfies("@5.3.0:"):
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
return args

7
var/spack/repos/builtin/packages/rocfft/package.py
View file

@ -13,12 +13,13 @@ class Rocfft(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT/"
git = "https://github.com/ROCmSoftwarePlatform/rocFFT.git"
url = "https://github.com/ROCmSoftwarePlatform/rocfft/archive/rocm-5.2.0.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/rocfft/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath", "haampie"]
libraries = ["librocfft"]
version("5.3.0", sha256="d655c5541c4aff4267e80e36d002fc3a55c2f84a0ae8631197c12af3bf03fa7d")
version("5.2.3", sha256="0cee37886f01f1afb3ae5dad1164c819573c13c6675bff4eb668de334adbff27")
version("5.2.1", sha256="6302349b6cc610a9a939377e2c7ffba946656a8d43f2e438ff0b3088f0f963ad")
version("5.2.0", sha256="ebba280b7879fb4bc529a68072b98d4e815201f90d24144d672094bc241743d4")
@ -140,6 +141,7 @@ def check(self):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
@ -196,4 +198,7 @@ def cmake_args(self):
if self.spec.satisfies("@5.2.0:"):
args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True))
if self.spec.satisfies("@5.3.0:"):
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
return args

4
var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py
View file

@ -12,13 +12,14 @@ class RocmBandwidthTest(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test"
git = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test.git"
url = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
version("master", branch="master")
version("5.3.0", sha256="a97365c04d79663db7c85027c63a12d56356abc0a351697f49c2d82bf9ef8999")
version("5.2.3", sha256="b76fe33898d67ec1f5f1ec58adaea88e88ed28b1f5470aa4c08c347d8f558af2")
version("5.2.1", sha256="ebdf868bef8ab6c7f32775ba6eab85cf3e078af1fc1b1a11fdbaad777f37a190")
version("5.2.0", sha256="046f2a6984c62899f57a557490136fbe7ab28e2fd334750abac71b03609226ef")
@ -124,6 +125,7 @@ class RocmBandwidthTest(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
"master",
]:
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)

4
var/spack/repos/builtin/packages/rocm-clang-ocl/package.py
View file

@ -11,12 +11,13 @@ class RocmClangOcl(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/clang-ocl"
git = "https://github.com/RadeonOpenCompute/clang-ocl.git"
url = "https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
version("master", branch="master")
version("5.3.0", sha256="66b80ba050848ad921496bd894e740e66afad0ba1923b385f01f2eeae97999ad")
version("5.2.3", sha256="9cdb387168975207314c08ba63ae7cd11f70542117a5390eddbec77ebb84bed0")
version("5.2.1", sha256="693a9a360cb2f7e6910a6714df236df6a9d984f94b01712103a520d8e506c03f")
version("5.2.0", sha256="a2059f6aeccc119abbd444cb37128e00e4854e22a88a47f120f8f8b947d862c5")
@ -122,6 +123,7 @@ class RocmClangOcl(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
"master",
]:
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)

3
var/spack/repos/builtin/packages/rocm-cmake/package.py
View file

@ -13,13 +13,14 @@ class RocmCmake(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"
git = "https://github.com/RadeonOpenCompute/rocm-cmake.git"
url = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
version("master", branch="master")
version("5.3.0", sha256="659a8327f13e6786103dd562d3632e89a51244548fca081f46c753857cf09d04")
version("5.2.3", sha256="c63b707ec07d24fda5a2a6fffeda4df4cc04ceea5df3b8822cbe4e6600e358b4")
version("5.2.1", sha256="3d179496fb8f5f96230f736a313990f66705dc91fd10948a3042b495a440bf63")
version("5.2.0", sha256="be8646c4f7babfe9a103c97d0e9f369322f8ac6cfa528edacdbdcf7f3ef44943")

10
var/spack/repos/builtin/packages/rocm-dbgapi/package.py
View file

@ -16,7 +16,7 @@ class RocmDbgapi(CMakePackage):
homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi"
git = "https://github.com/ROCm-Developer-Tools/ROCdbgapi.git"
url = "https://github.com/ROCm-Developer-Tools/ROCdbgapi/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCm-Developer-Tools/ROCdbgapi/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
@ -24,6 +24,7 @@ class RocmDbgapi(CMakePackage):
version("master", branch="amd-master")
version("5.3.0", sha256="afffec78e34fe70952cd41efc3d7ba8f64e43acb2ad20aa35c9b8b591bed48ca")
version("5.2.3", sha256="17925d23f614ecb2b40dffe5e14535cba380d4f489ea1a027762c356be9fbc2b")
version("5.2.1", sha256="169e3914ebd99d6a5c034c568964b7bad56611262e292f77c0c65a7708e02376")
version("5.2.0", sha256="44f0528a7583bc59b6585166d2289970b20115c4c70e3bcc218aff19fc242b3f")
@ -129,6 +130,7 @@ class RocmDbgapi(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
"master",
]:
depends_on("hsa-rocr-dev@" + ver, type="build", when="@" + ver)
@ -151,3 +153,9 @@ def patch(self):
r"\1 {0}/include".format(self.spec["hsa-rocr-dev"].prefix),
"CMakeLists.txt",
)
def cmake_args(self):
args = []
if "@5.3.0:" in self.spec:
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
return args

5
var/spack/repos/builtin/packages/rocm-debug-agent/package.py
View file

@ -13,12 +13,13 @@ class RocmDebugAgent(CMakePackage):
homepage = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent"
git = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent.git"
url = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
libraries = ["librocm-debug-agent"]
version("5.3.0", sha256="8dfb6aa442ce136207c0c089321c8099042395977b4a488e4ca219661df0cd78")
version("5.2.3", sha256="5d31372e2980738271ae26b92dcc402c387cdf5f23710ce6feeb2bd303ff7ea0")
version("5.2.1", sha256="a60c224c546a25dafcff1e50ce3a1605e152efdb36624a672ddb5812cd34773e")
version("5.2.0", sha256="f8e8d5ad691033d0c0f1850d69f35c98ba9722ab4adc66c4251f22257f56f0a2")
@ -134,6 +135,7 @@ def url_for_version(self, version):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
depends_on("hsakmt-roct@" + ver, when="@" + ver)
@ -157,6 +159,7 @@ def url_for_version(self, version):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("rocm-dbgapi@" + ver, when="@" + ver)
depends_on("hip@" + ver, when="@" + ver)

4
var/spack/repos/builtin/packages/rocm-device-libs/package.py
View file

@ -12,13 +12,14 @@ class RocmDeviceLibs(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
git = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs.git"
url = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath", "haampie"]
version("master", branch="amd-stg-open")
version("5.3.0", sha256="f7e1665a1650d3d0481bec68252e8a5e68adc2c867c63c570f6190a1d2fe735c")
version("5.2.3", sha256="16b7fc7db4759bd6fb54852e9855fa16ead76c97871d7e1e9392e846381d611a")
version("5.2.1", sha256="e5855387ce73ed483ed0d03dbfef31f297c6ca66cf816f6816fd5ee373fc8225")
version("5.2.0", sha256="901674bc941115c72f82c5def61d42f2bebee687aefd30a460905996f838e16c")
@ -134,6 +135,7 @@ class RocmDeviceLibs(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
"master",
]:
depends_on("llvm-amdgpu@" + ver, when="@" + ver)

6
var/spack/repos/builtin/packages/rocm-gdb/package.py
View file

@ -12,11 +12,12 @@ class RocmGdb(AutotoolsPackage):
based on GDB, the GNU source-level debugger."""
homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb/"
url = "https://github.com/ROCm-Developer-Tools/ROCgdb/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCm-Developer-Tools/ROCgdb/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
version("5.3.0", sha256="402537baf0779cae586d608505e81173ba85f976fe993f1633e3afe81669350f")
version("5.2.3", sha256="c2df5cccd8bb07ea331b45091fb3141999a37a67696d273f3888b48f6d4281aa")
version("5.2.1", sha256="77169d88f24e6ccb6aef3945448b179edffe806a51a3e996236b08fb510f3979")
version("5.2.0", sha256="70c5b443292b9bb114844eb63b72cfab1b65f083511ee39d55db7a633c63bf5a")
@ -124,6 +125,7 @@ class RocmGdb(AutotoolsPackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("rocm-dbgapi@" + ver, type="link", when="@" + ver)
depends_on("comgr@" + ver, type="link", when="@" + ver)
@ -153,4 +155,6 @@ def configure_args(self):
"--with-python",
"--with-rocm-dbgapi={0}".format(self.spec["rocm-dbgapi"].prefix),
]
if self.spec.satisfies("@5.2.0:"):
options.append("--disable-gprofng")
return options

3
var/spack/repos/builtin/packages/rocm-opencl/package.py
View file

@ -29,6 +29,7 @@ def url_for_version(self, version):
version("master", branch="main")
version("5.3.0", sha256="d251e2efe95dc12f536ce119b2587bed64bbda013969fa72be58062788044a9e")
version("5.2.3", sha256="932ea3cd268410010c0830d977a30ef9c14b8c37617d3572a062b5d4595e2b94")
version("5.2.1", sha256="eb4ff433f8894ca659802f81792646034f8088b47aca6ad999292bcb8d6381d5")
version("5.2.0", sha256="80f73387effdcd987a150978775a87049a976aa74f5770d4420847b004dd59f0")
@ -117,6 +118,7 @@ def url_for_version(self, version):
depends_on("numactl", type="link", when="@3.7.0:")
for d_version, d_shasum in [
("5.3.0", "2bf14116b5e2270928265f5d417b3d0f0f2e13cbc8ec5eb8c80d4d4a58ff7e94"),
("5.2.3", "0493c414d4db1af8e1eb30a651d9512044644244488ebb13478c2138a7612998"),
("5.2.1", "465ca9fa16869cd89dab8c2d66d9b9e3c14f744bbedaa1d215b0746d77a500ba"),
("5.2.0", "37f5fce04348183bce2ece8bac1117f6ef7e710ca68371ff82ab08e93368bafb"),
@ -175,6 +177,7 @@ def url_for_version(self, version):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
"master",
]:
depends_on("comgr@" + ver, type="build", when="@" + ver)

4
var/spack/repos/builtin/packages/rocm-smi-lib/package.py
View file

@ -17,13 +17,15 @@ class RocmSmiLib(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib"
git = "https://github.com/RadeonOpenCompute/rocm_smi_lib.git"
url = "https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
libraries = ["librocm_smi64"]
version("master", branch="master")
version("5.3.0", sha256="8f72ad825a021d5199fb73726b4975f20682beb966e0ec31b53132bcd56c5408")
version("5.2.3", sha256="fcf4f75a8daeca81ecb107989712c5f3776ee11e6eed870cb93efbf66ff1c384")
version("5.2.1", sha256="07ad3be6f8c7d3f0a1b8b79950cd7839fb82972cef373dccffdbda32a3aca760")
version("5.2.0", sha256="7bce567ff4e087598eace2cae72d24c98b2bcc93af917eafa61ec9d1e8ef4477")

7
var/spack/repos/builtin/packages/rocm-tensile/package.py
View file

@ -13,11 +13,12 @@ class RocmTensile(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/Tensile/"
git = "https://github.com/ROCmSoftwarePlatform/Tensile.git"
url = "https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath", "haampie"]
version("5.3.0", sha256="05c546986549154e6c7b4f57a0b3bfd5cb223d2393c206ff1702f89454c832f4")
version("5.2.3", sha256="840698bf2ac62e08ae76c3843f1dad5367ed098d42e6a5fa7953de70642fd2cf")
version("5.2.1", sha256="49582e28f7e14fed6a66c59482a41d3899c1eb8e7aa0ce40a7a2e806dadc536b")
version("5.2.0", sha256="aa6107944482ad278111d11d2e926393423fc70e7e1838574fe7ad9f553bdacf")
@ -145,6 +146,7 @@ class RocmTensile(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("rocm-cmake@" + ver, type="build", when="@" + ver)
depends_on("hip@" + ver, when="@" + ver)
@ -171,6 +173,7 @@ class RocmTensile(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("rocm-smi-lib@" + ver, type="build", when="@" + ver)
@ -203,7 +206,7 @@ def cmake_args(self):
self.define("Tensile_LOGIC", "asm_full"),
self.define("Tensile_CODE_OBJECT_VERSION", "V3"),
self.define("Boost_USE_STATIC_LIBS", "OFF"),
self.define("TENSILE_USE_OPENMP", "ON"),
self.define("TENSILE_USE_OPENMP", "OFF"),
self.define("BUILD_WITH_TENSILE_HOST", "ON" if "@3.7.0:" in self.spec else "OFF"),
]

407
var/spack/repos/builtin/packages/rocm-validation-suite/007-cleanup-path-reference-donot-download-googletest-yaml-library-path_5.3.patch Normal file
View file

@ -0,0 +1,407 @@
From 72eb459316cab9482130729a7b6a61fb9a941242 Mon Sep 17 00:00:00 2001
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
Date: Wed, 19 Oct 2022 15:05:27 -0700
Subject: [PATCH] RVS patch for 5.3.0
---
CMakeLists.txt | 105 ++++-----------------------------------
babel.so/CMakeLists.txt | 16 +++---
edp.so/CMakeLists.txt | 1 +
gst.so/CMakeLists.txt | 4 +-
iet.so/CMakeLists.txt | 4 +-
mem.so/CMakeLists.txt | 4 +-
pbqt.so/CMakeLists.txt | 2 +-
pebb.so/CMakeLists.txt | 2 +-
peqt.so/CMakeLists.txt | 4 +-
perf.so/CMakeLists.txt | 4 +-
rcqt.so/CMakeLists.txt | 2 +-
rvslib/CMakeLists.txt | 2 +-
testif.so/CMakeLists.txt | 2 +-
13 files changed, 35 insertions(+), 117 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 034f280..9a08181 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,13 +68,12 @@ endif(rocblas_FOUND)
# variables since we will pass them as cmake params appropriately, and
# all find_packages relevant to this build will be in ROCM path hence appending it to CMAKE_PREFIX_PATH
set(ROCM_PATH "/opt/rocm" CACHE PATH "ROCM install path")
-set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "CMAKE installation directory")
-set(CMAKE_PACKAGING_INSTALL_PREFIX "/opt/rocm" CACHE PATH "Prefix used in built packages")
+set (CMAKE_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
list(APPEND CMAKE_PREFIX_PATH "${ROCM_PATH}")
-set(ROCR_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime" FORCE)
-set(ROCR_LIB_DIR "${ROCM_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime" FORCE)
-set(HIP_INC_DIR "${ROCM_PATH}" CACHE PATH "Contains header files exported by ROC Runtime")
-set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk" FORCE)
+set(ROCR_INC_DIR "${HSA_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime")
+set(ROCR_LIB_DIR "${HSA_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime")
+set(HIP_INC_DIR "${HIP_PATH}" CACHE PATH "Contains header files exported by ROC Runtime")
+set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk")
#
@@ -193,8 +192,6 @@ set(RVS_ROCBLAS "0" CACHE STRING "1 = use local rocBLAS")
set(RVS_ROCMSMI "0" CACHE STRING "1 = use local rocm_smi_lib")
set(RVS_LIB_DIR "${CMAKE_BINARY_DIR}/rvslib" CACHE PATH "Contains RVS library")
-set(YAML_INC_DIR "${CMAKE_BINARY_DIR}/yaml-src/include" CACHE PATH "Contains header files exported by yaml-cpp")
-set(YAML_LIB_DIR "${CMAKE_BINARY_DIR}/yaml-build" CACHE PATH "Contains library files exported by yaml-cpp")
if (${RVS_OS_TYPE} STREQUAL "centos")
set(ROCT_LIB_DIR "${ROCM_PATH}/lib64" CACHE PATH "Contains library files exported by ROC Trunk")
@@ -238,86 +235,6 @@ if (NOT DEFINED CPACK_GENERATOR )
endif()
message (STATUS "CPACK_GENERATOR ${CPACK_GENERATOR}" )
-
-################################################################################
-# Download and unpack yaml-cpp at configure time
-configure_file(CMakeYamlDownload.cmake yaml-download/CMakeLists.txt)
-execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
- RESULT_VARIABLE result
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/yaml-download )
-if(result)
- message(FATAL_ERROR "CMake step for yaml-download failed: ${result}")
-endif()
-execute_process(COMMAND ${CMAKE_COMMAND} --build .
- RESULT_VARIABLE result
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/yaml-download )
-if(result)
- message(FATAL_ERROR "Build step for yaml-download failed: ${result}")
-endif()
-execute_process(COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR}/yaml-src -B${CMAKE_BINARY_DIR}/yaml-build
- RESULT_VARIABLE result
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/yaml-src )
-if(result)
- message(FATAL_ERROR "Config step for yaml-src failed: ${result}")
-endif()
-
-add_custom_target(rvs_yaml_target
- DEPENDS ${CMAKE_BINARY_DIR}/yaml-build/libyaml-cpp.a
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/yaml-build/libyaml-cpp.a
- COMMAND make -C ${CMAKE_BINARY_DIR}/yaml-build
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/yaml-src
- COMMENT "Generating yaml-cpp targets"
- VERBATIM)
-
-################################################################################
-## GOOGLE TEST
-if(RVS_BUILD_TESTS)
- # Download and unpack googletest at configure time
- configure_file(CMakeGtestDownload.cmake googletest-download/CMakeLists.txt)
- execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
- RESULT_VARIABLE result
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
- if(result)
- message(FATAL_ERROR "CMake step for googletest failed: ${result}")
- endif()
- execute_process(COMMAND ${CMAKE_COMMAND} --build .
- RESULT_VARIABLE result
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
- if(result)
- message(FATAL_ERROR "Build step for googletest failed: ${result}")
- endif()
- execute_process(COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR}/googletest-src -B${CMAKE_BINARY_DIR}/googletest-build
- RESULT_VARIABLE result
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-src )
- if(result)
- message(FATAL_ERROR "Config step for googletest-src failed: ${result}")
- endif()
-
- add_custom_target(rvs_gtest_target
- DEPENDS ${CMAKE_BINARY_DIR}/googletest-build/lib/libgtest_main.a
- )
-
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/googletest-build/lib/libgtest_main.a
- COMMAND make -C ${CMAKE_BINARY_DIR}/googletest-build
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-src
- COMMENT "Generating googletest targets"
- VERBATIM)
-
- ## Set default unit test framework include path
- if (NOT DEFINED UT_INC)
- set (UT_INC "${CMAKE_BINARY_DIR}/googletest-src/googletest/include")
- message ("UT_INC ${UT_INC}")
- endif ()
-
- ## Set default unit test framework include path
- if (NOT DEFINED UT_LIB)
- set (UT_LIB "${CMAKE_BINARY_DIR}/googletest-build/lib")
- message ("UT_LIB ${UT_LIB}")
- endif()
-
-endif()
################################################################################
## rocBLAS
@@ -441,8 +358,8 @@ if (RVS_ROCBLAS EQUAL 1)
set(ROCBLAS_INC_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install")
set(ROCBLAS_LIB_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install/lib/")
else()
- set(ROCBLAS_INC_DIR "${ROCM_PATH}/include")
- set(ROCBLAS_LIB_DIR "${ROCM_PATH}/lib")
+ set(ROCBLAS_INC_DIR "${ROCBLAS_DIR}/include")
+ set(ROCBLAS_LIB_DIR "${ROCBLAS_DIR}/lib")
endif()
if (RVS_ROCMSMI EQUAL 1)
@@ -457,8 +374,8 @@ else()
set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/rocm_smi/lib")
else()
message( STATUS "ROCBLAS REORG Enabled Version: ${RVS_ROCBLAS_VERSION_FLAT}" )
- set(ROCM_SMI_INC_DIR "${ROCM_PATH}/include")
- set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/lib")
+ set(ROCM_SMI_INC_DIR "${ROCM_SMI_DIR}/include")
+ set(ROCM_SMI_LIB_DIR "${ROCM_SMI_DIR}/lib")
endif()
endif()
set(ROCM_SMI_LIB "rocm_smi64" CACHE STRING "rocm_smi library name")
@@ -493,7 +410,7 @@ if (RVS_BUILD_TESTS)
add_subdirectory(testif.so)
endif()
-add_dependencies(rvshelper rvs_bin_folder rvs_doc rvs_yaml_target)
+add_dependencies(rvshelper rvs_bin_folder rvs_doc)
add_dependencies(pesm rvslib rvslibrt)
@@ -528,7 +445,7 @@ if (RVS_BUILD_TESTS)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Create the bintest directory"
VERBATIM)
- add_dependencies(rvshelper rvs_bintest_folder rvs_gtest_target)
+ add_dependencies(rvshelper rvs_bintest_folder)
endif()
add_custom_target(rvs_doc ALL
diff --git a/babel.so/CMakeLists.txt b/babel.so/CMakeLists.txt
index 95da02c..450899d 100644
--- a/babel.so/CMakeLists.txt
+++ b/babel.so/CMakeLists.txt
@@ -116,13 +116,13 @@ set(HIP_HCC_LIB "amdhip64")
add_compile_options(-DRVS_ROCBLAS_VERSION_FLAT=${RVS_ROCBLAS_VERSION_FLAT})
# Determine Roc Runtime header files are accessible
-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime.h)
- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR})
+if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime.h)
+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime_api.h)
- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR})
+if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime_api.h)
+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
@@ -142,16 +142,16 @@ if(DEFINED RVS_ROCMSMI)
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
+if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so")
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${HIP_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HIP_PATH}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
## additional libraries
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/edp.so/CMakeLists.txt b/edp.so/CMakeLists.txt
index d67c013..b261adb 100644
--- a/edp.so/CMakeLists.txt
+++ b/edp.so/CMakeLists.txt
@@ -138,6 +138,7 @@ endif()
if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+ message("${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so not found")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
diff --git a/gst.so/CMakeLists.txt b/gst.so/CMakeLists.txt
index 7ee9bbe..6b17914 100644
--- a/gst.so/CMakeLists.txt
+++ b/gst.so/CMakeLists.txt
@@ -146,7 +146,7 @@ if(DEFINED RVS_ROCMSMI)
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
@@ -154,7 +154,7 @@ endif()
## define include directories
include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
## additional libraries
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/iet.so/CMakeLists.txt b/iet.so/CMakeLists.txt
index 6ed44f8..bff3b34 100644
--- a/iet.so/CMakeLists.txt
+++ b/iet.so/CMakeLists.txt
@@ -149,7 +149,7 @@ if(DEFINED RVS_ROCMSMI)
endif()
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
@@ -177,7 +177,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
set_target_properties(${RVS_TARGET} PROPERTIES
SUFFIX .so.${LIB_VERSION_STRING}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCM_SMI_LIB})
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_INC_DIR}/lib/ ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCM_SMI_LIB})
add_dependencies(${RVS_TARGET} rvslibrt rvslib)
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
diff --git a/mem.so/CMakeLists.txt b/mem.so/CMakeLists.txt
index 7aa669f..182270c 100644
--- a/mem.so/CMakeLists.txt
+++ b/mem.so/CMakeLists.txt
@@ -143,7 +143,7 @@ if(DEFINED RVS_ROCMSMI)
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
@@ -152,7 +152,7 @@ endif()
include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
## additional libraries
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/pbqt.so/CMakeLists.txt b/pbqt.so/CMakeLists.txt
index 36c11e9..1d22861 100644
--- a/pbqt.so/CMakeLists.txt
+++ b/pbqt.so/CMakeLists.txt
@@ -147,7 +147,7 @@ endif()
## define include directories
include_directories(./ ../ pci ${ROCR_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
## additional libraries
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/pebb.so/CMakeLists.txt b/pebb.so/CMakeLists.txt
index 9c18633..4153a2a 100644
--- a/pebb.so/CMakeLists.txt
+++ b/pebb.so/CMakeLists.txt
@@ -148,7 +148,7 @@ endif()
## define include directories
include_directories(./ ../ pci ${ROCR_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
## additional libraries
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/peqt.so/CMakeLists.txt b/peqt.so/CMakeLists.txt
index 1bff888..9141107 100644
--- a/peqt.so/CMakeLists.txt
+++ b/peqt.so/CMakeLists.txt
@@ -116,9 +116,9 @@ else()
endif()
## define include directories
-include_directories(./ ../)
+include_directories(./ ../ ${HSA_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HSA_PATH}/lib/ ${HSAKMT_LIB_DIR} ${ASAN_LIB_PATH})
## additional libraries
set (PROJECT_LINK_LIBS rvslibrt rvslib libpci.so libm.so)
diff --git a/perf.so/CMakeLists.txt b/perf.so/CMakeLists.txt
index 7357d1a..bf11a3b 100644
--- a/perf.so/CMakeLists.txt
+++ b/perf.so/CMakeLists.txt
@@ -146,7 +146,7 @@ if(DEFINED RVS_ROCMSMI)
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
@@ -154,7 +154,7 @@ endif()
## define include directories
include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
## additional libraries
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/rcqt.so/CMakeLists.txt b/rcqt.so/CMakeLists.txt
index b2e9419..e66a9f2 100644
--- a/rcqt.so/CMakeLists.txt
+++ b/rcqt.so/CMakeLists.txt
@@ -119,7 +119,7 @@ endif()
## define include directories
include_directories(./ ../)
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ASAN_LIB_PATH} ${HSAKMT_LIB_DIR})
## additional libraries
set (PROJECT_LINK_LIBS rvslibrt rvslib)
diff --git a/rvslib/CMakeLists.txt b/rvslib/CMakeLists.txt
index 9ea93ac..d015876 100644
--- a/rvslib/CMakeLists.txt
+++ b/rvslib/CMakeLists.txt
@@ -124,7 +124,7 @@ endif()
## define include directories
include_directories(./ ../
- ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}
+ ${ROCM_SMI_INC_DIR} ${HIP_PATH} ${ROCBLAS_INC_DIR} ${HIP_PATH}
)
link_directories(${ASAN_LIB_PATH})
diff --git a/testif.so/CMakeLists.txt b/testif.so/CMakeLists.txt
index 9d9691d..c65bbe5 100644
--- a/testif.so/CMakeLists.txt
+++ b/testif.so/CMakeLists.txt
@@ -119,7 +119,7 @@ endif()
## define include directories
include_directories(./ ../ pci)
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
## additional libraries
set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so)
--
2.25.1

12
var/spack/repos/builtin/packages/rocm-validation-suite/package.py
View file

@ -16,11 +16,12 @@ class RocmValidationSuite(CMakePackage):
compatible platform."""
homepage = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite"
url = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
version("5.3.0", sha256="d6afb8a5f4eaf860fd510bcfe65e735cbf96d4b8817c758ea7aee84d4c994382")
version("5.2.3", sha256="5dfbd41c694bf2eb4368edad8653dc60ec2927d174fc7aaa5fa416156c5f921f")
version("5.2.1", sha256="a0ea3ab9cbb8ac17bfa4537713a4d7075f869949bfdead4565a46f75864bd4a9")
version("5.2.0", sha256="2dfef5d66f544230957ac9aaf647b2f1dccf3cc7592cc322cae9fbdcf3321365")
@ -108,8 +109,12 @@ class RocmValidationSuite(CMakePackage):
patch("002-remove-force-setting-hip-inc-path.patch", when="@4.1.0:4.3.2")
patch("003-cmake-change-to-remove-installs-and-sudo.patch", when="@4.1.0:4.3.2")
patch("004-remove-git-download-yaml-cpp-use-yaml-cpp-recipe.patch", when="@4.3.0:4.3.2")
patch("005-cleanup-path-reference-donot-download-googletest-yaml.patch", when="@4.5.0:")
patch("006-library-path.patch", when="@4.5.0:")
patch("005-cleanup-path-reference-donot-download-googletest-yaml.patch", when="@4.5.0:5.2")
patch("006-library-path.patch", when="@4.5.0:5.2")
patch(
"007-cleanup-path-reference-donot-download-googletest-yaml-library-path_5.3.patch",
when="@5.3.0:",
)
depends_on("cmake@3.5:", type="build")
depends_on("zlib", type="link")
@ -141,6 +146,7 @@ def setup_build_environment(self, build_env):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("rocminfo@" + ver, when="@" + ver)

4
var/spack/repos/builtin/packages/rocminfo/package.py
View file

@ -12,13 +12,14 @@ class Rocminfo(CMakePackage):
homepage = "https://github.com/RadeonOpenCompute/rocminfo"
git = "https://github.com/RadeonOpenCompute/rocminfo.git"
url = "https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath", "haampie"]
version("master", branch="master")
version("5.3.0", sha256="c279da1d946771d120611b64974fde751534e787a394ceb6b8e0b743c143d782")
version("5.2.3", sha256="38fe8db21077100ee2242bd087371f6b8e0078d3a269e145d3a4ab314d0b8902")
version("5.2.1", sha256="e8a3b3228387d164e21de060e18ac018eecb5e9abe0ae45830c51ead4b7f1004")
version("5.2.0", sha256="e721eb81efd384abd22ff01cdcbb6245b11084dc11a867c74c8ad6b028aa0404")
@ -124,6 +125,7 @@ class Rocminfo(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
"master",
]:
depends_on("hsakmt-roct@" + ver, when="@" + ver)

4
var/spack/repos/builtin/packages/rocprim/package.py
View file

@ -11,11 +11,12 @@ class Rocprim(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM"
git = "https://github.com/ROCmSoftwarePlatform/rocPRIM.git"
url = "https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath"]
version("5.3.0", sha256="4885bd662b038c6e9f058a756fd838203dbd00227bfef6adaf31496010b100e4")
version("5.2.3", sha256="502f49cf3190f4ac20d0a6b19eb2d0786bb3c5661329940378081f1678aa8e82")
version("5.2.1", sha256="47f09536b0afbb7be4d6fb71cca9f0a4fa58dde29c83aee247d4b167f6f3acae")
version("5.2.0", sha256="f99eb7d2f6b1445742fba631a0dc8bb0d464a767a9c4fb79ac865d9570fe747b")
@ -126,6 +127,7 @@ class Rocprim(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("comgr@" + ver, when="@" + ver)

23
var/spack/repos/builtin/packages/rocprofiler-dev/0001-Continue-build-in-absence-of-aql-profile-lib.patch Normal file
View file

@ -0,0 +1,23 @@
From faabde6d861497bf2bd892d8d3baf34feedaa5ba Mon Sep 17 00:00:00 2001
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
Date: Thu, 20 Oct 2022 11:18:10 -0700
Subject: [PATCH] Continue-build-in-absence-of-aql-profile-lib
---
cmake_modules/env.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake_modules/env.cmake b/cmake_modules/env.cmake
index 2e9613b..f10d186 100644
--- a/cmake_modules/env.cmake
+++ b/cmake_modules/env.cmake
@@ -122,5 +122,5 @@ endif ()
find_library ( FIND_AQL_PROFILE_LIB "libhsa-amd-aqlprofile64.so" HINTS ${CMAKE_INSTALL_PREFIX} PATHS ${ROCM_ROOT_DIR})
if ( NOT FIND_AQL_PROFILE_LIB )
- message ( FATAL_ERROR "AQL_PROFILE not installed. Please install AQL_PROFILE" )
+ message ( "AQL_PROFILE not installed. Please install AQL_PROFILE" )
endif()
--
2.25.1

5
var/spack/repos/builtin/packages/rocprofiler-dev/package.py
View file

@ -13,12 +13,13 @@ class RocprofilerDev(CMakePackage):
homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler"
git = "https://github.com/ROCm-Developer-Tools/rocprofiler.git"
url = "https://github.com/ROCm-Developer-Tools/rocprofiler/archive/refs/tags/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCm-Developer-Tools/rocprofiler/archive/refs/tags/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
libraries = ["librocprofiler64"]
version("5.3.0", sha256="b0905a329dc1c97a362b951f3f8ef5da9d171cabb001ed4253bd59a2742e7d39")
version("5.2.3", sha256="4ed22e86633ab177eed85fed8994fcb71017c4c4774998e4d3fc36b6c0a15eac")
version("5.2.1", sha256="c6768ec428590aadfb0e7ef6e22b8dc5ac8ed97babeb56db07f2d5d41cd122e2")
version("5.2.0", sha256="1f4db27b56ef1863d4c9e1d96bac9117d66be45156d0637cfe4fd38cae61a23a")
@ -123,6 +124,7 @@ class RocprofilerDev(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hsakmt-roct@" + ver, when="@" + ver)
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
@ -133,6 +135,7 @@ class RocprofilerDev(CMakePackage):
# See https://github.com/ROCm-Developer-Tools/rocprofiler/pull/50
patch("fix-includes.patch")
patch("0001-Continue-build-in-absence-of-aql-profile-lib.patch", when="@5.3.0")
def patch(self):
filter_file(

4
var/spack/repos/builtin/packages/rocrand/package.py
View file

@ -16,12 +16,13 @@ class Rocrand(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND"
git = "https://github.com/ROCmSoftwarePlatform/rocRAND.git"
url = "https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath"]
libraries = ["librocrand"]
version("5.3.0", sha256="be4c9f9433415bdfea50d9f47b8afb43ac315f205ed39674f863955a6c256dca")
version("5.2.3", sha256="01eda8022fab7bafb2c457fe26a9e9c99950ed1b772ae7bf8710b23a90b56e32")
version("5.2.1", sha256="4b2a7780f0112c12b5f307e1130e6b2c02ab984a0c1b94e9190dae38f0067600")
version("5.2.0", sha256="ab3057e7c17a9fbe584f89ef98ec92a74d638a98d333e7d0f64daf7bc9051e38")
@ -148,6 +149,7 @@ class Rocrand(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)

6
var/spack/repos/builtin/packages/rocsolver/package.py
View file

@ -15,7 +15,7 @@ class Rocsolver(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/rocSOLVER"
git = "https://github.com/ROCmSoftwarePlatform/rocSOLVER.git"
url = "https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath", "haampie"]
@ -35,6 +35,7 @@ class Rocsolver(CMakePackage):
version("develop", branch="develop")
version("master", branch="master")
version("5.3.0", sha256="4569f860d240d50e94e77d498050f5cafe5ad11daddaead3e7e9eaa1957878a7")
version("5.2.3", sha256="b278a1640f31fb1905f18dc5127d57e2b1d36fd2b4f39ae811b5537fa6ce87d4")
version("5.2.1", sha256="74c127efaefec70a14dff6fa0e92276f38a6c313bf1271d68d03a4222d1fc3b6")
version("5.2.0", sha256="94d46ebe1266eaa05df50c1789dc27d3f2dbf3cb5af156e757777a82ed6ef356")
@ -160,6 +161,7 @@ def check(self):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("rocblas@" + ver, when="@" + ver)
@ -210,6 +212,8 @@ def cmake_args(self):
if self.spec.satisfies("@5.2.0:"):
args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True))
if self.spec.satisfies("@5.3.0:"):
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
return args

9
var/spack/repos/builtin/packages/rocsparse/package.py
View file

@ -17,7 +17,7 @@ class Rocsparse(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE"
git = "https://github.com/ROCmSoftwarePlatform/rocSPARSE.git"
url = "https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath"]
@ -34,6 +34,7 @@ class Rocsparse(CMakePackage):
)
variant("test", default=False, description="Build rocsparse-test client")
version("5.3.0", sha256="521ca0e7b52f26edbff8507eb1479dc26019f456756d884d7b8b192c3ea518e8")
version("5.2.3", sha256="6da3f3303a8ada94c4dbff4b42ee33a2e2883a908ee21c41cb2aa7180382026a")
version("5.2.1", sha256="01f3535442740221edad2cde0a20b2499c807f6733d5016b33c47f34a5a55c49")
version("5.2.0", sha256="7ed929af16d2502135024a6463997d9a95f03899b8a33aa95db7029575c89572")
@ -132,6 +133,7 @@ class Rocsparse(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("rocprim@" + ver, when="@" + ver)
@ -143,7 +145,7 @@ class Rocsparse(CMakePackage):
patch("0002-fix-gentest-shebang.patch", when="@4.5.0: +test")
# Fix build for most Radeon 5000 and Radeon 6000 series GPUs.
patch("0003-fix-navi-1x-rocm-4.5.patch", when="@4.5.0:5.1")
patch("0003-fix-navi-1x-rocm-5.2.patch", when="@5.2.0:")
patch("0003-fix-navi-1x-rocm-5.2.patch", when="@5.2")
depends_on("googletest@1.11.0:", when="@5.1.0: +test")
depends_on("googletest@1.10.0:", when="+test")
@ -331,4 +333,7 @@ def cmake_args(self):
if self.spec.satisfies("@5.2.0:"):
args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True))
if self.spec.satisfies("@5.3.0:"):
args.append("-DCMAKE_INSTALL_LIBDIR=lib")
return args

4
var/spack/repos/builtin/packages/rocthrust/package.py
View file

@ -14,11 +14,12 @@ class Rocthrust(CMakePackage):
homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust"
git = "https://github.com/ROCmSoftwarePlatform/rocThrust.git"
url = "https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["cgmb", "srekolam", "renjithravindrankannath"]
version("5.3.0", sha256="0e11b12f208d2751e3e507e3a32403c9bd45da4e191671d765d33abd727d9b96")
version("5.2.3", sha256="0f5ef39c5faab31eb34b48391d58096463969c133ca7ed09ab4e43caa5461b29")
version("5.2.1", sha256="5df35ff0970b83d68b69a07ae9ebb62955faac7401c91daa7929664fdd09d69b")
version("5.2.0", sha256="afa126218485586682c78e97df8025ae4efd32f3751c340e84c436e08868c326")
@ -131,6 +132,7 @@ class Rocthrust(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hip@" + ver, when="@" + ver)
depends_on("rocprim@" + ver, when="@" + ver)

3
var/spack/repos/builtin/packages/roctracer-dev-api/package.py
View file

@ -13,11 +13,12 @@ class RoctracerDevApi(Package):
homepage = "https://github.com/ROCm-Developer-Tools/roctracer"
git = "https://github.com/ROCm-Developer-Tools/roctracer.git"
url = "https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
version("5.3.0", sha256="36f1da60863a113bb9fe2957949c661f00a702e249bb0523cda1fb755c053808")
version("5.2.3", sha256="93f4bb7529db732060bc12055aa10dc346a459a1086cddd5d86c7b509301be4f")
version("5.2.1", sha256="e200b5342bdf840960ced6919d4bf42c8f30f8013513f25a2190ee8767667e59")
version("5.2.0", sha256="9747356ce61c57d22c2e0a6c90b66a055e435d235ba3459dc3e3f62aabae6a03")

68
var/spack/repos/builtin/packages/roctracer-dev/0001-include-rocprofiler-dev-path.patch Normal file
View file

@ -0,0 +1,68 @@
From 78fa4d272974963712f8272b0182f8d997432492 Mon Sep 17 00:00:00 2001
From: Renjith Ravindran <Renjith.RavindranKannath@amd.com>
Date: Thu, 20 Oct 2022 22:11:36 -0700
Subject: [PATCH] Rocprofiler-dev path for the test
---
test/CMakeLists.txt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 65d1fbd..8e553b6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -41,7 +41,7 @@ add_custom_target(check COMMAND ${PROJECT_BINARY_DIR}/run.sh DEPENDS mytest)
## Build MatrixTranspose
set_source_files_properties(hip/MatrixTranspose.cpp PROPERTIES HIP_SOURCE_PROPERTY_FORMAT 1)
hip_add_executable(MatrixTranspose hip/MatrixTranspose.cpp)
-target_include_directories(MatrixTranspose PRIVATE ${PROJECT_SOURCE_DIR}/inc)
+target_include_directories(MatrixTranspose PRIVATE ${PROJECT_SOURCE_DIR}/inc ${ROCPROFILER_PATH}/include)
target_link_libraries(MatrixTranspose PRIVATE roctracer roctx)
add_dependencies(mytest MatrixTranspose)
@@ -50,7 +50,7 @@ set_source_files_properties(app/MatrixTranspose_test.cpp PROPERTIES HIP_SOURCE_P
function(build_matrix_transpose_test OUTPUT_FILE DEFINITIONS)
hip_add_executable(${OUTPUT_FILE} app/MatrixTranspose_test.cpp)
target_compile_definitions(${OUTPUT_FILE} PRIVATE ITERATIONS=100 HIP_TEST=1 ${DEFINITIONS})
- target_include_directories(${OUTPUT_FILE} PRIVATE ${PROJECT_SOURCE_DIR}/inc)
+ target_include_directories(${OUTPUT_FILE} PRIVATE ${PROJECT_SOURCE_DIR}/inc ${ROCPROFILER_PATH}/include)
target_link_libraries(${OUTPUT_FILE} PRIVATE roctracer roctx)
add_dependencies(mytest ${OUTPUT_FILE})
endfunction(build_matrix_transpose_test)
@@ -64,7 +64,7 @@ add_custom_command(OUTPUT MatrixTranspose.c
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/app/MatrixTranspose_test.cpp MatrixTranspose.c)
hip_add_executable(MatrixTranspose_ctest MatrixTranspose.c)
target_compile_definitions(MatrixTranspose_ctest PRIVATE HIP_TEST=0 __HIP_PLATFORM_HCC__)
-target_include_directories(MatrixTranspose_ctest PRIVATE ${PROJECT_SOURCE_DIR}/inc)
+target_include_directories(MatrixTranspose_ctest PRIVATE ${PROJECT_SOURCE_DIR}/inc ${ROCPROFILER_PATH}/include)
target_link_libraries(MatrixTranspose_ctest PRIVATE roctracer roctx)
add_dependencies(mytest MatrixTranspose_ctest)
@@ -76,7 +76,7 @@ add_dependencies(mytest hsaco_test)
## Build codeobj event test
add_library(codeobj_test SHARED app/codeobj_test.cpp)
-target_include_directories(codeobj_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/inc)
+target_include_directories(codeobj_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/inc ${ROCPROFILER_PATH}/include)
target_link_libraries(codeobj_test roctracer)
add_dependencies(mytest codeobj_test)
@@ -123,13 +123,13 @@ add_dependencies(mytest load_unload_reload_test)
## Build the trace_buffer test
add_executable(trace_buffer directed/trace_buffer.cpp)
-target_include_directories(trace_buffer PRIVATE ${PROJECT_SOURCE_DIR}/src/tracer_tool)
+target_include_directories(trace_buffer PRIVATE ${PROJECT_SOURCE_DIR}/src/tracer_tool ${ROCPROFILER_PATH}/include)
target_link_libraries(trace_buffer Threads::Threads atomic)
add_dependencies(mytest trace_buffer)
## Build the memory_pool test
add_executable(memory_pool directed/memory_pool.cpp)
-target_include_directories(memory_pool PRIVATE ${PROJECT_SOURCE_DIR}/src/roctracer ${PROJECT_SOURCE_DIR}/inc)
+target_include_directories(memory_pool PRIVATE ${PROJECT_SOURCE_DIR}/src/roctracer ${PROJECT_SOURCE_DIR}/inc ${ROCPROFILER_PATH}/include)
target_link_libraries(memory_pool Threads::Threads atomic)
add_dependencies(mytest memory_pool)
--
2.25.1

10
var/spack/repos/builtin/packages/roctracer-dev/package.py
View file

@ -15,12 +15,13 @@ class RoctracerDev(CMakePackage):
homepage = "https://github.com/ROCm-Developer-Tools/roctracer"
git = "https://github.com/ROCm-Developer-Tools/roctracer.git"
url = "https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-5.2.3.tar.gz"
url = "https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-5.3.0.tar.gz"
tags = ["rocm"]
maintainers = ["srekolam", "renjithravindrankannath"]
libraries = ["libroctracer64"]
version("5.3.0", sha256="36f1da60863a113bb9fe2957949c661f00a702e249bb0523cda1fb755c053808")
version("5.2.3", sha256="93f4bb7529db732060bc12055aa10dc346a459a1086cddd5d86c7b509301be4f")
version("5.2.1", sha256="e200b5342bdf840960ced6919d4bf42c8f30f8013513f25a2190ee8767667e59")
version("5.2.0", sha256="9747356ce61c57d22c2e0a6c90b66a055e435d235ba3459dc3e3f62aabae6a03")
@ -68,6 +69,7 @@ class RoctracerDev(CMakePackage):
"5.2.0",
"5.2.1",
"5.2.3",
"5.3.0",
]:
depends_on("hsakmt-roct@" + ver, when="@" + ver)
depends_on("hsa-rocr-dev@" + ver, when="@" + ver)
@ -75,6 +77,8 @@ class RoctracerDev(CMakePackage):
depends_on("hip@" + ver, when="@" + ver)
depends_on("rocprofiler-dev@" + ver, when="@" + ver)
patch("0001-include-rocprofiler-dev-path.patch", when="@5.3.0")
@classmethod
def determine_version(cls, lib):
match = re.search(r"lib\S*\.so\.\d+\.\d+\.(\d)(\d\d)(\d\d)", lib)
@ -88,7 +92,7 @@ def determine_version(cls, lib):
def setup_build_environment(self, build_env):
spec = self.spec
build_env.set("HIP_PATH", spec["hip"].prefix)
build_env.set("HIP_PATH", spec["hip"].prefix),
def patch(self):
filter_file(
@ -110,5 +114,7 @@ def cmake_args(self):
"-DHIP_VDI=1",
"-DCMAKE_MODULE_PATH={0}/cmake_modules".format(self.stage.source_path),
"-DHSA_RUNTIME_HSA_INC_PATH={0}/include".format(self.spec["hsa-rocr-dev"].prefix),
"-DROCPROFILER_PATH={0}".format(self.spec["rocprofiler-dev"].prefix),
"-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON",
]
return args