diff options
| author | Sreenivasa Murthy Kolam <67086238+srekolam@users.noreply.github.com> | 2021-07-20 05:13:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 05:13:36 -0700 |
| commit | aa9f5601289a33e918cc6a1e157f9d6a2bf54a9d (patch) | |
| tree | 544f707bc54d4789d9444b99a27ba5c029cb3ffd /var | |
| parent | a2ebeb8e76d6c067a60f734cc81ebfdd1fcb75a7 (diff) | |
| download | spack-aa9f5601289a33e918cc6a1e157f9d6a2bf54a9d.tar.gz spack-aa9f5601289a33e918cc6a1e157f9d6a2bf54a9d.tar.bz2 spack-aa9f5601289a33e918cc6a1e157f9d6a2bf54a9d.tar.xz spack-aa9f5601289a33e918cc6a1e157f9d6a2bf54a9d.zip | |
update hip-rocclr recipe and fix dangling pointer in rocm-smi-lib (#24603)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hip-rocclr/package.py | 87 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/rocm-smi-lib/package.py | 4 |
2 files changed, 32 insertions, 59 deletions
diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py index a82d19ee14..a62d665747 100644 --- a/var/spack/repos/builtin/packages/hip-rocclr/package.py +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -59,65 +59,34 @@ class HipRocclr(CMakePackage): placement='opencl-on-vdi', when='@3.5.0') - resource(name='opencl-on-vdi', - url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.7.0.tar.gz', - sha256='283e1dfe4c3d2e8af4d677ed3c20e975393cdb0856e3ccd77b9c7ed2a151650b', - expand=True, - destination='', - placement='opencl-on-vdi', - when='@3.7.0') - - resource(name='opencl-on-vdi', - url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.8.0.tar.gz', - sha256='7f75dd1abf3d771d554b0e7b0a7d915ab5f11a74962c92b013ee044a23c1270a', - expand=True, - 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') - - resource(name='opencl-on-vdi', - url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.10.0.tar.gz', - sha256='3aa9dc5a5f570320b04b35ee129ce9ff21062d2770df934c6c307913f975e93d', - expand=True, - destination='', - placement='opencl-on-vdi', - when='@3.10.0') - - resource(name='opencl-on-vdi', - url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.0.0.tar.gz', - sha256='d43ea5898c6b9e730b5efabe8367cc136a9260afeac5d0fe85b481d625dd7df1', - expand=True, - destination='', - placement='opencl-on-vdi', - when='@4.0.0') - - resource(name='opencl-on-vdi', - url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.1.0.tar.gz', - sha256='0729e6c2adf1e3cf649dc6e679f9cb936f4f423f4954ad9852857c0a53ef799c', - expand=True, - destination='', - placement='opencl-on-vdi', - when='@4.1.0') - resource(name='opencl-on-vdi', - url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.2.0.tar.gz', - sha256='18133451948a83055ca5ebfb5ba1bd536ed0bcb611df98829f1251a98a38f730', - expand=True, - destination='', - placement='opencl-on-vdi', - when='@4.2.0') - resource(name='opencl-on-vdi', - git='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git', - destination='', - placement='opencl-on-vdi', - when='@master') + # Add opencl sources thru the below + for d_version, d_shasum in [ + ('4.2.0', '18133451948a83055ca5ebfb5ba1bd536ed0bcb611df98829f1251a98a38f730'), + ('4.1.0', '0729e6c2adf1e3cf649dc6e679f9cb936f4f423f4954ad9852857c0a53ef799c'), + ('4.0.0', 'd43ea5898c6b9e730b5efabe8367cc136a9260afeac5d0fe85b481d625dd7df1'), + ('3.10.0', '3aa9dc5a5f570320b04b35ee129ce9ff21062d2770df934c6c307913f975e93d'), + ('3.9.0', '286ff64304905384ce524cd8794c28aee216befd6c9267d4187a12e5a21e2daf'), + ('3.8.0', '7f75dd1abf3d771d554b0e7b0a7d915ab5f11a74962c92b013ee044a23c1270a'), + ('3.7.0', '283e1dfe4c3d2e8af4d677ed3c20e975393cdb0856e3ccd77b9c7ed2a151650b') + ]: + resource( + name='opencl-on-vdi', + url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-{0}.tar.gz'.format(d_version), + sha256=d_shasum, + expand=True, + destination='', + placement='opencl-on-vdi', + when='@{0}'.format(d_version) + ) + + resource( + name='opencl-on-vdi', + git='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git', + destination='', + placement='opencl-on-vdi', + branch='main', + when='@master' + ) @run_after('install') def deploy_missing_files(self): 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 53cae44711..00a6b57b40 100644 --- a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import os import shutil from spack import * @@ -45,3 +46,6 @@ class RocmSmiLib(CMakePackage): shutil.rmtree(self.prefix.lib) install_tree(self.prefix.rocm_smi, self.prefix) shutil.rmtree(self.prefix.rocm_smi) + os.remove(join_path(self.prefix.bin, 'rsmiBindings.py')) + symlink('../bindings/rsmiBindings.py', + join_path(self.prefix.bin, 'rsmiBindings.py')) |