From efb1e19339bf5800718928d13b9ad6f7aae67772 Mon Sep 17 00:00:00 2001 From: Sreenivasa Murthy Kolam <67086238+srekolam@users.noreply.github.com> Date: Mon, 4 Jan 2021 21:36:44 +0530 Subject: bumpup version for rocm stage1 recipes for rocm-4.0.0 release (#20635) --- var/spack/repos/builtin/packages/atmi/package.py | 5 +++-- var/spack/repos/builtin/packages/comgr/package.py | 5 +++-- var/spack/repos/builtin/packages/hip-rocclr/package.py | 13 ++++++++++++- var/spack/repos/builtin/packages/hip/package.py | 5 +++-- var/spack/repos/builtin/packages/hsa-rocr-dev/package.py | 7 ++++--- var/spack/repos/builtin/packages/hsakmt-roct/package.py | 3 ++- var/spack/repos/builtin/packages/llvm-amdgpu/package.py | 3 ++- var/spack/repos/builtin/packages/rccl/package.py | 7 ++++--- var/spack/repos/builtin/packages/rocm-cmake/package.py | 3 ++- .../repos/builtin/packages/rocm-device-libs/package.py | 5 +++-- var/spack/repos/builtin/packages/rocminfo/package.py | 5 +++-- 11 files changed, 41 insertions(+), 20 deletions(-) diff --git a/var/spack/repos/builtin/packages/atmi/package.py b/var/spack/repos/builtin/packages/atmi/package.py index 317ff254c8..ecee923c7f 100644 --- a/var/spack/repos/builtin/packages/atmi/package.py +++ b/var/spack/repos/builtin/packages/atmi/package.py @@ -14,10 +14,11 @@ class Atmi(CMakePackage): (integrated and discrete).""" homepage = "https://github.com/RadeonOpenCompute/atmi" - url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-3.10.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-4.0.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='8a2e5789ee7165aff0f0669eecd23ac0a5c8a5bfbc1acd9380fe9a8ed5bffe3a') version('3.10.0', sha256='387e87c622ec334d3ba7a2f4f015ea9a219712722f4c56c1ef572203d0d072ea') version('3.9.0', sha256='0a305e85bab210dd9a0410aa01d46227e00b59141e4675c50d731ad1232ab828') version('3.8.0', sha256='039f0c2b369d0dbc01000754893d9210828f4cb9b36c3e70da8c3819b131c933') @@ -27,7 +28,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', '3.9.0', '3.10.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.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/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index 9c48990232..2b0495b7cd 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -12,10 +12,11 @@ class Comgr(CMakePackage): contains one library, the Code Object Manager (Comgr)""" homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" - url = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.10.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.0.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='f389601fb70b2d9a60d0e2798919af9ddf7b8376a2e460141507fe50073dfb31') version('3.10.0', sha256='b44ee5805a6236213d758fa4b612bb859d8f774b9b4bdc3a2699bb009dd631bc') version('3.9.0', sha256='6600e144d72dadb6d893a3388b42af103b9443755ce556f4e9e205ccd8ec0c83') version('3.8.0', sha256='62a35480dfabaa98883d91ed0f7c490daa9bbd424af37e07e5d85a6e8030b146') @@ -35,7 +36,7 @@ class Comgr(CMakePackage): depends_on('z3', type='link') depends_on('ncurses', type='link') - for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0']: depends_on('llvm-amdgpu@' + ver, type='build', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py index 918b3a73ec..0106f89e64 100644 --- a/var/spack/repos/builtin/packages/hip-rocclr/package.py +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -24,6 +24,7 @@ class HipRocclr(CMakePackage): url = "https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-{0}.tar.gz" return url.format(version) + version('4.0.0', sha256='8db502d0f607834e3b882f939d33e8abe2f9b55ddafaf1b0c2cd29a0425ed76a') version('3.10.0', sha256='d1ac02840c2dcb3d5fa3008fe9e313767ebe6d1dcf978a924341834ec96ebfe2') version('3.9.0', sha256='d248958672ae35ab7f9fbd83827ccf352e2756dfa7819f6b614ace2e1a9a064e') version('3.8.0', sha256='10d8aa6f5af7b51813015da603c4e75edc863c3530793f6ed9769ca345c08ed6') @@ -34,7 +35,7 @@ class HipRocclr(CMakePackage): depends_on('mesa18~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', '3.9.0', '3.10.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.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) @@ -66,6 +67,7 @@ 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', @@ -73,6 +75,7 @@ class HipRocclr(CMakePackage): 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', @@ -81,6 +84,14 @@ class HipRocclr(CMakePackage): 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') + @run_after('install') def deploy_missing_files(self): if '@3.5.0' in self.spec: diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 5e48756c47..830ef73abf 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -13,10 +13,11 @@ class Hip(CMakePackage): single source code.""" homepage = "https://github.com/ROCm-Developer-Tools/HIP" - url = "https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-3.10.0.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-4.0.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='d7b78d96cec67c55b74ea3811ce861b16d300410bc687d0629e82392e8d7c857') version('3.10.0', sha256='0082c402f890391023acdfd546760f41cb276dffc0ffeddc325999fd2331d4e8') version('3.9.0', sha256='25ad58691456de7fd9e985629d0ed775ba36a2a0e0b21c086bd96ba2fb0f7ed1') version('3.8.0', sha256='6450baffe9606b358a4473d5f3e57477ca67cff5843a84ee644bcf685e75d839') @@ -27,7 +28,7 @@ class Hip(CMakePackage): depends_on('perl@5.10:', type=('build', 'run')) depends_on('mesa18~llvm@18.3:') - for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.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) diff --git a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py index 33aed5c17f..84f59c556b 100644 --- a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py +++ b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py @@ -14,10 +14,11 @@ class HsaRocrDev(CMakePackage): Linux HSA Runtime for Boltzmann (ROCm) platforms.""" homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime" - url = "https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-3.10.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-4.0.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='e84c48e80ea38698a5bd5da3940048ad3cab3696d10a53132acad07ca357f17c') version('3.10.0', sha256='58866d8acdb6cc45227f2412098e37c65908b20ed3dd54901dfb515c15ad5f71') version('3.9.0', sha256='d722fb61f62037894957856f2c2d17231c4622bdf75db372321ee30206dceeb6') version('3.8.0', sha256='1dfad4d89d6c099e15073ed38e083bcf6cc463470dcc8a1e1b9e22060c060c72') @@ -28,9 +29,9 @@ class HsaRocrDev(CMakePackage): depends_on('cmake@3:', type="build") depends_on('libelf@0.8:', type='link') - for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0']: depends_on('hsakmt-roct@' + ver, type=('link', 'run'), when='@' + ver) - for ver in ['3.7.0', '3.8.0', '3.9.0']: + for ver in ['3.7.0', '3.8.0', '3.9.0', '4.0.0']: depends_on('llvm-amdgpu@' + ver, type=('link', 'run'), when='@' + ver) # Both 3.5.0 and 3.7.0 force INSTALL_RPATH in different ways diff --git a/var/spack/repos/builtin/packages/hsakmt-roct/package.py b/var/spack/repos/builtin/packages/hsakmt-roct/package.py index 3182a2b5f1..d37f28b4d5 100644 --- a/var/spack/repos/builtin/packages/hsakmt-roct/package.py +++ b/var/spack/repos/builtin/packages/hsakmt-roct/package.py @@ -13,10 +13,11 @@ class HsakmtRoct(CMakePackage): with the ROCk driver.""" homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" - url = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-3.10.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.0.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='a6960fffc8388731ee18953faae12d1449c582e3b3594418845a544455895f42') version('3.10.0', sha256='a3d629247a763cc36f5d48e9122cee8498574af628e14e3c38686c05f66e3e06') version('3.9.0', sha256='e1bb8b010855736d8a97957222f648532d42646ec2964776a9a1455dc81104a3') version('3.8.0', sha256='cd5440f31f592737b5d05448704bd01f91f73cfcab8a7829922e81332575cfe8') diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 2ee214da16..0973976cd6 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -12,10 +12,11 @@ class LlvmAmdgpu(CMakePackage): optimizers, and run-time environments.""" homepage = "https://github.com/RadeonOpenCompute/llvm-project" - url = "https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-3.10.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-4.0.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='aa1f80f429fded465e86bcfaef72255da1af1c5c52d58a4c979bc2f6c2da5a69') version('3.10.0', sha256='8262aff88c1ff6c4deb4da5a4f8cda1bf90668950e2b911f93f73edaee53b370') version('3.9.0', sha256='1ff14b56d10c2c44d36c3c412b190d3d8cd1bb12cfc7cd58af004c16fd9987d1') version('3.8.0', sha256='93a28464a4d0c1c9f4ba55e473e5d1cde4c5c0e6d087ec8a0a3aef1f5f5208e8') diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index f27029209c..eccd61b794 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -13,10 +13,11 @@ class Rccl(CMakePackage): and reduce-scatter.""" homepage = "https://github.com/RadeonOpenCompute/rccl" - url = "https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-3.10.0.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-4.0.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='0632a15b3d6b5981c05377cf4aeb51546f4c4901fd7c37fb0c98071851ad531a') version('3.10.0', sha256='d9dd0b0d8b9d056fc5e6c7b814520800190952acd30dac3a7c462c4cb6f42bb3') version('3.9.0', sha256='ff9d03154d668093309ff814a33788f2cc093b3c627e78e42ae246e6017408b0') version('3.8.0', sha256='0b6676d06bdb1f65d511a95db9f842a3443def83d75759dfdf812b5e62d8c910') @@ -26,13 +27,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', '3.9.0', '3.10.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.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', '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', '3.9.0', '3.10.0']: + if ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.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-cmake/package.py b/var/spack/repos/builtin/packages/rocm-cmake/package.py index 79cf45a7e9..b03f734ada 100644 --- a/var/spack/repos/builtin/packages/rocm-cmake/package.py +++ b/var/spack/repos/builtin/packages/rocm-cmake/package.py @@ -12,10 +12,11 @@ class RocmCmake(CMakePackage): needed for the ROCM software stack""" homepage = "https://github.com/RadeonOpenCompute/rocm-cmake" - url = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-3.10.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-4.0.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='4577487acaa6e041a1316145867584f31caaf0d4aa2dd8fd7f82f81c269cada6') version('3.10.0', sha256='751be4484efdcf0d5fa675480db6e2cddab897de4708c7c7b9fa7adb430b52d7') version('3.9.0', sha256='e0a8db85bb55acb549f360eb9b04f55104aa93e4c3db33f9ba11d9adae2a07eb') version('3.8.0', sha256='9e4be93c76631224eb49b2fa30b0d14c1b3311a6519c8b393da96ac0649d9f30') diff --git a/var/spack/repos/builtin/packages/rocm-device-libs/package.py b/var/spack/repos/builtin/packages/rocm-device-libs/package.py index ea8bee5077..e447191228 100644 --- a/var/spack/repos/builtin/packages/rocm-device-libs/package.py +++ b/var/spack/repos/builtin/packages/rocm-device-libs/package.py @@ -11,10 +11,11 @@ class RocmDeviceLibs(CMakePackage): """set of AMD specific device-side language runtime libraries""" homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs" - url = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.10.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-4.0.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='d0aa495f9b63f6d8cf8ac668f4dc61831d996e9ae3f15280052a37b9d7670d2a') version('3.10.0', sha256='bca9291385d6bdc91a8b39a46f0fd816157d38abb1725ff5222e6a0daa0834cc') version('3.9.0', sha256='c99f45dacf5967aef9a31e3731011b9c142446d4a12bac69774998976f2576d7') version('3.8.0', sha256='e82cc9a8eb7d92de02cabb856583e28f17a05c8cf9c97aec5275608ef1a38574') @@ -26,7 +27,7 @@ class RocmDeviceLibs(CMakePackage): depends_on('cmake@3:', type='build') depends_on('zlib', type='link', when='@3.9.0:') depends_on('texinfo', type='link', when='@3.9.0:') - for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0']: depends_on('llvm-amdgpu@' + ver, type='build', when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocminfo/package.py b/var/spack/repos/builtin/packages/rocminfo/package.py index d67481afbb..5ad9cfbe0f 100644 --- a/var/spack/repos/builtin/packages/rocminfo/package.py +++ b/var/spack/repos/builtin/packages/rocminfo/package.py @@ -11,10 +11,11 @@ class Rocminfo(CMakePackage): """Radeon Open Compute (ROCm) Runtime rocminfo tool""" homepage = "https://github.com/RadeonOpenCompute/rocminfo" - url = "https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-3.9.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-4.0.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.0.0', sha256='0b3d692959dd4bc2d1665ab3a838592fcd08d2b5e373593b9192ca369e2c4aa7') version('3.10.0', sha256='ed02375be3be518b83aea7309ef5ca62dc9b6dbad0aae33e92995102d6d660be') version('3.9.0', sha256='9592781e0c62b910c4adc5c7f4c27c7a0cddbed13111a19dd91a2ff43720e43d') version('3.8.0', sha256='c135dc98ecb5f420e22a6efd2f461ba9ed90be3f42e2ac29356e05c6a0706f8f') @@ -23,7 +24,7 @@ class Rocminfo(CMakePackage): depends_on('cmake@3:', type='build') - for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0']: depends_on('hsakmt-roct@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) -- cgit v1.2.3-60-g2f50