From fbde1abc8ccbe8349da33e06fbd377c9c53e62ac Mon Sep 17 00:00:00 2001 From: arjun-raj-kuppala <60718144+arjun-raj-kuppala@users.noreply.github.com> Date: Fri, 13 Nov 2020 10:25:57 -0800 Subject: AMD ROCm - HIP update and bump up version to 3.9.0 for rccl,debug agent, hip-rocclr and atmi (#19832) * AMD - Bumped up version for hip-rocclr, rocm-opencl, rocm-smi-lib * AMD ROCm - HIP update and bump up version to 3.9.0 for rccl,debug agent, hip-rocclr and atmi * Update package.py * Update package.py * Update package.py * Update var/spack/repos/builtin/packages/hip/package.py Co-authored-by: Adam J. Stewart Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/atmi/package.py | 3 ++- var/spack/repos/builtin/packages/hip/package.py | 15 ++++++++++++--- var/spack/repos/builtin/packages/rccl/package.py | 7 ++++--- .../repos/builtin/packages/rocm-debug-agent/package.py | 5 +++-- 4 files changed, 21 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/atmi/package.py b/var/spack/repos/builtin/packages/atmi/package.py index c70a037435..d0b4cc063d 100644 --- a/var/spack/repos/builtin/packages/atmi/package.py +++ b/var/spack/repos/builtin/packages/atmi/package.py @@ -18,6 +18,7 @@ class Atmi(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.9.0', sha256='0a305e85bab210dd9a0410aa01d46227e00b59141e4675c50d731ad1232ab828') version('3.8.0', sha256='039f0c2b369d0dbc01000754893d9210828f4cb9b36c3e70da8c3819b131c933') version('3.7.0', sha256='8df08489a10ee04cea911811393e0e7d91bd437fc1fd81a23a4e7ab924a974f3') version('3.5.0', sha256='3fb57d2e583fab82bd0582d0c2bccff059ca91122c18ac49a7770a8bb041a37b') @@ -25,7 +26,7 @@ class Atmi(CMakePackage): variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type') depends_on('cmake@3:', type='build') - 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('comgr@' + ver, type='link', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) depends_on('libelf@0.8:', type='link', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 95d8e1188d..72730c36a7 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -17,6 +17,7 @@ class Hip(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.9.0', sha256='25ad58691456de7fd9e985629d0ed775ba36a2a0e0b21c086bd96ba2fb0f7ed1') version('3.8.0', sha256='6450baffe9606b358a4473d5f3e57477ca67cff5843a84ee644bcf685e75d839') version('3.7.0', sha256='757b392c3beb29beea27640832fbad86681dbd585284c19a4c2053891673babd') version('3.5.0', sha256='ae8384362986b392288181bcfbe5e3a0ec91af4320c189bd83c844ed384161b3') @@ -25,7 +26,7 @@ class Hip(CMakePackage): depends_on('perl@5.10:', type=('build', 'run')) depends_on('mesa~llvm@18.3:') - 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('hsakmt-roct@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) @@ -55,8 +56,11 @@ class Hip(CMakePackage): env.set('HIP_CLANG_PATH', self.spec['llvm-amdgpu'].prefix.bin) env.set('HSA_PATH', self.spec['hsa-rocr-dev'].prefix) env.set('ROCMINFO_PATH', self.spec['rocminfo'].prefix) + env.set('HIP_PATH', self.prefix) env.set('DEVICE_LIB_PATH', - self.spec['rocm-device-libs'].prefix.lib) + self.spec['rocm-device-libs'].prefix.amdgcn.bitcode) + env.set('HIPCC_COMPILE_FLAGS_APPEND', + '--rocm-path={0}'.format(self.prefix)) def setup_dependent_run_environment(self, env, dependent_spec): self.setup_run_environment(env) @@ -102,7 +106,10 @@ class Hip(CMakePackage): env.set('HIP_CLANG_PATH', rocm_prefixes['llvm-amdgpu'].bin) env.set('HSA_PATH', rocm_prefixes['hsa-rocr-dev']) env.set('ROCMINFO_PATH', rocm_prefixes['rocminfo']) - env.set('DEVICE_LIB_PATH', rocm_prefixes['rocm-device-libs'].lib) + env.set('DEVICE_LIB_PATH', + self.spec['rocm-device-libs'].prefix.amdgcn.bitcode) + env.set('HIPCC_COMPILE_FLAGS_APPEND', + '--rocm-path={0}'.format(self.prefix)) def setup_dependent_package(self, module, dependent_spec): self.spec.hipcc = join_path(self.prefix.bin, 'hipcc') @@ -117,6 +124,7 @@ class Hip(CMakePackage): if name == 'cxxflags' and '@3.7.0:' in self.spec: incl = self.spec['hip-rocclr'].prefix.include flags.append('-I {0}/compiler/lib/include'.format(incl)) + flags.append('-I {0}/elf'.format(incl)) return (flags, None, None) @@ -150,6 +158,7 @@ class Hip(CMakePackage): '-DHIP_COMPILER=clang', '-DHIP_PLATFORM=rocclr', '-DHSA_PATH={0}'.format(self.spec['hsa-rocr-dev'].prefix), + '-DHIP_RUNTIME=ROCclr', '-DLIBROCclr_STATIC_DIR={0}/lib'.format (self.spec['hip-rocclr'].prefix) ] diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index 989723454d..45b7b23090 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -17,6 +17,7 @@ class Rccl(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.9.0', sha256='ff9d03154d668093309ff814a33788f2cc093b3c627e78e42ae246e6017408b0') version('3.8.0', sha256='0b6676d06bdb1f65d511a95db9f842a3443def83d75759dfdf812b5e62d8c910') version('3.7.0', sha256='8273878ff71aac2e7adf5cc8562d2933034c6c6b3652f88fbe3cd4f2691036e3') version('3.5.0', sha256='290b57a66758dce47d0bfff3f5f8317df24764e858af67f60ddcdcadb9337253') @@ -24,13 +25,13 @@ class Rccl(CMakePackage): patch('0001-Fix-numactl-path-issue.patch', when='@3.7.0:') depends_on('cmake@3:', type='build') - 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('rocm-cmake@' + ver, type='build', when='@' + ver) depends_on('hip@' + ver, type=('build', 'run'), when='@' + ver) - depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) + depends_on('rocm-device-libs@' + ver, type=('build', 'run'), when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) - if ver in ['3.7.0', '3.8.0']: + if ver in ['3.7.0', '3.8.0', '3.9.0']: depends_on('numactl@2.0.12', type=('build', 'link'), when='@' + ver) def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py index e3a25cb161..07fbab2397 100644 --- a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py +++ b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py @@ -15,6 +15,7 @@ class RocmDebugAgent(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.9.0', sha256='3e56bf8b2b53d9102e8709b6259deea52257dc6210df16996b71a7d677952b1b') version('3.8.0', sha256='55243331ac4b0d90e88882eb29fd06fad354e278f8a34ac7f0680b2c895ca2ac') version('3.7.0', sha256='d0f442a2b224a734b0080c906f0fc3066a698e5cde9ff97ffeb485b36d2caba1') version('3.5.0', sha256='203ccb18d2ac508aae40bf364923f67375a08798b20057e574a0c5be8039f133') @@ -33,10 +34,10 @@ class RocmDebugAgent(CMakePackage): depends_on('cmake@3:', type='build') depends_on("elfutils", type='link') - 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('hsa-rocr-dev@' + ver, type='link', when='@' + ver) depends_on('hsakmt-roct@' + ver, type='link', when='@' + ver) - if ver in ['3.7.0', '3.8.0']: + if ver in ['3.7.0', '3.8.0', '3.9.0']: depends_on('rocm-dbgapi@' + ver, type='link', when='@' + ver) depends_on('hip@' + ver, when='@' + ver) -- cgit v1.2.3-60-g2f50