diff options
| author | arjun-raj-kuppala <60718144+arjun-raj-kuppala@users.noreply.github.com> | 2020-11-04 10:44:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 12:44:59 -0600 |
| commit | cc0a58581699303704a3df1e4fc80c9f00fe7fe3 (patch) | |
| tree | bd6a56991f67d654e76a58571051f71a73e84c2c /var | |
| parent | 3daa7b7b40181b16dbd0ef5e03a63a264f1ddd7f (diff) | |
| download | spack-cc0a58581699303704a3df1e4fc80c9f00fe7fe3.tar.gz spack-cc0a58581699303704a3df1e4fc80c9f00fe7fe3.tar.bz2 spack-cc0a58581699303704a3df1e4fc80c9f00fe7fe3.tar.xz spack-cc0a58581699303704a3df1e4fc80c9f00fe7fe3.zip | |
AMD - Bumped up version for hip-rocclr, rocm-opencl, rocm-smi-lib (#19721)
Diffstat (limited to 'var')
3 files changed, 16 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py index 0b387d5306..41e330b40b 100644 --- a/var/spack/repos/builtin/packages/hip-rocclr/package.py +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -24,15 +24,16 @@ class HipRocclr(CMakePackage): url = "https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-{0}.tar.gz" return url.format(version) + version('3.9.0', sha256='d248958672ae35ab7f9fbd83827ccf352e2756dfa7819f6b614ace2e1a9a064e') version('3.8.0', sha256='10d8aa6f5af7b51813015da603c4e75edc863c3530793f6ed9769ca345c08ed6') version('3.7.0', sha256='a49f464bb2eab6317e87e3cc249aba3b2517a34fbdfe50175f0437f69a219adc') version('3.5.0', sha256='87c1ee9f02b8aa487b628c543f058198767c474cec3d21700596a73c028959e1') depends_on('cmake@3:', type='build') - depends_on('mesa~llvm@18.3:', type='link') + depends_on('mesa~llvm@18.3: swr=none', type='link') depends_on('libelf', type='link', when="@3.7.0:") depends_on('numactl', type='link', when="@3.7.0:") - for ver in ['3.5.0', '3.7.0', '3.8.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0']: depends_on('hsakmt-roct@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) @@ -64,6 +65,13 @@ class HipRocclr(CMakePackage): destination='', placement='opencl-on-vdi', when='@3.8.0') + resource(name='opencl-on-vdi', + url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.9.0.tar.gz', + sha256='286ff64304905384ce524cd8794c28aee216befd6c9267d4187a12e5a21e2daf', + expand=True, + destination='', + placement='opencl-on-vdi', + when='@3.9.0') @run_after('install') def deploy_missing_files(self): diff --git a/var/spack/repos/builtin/packages/rocm-opencl/package.py b/var/spack/repos/builtin/packages/rocm-opencl/package.py index 97d795689f..d2112db14c 100644 --- a/var/spack/repos/builtin/packages/rocm-opencl/package.py +++ b/var/spack/repos/builtin/packages/rocm-opencl/package.py @@ -20,6 +20,7 @@ class RocmOpencl(CMakePackage): url = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-{0}.tar.gz" return url.format(version) + version('3.9.0', sha256='286ff64304905384ce524cd8794c28aee216befd6c9267d4187a12e5a21e2daf') version('3.8.0', sha256='7f75dd1abf3d771d554b0e7b0a7d915ab5f11a74962c92b013ee044a23c1270a') version('3.7.0', sha256='283e1dfe4c3d2e8af4d677ed3c20e975393cdb0856e3ccd77b9c7ed2a151650b') version('3.5.0', sha256='511b617d5192f2d4893603c1a02402b2ac9556e9806ff09dd2a91d398abf39a0') @@ -28,7 +29,7 @@ class RocmOpencl(CMakePackage): depends_on('mesa~llvm@18.3:', type='link') depends_on('numactl', type='link', when='@3.7.0') - for ver in ['3.5.0', '3.7.0', '3.8.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0']: depends_on('hip-rocclr@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) @@ -41,9 +42,11 @@ class RocmOpencl(CMakePackage): # all the includes... if name in ('cflags', 'cxxflags'): - rocclr = self.spec['hip-rocclr'].prefix.include + rocclr = self.spec['hip-rocclr'].prefix extra_includes = [ 'include', + 'include/compiler/lib/include', + 'include/elf', 'compiler/lib', 'compiler/lib/include', 'elf/utils/libelf', diff --git a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py index cfcff16908..a33130dcdd 100644 --- a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py @@ -17,6 +17,7 @@ class RocmSmiLib(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.9.0', sha256='b2934b112542af56de2dc1d5bffff59957e21050db6e3e5abd4c99e46d4a0ffe') version('3.8.0', sha256='86250c9ae9dfb18d4f7259a5f2f09b21574d4996fe5034a739ce63a27acd0082') version('3.7.0', sha256='72d2a3deda0b55a2d92833cd648f50c7cb64f8341b254a0badac0152b26f1391') version('3.5.0', sha256='a5d2ec3570d018b60524f0e589c4917f03d26578443f94bde27a170c7bb21e6e') |