diff options
Diffstat (limited to 'var/spack')
46 files changed, 273 insertions, 92 deletions
diff --git a/var/spack/repos/builtin/packages/atmi/package.py b/var/spack/repos/builtin/packages/atmi/package.py index 29026d02d7..c79bef5c8c 100644 --- a/var/spack/repos/builtin/packages/atmi/package.py +++ b/var/spack/repos/builtin/packages/atmi/package.py @@ -19,6 +19,7 @@ class Atmi(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='6a758f5a8332e6774cd8e14a4e5ce05e43b1e05298d817b4068c35fa1793d333') version('5.0.2', sha256='3aea040f5a246539ab118f2183cf3e802a21e0e6215a53025eda77f382341747') version('5.0.0', sha256='208c1773170722b60b74357e264e698df5871e9d9d490d64011e6ea76750d9cf') version('4.5.2', sha256='c235cfb8bdd89deafecf9123264217b8cc5577a5469e3e1f24587fa820d0792e') @@ -40,7 +41,8 @@ class Atmi(CMakePackage): depends_on('rsync') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', - '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('comgr@' + ver, type='link', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) depends_on('elf', 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 9706ccd6a6..f8d3fc2fb7 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -19,6 +19,7 @@ class Comgr(CMakePackage): version('master', branch='amd-stg-open') + version('5.1.0', sha256='1cdcfe5acb768ef50fb0026d4ee7ba01e615251ad3c27bb2593cdcf8c070a894') version('5.0.2', sha256='20d733f70d8edb573d8c92707f663d7d46dcaff08026cd6addbb83266679f92a') version('5.0.0', sha256='da1bbc694bd930a504406eb0a0018c2e317d8b2c136fb2cab8de426870efe9a8') version('4.5.2', sha256='e45f387fb6635fc1713714d09364204cd28fea97655b313c857beb1f8524e593') @@ -51,7 +52,7 @@ class Comgr(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', - 'master']: + '5.1.0', 'master']: # llvm libs are linked statically, so this *could* be a build dep depends_on('llvm-amdgpu@' + ver, 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 7d000cf469..15a363f4e7 100644 --- a/var/spack/repos/builtin/packages/hip-rocclr/package.py +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -26,6 +26,7 @@ class HipRocclr(CMakePackage): return url.format(version) version('master', branch='main') + version('5.1.0', sha256='f4f265604b534795a275af902b2c814f416434d9c9e16db81b3ed5d062187dfa') version('5.0.2', sha256='34decd84652268dde865f38e66f8fb4750a08c2457fea52ad962bced82a03e5e') version('5.0.0', sha256='6b72faf8819628a5c109b2ade515ab9009606d10f11316f0d7e4c4c998d7f724') version('4.5.2', sha256='6581916a3303a31f76454f12f86e020fb5e5c019f3dbb0780436a8f73792c4d1') @@ -50,7 +51,7 @@ class HipRocclr(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', - 'master']: + '5.1.0', 'master']: depends_on('hsakmt-roct@' + ver, when='@' + ver) depends_on('hsa-rocr-dev@' + ver, when='@' + ver) depends_on('comgr@' + ver, when='@' + ver) @@ -69,6 +70,7 @@ class HipRocclr(CMakePackage): # Add opencl sources thru the below for d_version, d_shasum in [ + ('5.1.0', '362d81303048cf7ed5d2f69fb65ed65425bc3da4734fff83e3b8fbdda51b0927'), ('5.0.2', '3edb1992ba28b4a7f82dd66fbd121f62bd859c1afb7ceb47fa856bd68feedc95'), ('5.0.0', '2aa3a628b336461f83866c4e76225ef5338359e31f802987699d6308515ae1be'), ('4.5.2', '96b43f314899707810db92149caf518bdb7cf39f7c0ad86e98ad687ffb0d396d'), diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 432efa5bb9..cbf933a2e8 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -20,6 +20,7 @@ class Hip(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala', 'haampie'] version('master', branch='master') + version('5.1.0', sha256='47e542183699f4005c48631d96f6a1fbdf27e07ad3402ccd7b5f707c2c602266') version('5.0.2', sha256='e23601e6f4f62083899ea6356fffbe88d1deb20fa61f2c970e3c0474cd8886ca') version('5.0.0', sha256='ae12fcda2d955f04a51c9e794bdb0fa96539cda88b6de8e377850e68e7c2a781') version('4.5.2', sha256='c2113dc3c421b8084cd507d91b6fbc0170765a464b71fb0d96bb875df368f160') @@ -46,7 +47,8 @@ class Hip(CMakePackage): '4.2.0', '4.3.0', '4.3.1']: depends_on('hip-rocclr@' + ver, when='@' + ver) for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', - '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('hsakmt-roct@' + ver, when='@' + ver) depends_on('hsa-rocr-dev@' + ver, when='@' + ver) depends_on('comgr@' + ver, when='@' + ver) @@ -60,6 +62,7 @@ class Hip(CMakePackage): # Add hip-amd sources thru the below for d_version, d_shasum in [ + ('5.1.0', '77984854bfe00f938353fe4c7604d09967eaf5c609d05f1e6423d3c3dea86e61'), ('5.0.2', '80e7268dd22eba0f2f9222932480dede1d80e56227c0168c6a0cc8e4f23d3b76'), ('5.0.0', 'cbd95a577abfd7cbffee14a4848f7789a417c6e5e5a713f42eb75d7948abcdf9'), ('4.5.2', 'b6f35b1a1d0c466b5af28e26baf646ae63267eccc4852204db1e0c7222a39ce2'), @@ -76,6 +79,7 @@ class Hip(CMakePackage): ) # Add opencl sources thru the below for d_version, d_shasum in [ + ('5.1.0', '362d81303048cf7ed5d2f69fb65ed65425bc3da4734fff83e3b8fbdda51b0927'), ('5.0.2', '3edb1992ba28b4a7f82dd66fbd121f62bd859c1afb7ceb47fa856bd68feedc95'), ('5.0.0', '2aa3a628b336461f83866c4e76225ef5338359e31f802987699d6308515ae1be'), ('4.5.2', '96b43f314899707810db92149caf518bdb7cf39f7c0ad86e98ad687ffb0d396d'), @@ -91,6 +95,7 @@ class Hip(CMakePackage): when='@{0}'.format(d_version) ) for d_version, d_shasum in [ + ('5.1.0', 'f4f265604b534795a275af902b2c814f416434d9c9e16db81b3ed5d062187dfa'), ('5.0.2', '34decd84652268dde865f38e66f8fb4750a08c2457fea52ad962bced82a03e5e'), ('5.0.0', '6b72faf8819628a5c109b2ade515ab9009606d10f11316f0d7e4c4c998d7f724'), ('4.5.2', '6581916a3303a31f76454f12f86e020fb5e5c019f3dbb0780436a8f73792c4d1'), @@ -113,7 +118,7 @@ class Hip(CMakePackage): # string. patch('0001-Make-it-possible-to-specify-the-package-folder-of-ro.patch', when='@3.5.0:4.5.3') patch('0010-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host.5.0.0.patch', when='@5.0.0') - patch('0011-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host.5.0.2.patch', when='@5.0.2') + patch('0011-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host.5.0.2.patch', when='@5.0.2:') # See https://github.com/ROCm-Developer-Tools/HIP/pull/2141 patch('0002-Fix-detection-of-HIP_CLANG_ROOT.patch', when='@:3.9.0') diff --git a/var/spack/repos/builtin/packages/hipblas/package.py b/var/spack/repos/builtin/packages/hipblas/package.py index 3a2963e2b9..66b45f71a9 100644 --- a/var/spack/repos/builtin/packages/hipblas/package.py +++ b/var/spack/repos/builtin/packages/hipblas/package.py @@ -19,6 +19,7 @@ class Hipblas(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala', 'haampie'] libraries = ['libhipblas.so'] + version('5.1.0', sha256='22faba3828e50a4c4e22f569a7d6441c797a11db1d472619c01d3515a3275e92') version('5.0.2', sha256='201772bfc422ecb2c50e898dccd7d3d376cf34a2b795360e34bf71326aa37646') version('5.0.0', sha256='63cffe748ed4a86fc80f408cb9e8a9c6c55c22a2b65c0eb9a76360b97bbb9d41') version('4.5.2', sha256='82dd82a41bbadbb2a91a2a44a5d8e0d2e4f36d3078286ed4db3549b1fb6d6978') @@ -44,7 +45,7 @@ class Hipblas(CMakePackage): patch('link-clients-blas.patch', when='@4.3.0:4.3.2') patch('link-clients-blas-4.5.0.patch', when='@4.5.0:4.5.2') - patch('hipblas-link-clients-blas-5.0.0.patch', when='@5.0.0:') + patch('hipblas-link-clients-blas-5.0.0.patch', when='@5.0.0:5.0.2') def check(self): exe = join_path(self.build_directory, 'clients', 'staging', 'hipblas-test') @@ -52,7 +53,7 @@ class Hipblas(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('rocsolver@' + ver, when='@' + ver) depends_on('rocblas@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/hipcub/package.py b/var/spack/repos/builtin/packages/hipcub/package.py index 3cec7df08b..a547dac83f 100644 --- a/var/spack/repos/builtin/packages/hipcub/package.py +++ b/var/spack/repos/builtin/packages/hipcub/package.py @@ -15,6 +15,7 @@ class Hipcub(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='b30d51fc5fca2584f0c9a6fa8dafc9fbdda96a3acff30288e49b397f8842f705') version('5.0.2', sha256='22effb18f2c38d76fa379f14c9f9ee7a11987a5d1ae4a7e837af87232c8c9183') version('5.0.0', sha256='09c4f1b88aa5f50f04043d379e4960dab556e0fbdf8e25ab03d02a07c1ff7b2f') version('4.5.2', sha256='bec9ba1a6aa0475475ee292e54807accc839ed001338275f48da13e3bfb77514') @@ -38,7 +39,7 @@ class Hipcub(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('rocprim@' + ver, when='@' + ver) depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py index 6736199d5b..6d4ca53e4b 100644 --- a/var/spack/repos/builtin/packages/hipfft/package.py +++ b/var/spack/repos/builtin/packages/hipfft/package.py @@ -22,6 +22,7 @@ class Hipfft(CMakePackage): version('master', branch='master') + version('5.1.0', sha256='1bac7761c055355216cd262cdc0450aabb383addcb739b56ba849b2e6e013fa5') version('5.0.2', sha256='9ef64694f5def0d6fb98dc89e46d7a3f7d005a61348ac0b52184a3b8e84c2383') version('5.0.0', sha256='867d0bdc6c9769c6cebc0c4594b24d5f3504157cdcef97a6a1668dd493ca6a15') version('4.5.2', sha256='32ba6a5f50cfede3777a43794371ffb1363302131d8a0382d96df90ed7bc911a') @@ -36,7 +37,7 @@ class Hipfft(CMakePackage): depends_on('cmake@3.5:', type='build') for ver in ['4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) depends_on('hip@' + ver, when='@' + ver) depends_on('rocfft@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/hipfort/package.py b/var/spack/repos/builtin/packages/hipfort/package.py index 9920243209..e114bb3c0b 100644 --- a/var/spack/repos/builtin/packages/hipfort/package.py +++ b/var/spack/repos/builtin/packages/hipfort/package.py @@ -15,6 +15,7 @@ class Hipfort(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='1ddd46c00bb6bcd539a921d6a94d858f4e4408a35cb6910186c7517f375ae8ab') version('5.0.2', sha256='fcee6e62482ab15f365681dbc12bd9ae26b0fab2f2848a3c14de8ec63004a7aa') version('5.0.0', sha256='af0f332fec082a03ca0403618ab20d31baadf3103e3371db9edc39dc9474ef4c') version('4.5.2', sha256='14599d027b57189c6734b04ace7792d2ae5c409cf7983c0970b086fb4e634dd8') @@ -36,7 +37,7 @@ class Hipfort(CMakePackage): for ver in ['3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('hip@' + ver, type='build', when='@' + ver) def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/hipify-clang/package.py b/var/spack/repos/builtin/packages/hipify-clang/package.py index 57e05de86f..119f42099c 100644 --- a/var/spack/repos/builtin/packages/hipify-clang/package.py +++ b/var/spack/repos/builtin/packages/hipify-clang/package.py @@ -17,6 +17,7 @@ class HipifyClang(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] version('master', branch='master') + version('5.1.0', sha256='ba792294cbdcc880e0f02e38ee352dff8d4a2c183430e13d1c5ed176bd46cfc5') version('5.0.2', sha256='812bccfeb044483a1c7df89f45843afcb28d8146f348c792f082b693cbff3984') version('5.0.0', sha256='06fbb3259b6d014bc24fb3c05f71026bc39ae564559d40f2ca37236044c7ba17') version('4.5.2', sha256='f0d401e634642a1d6659b9163a38661ee38da1e1aceabb1f16f78f8fce048a4e') @@ -37,5 +38,5 @@ class HipifyClang(CMakePackage): depends_on('cmake@3.5:', type='build') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', - 'master']: + '5.1.0', 'master']: depends_on('llvm-amdgpu@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/hipsolver/package.py b/var/spack/repos/builtin/packages/hipsolver/package.py index 047f4b9e5c..7100b2918e 100644 --- a/var/spack/repos/builtin/packages/hipsolver/package.py +++ b/var/spack/repos/builtin/packages/hipsolver/package.py @@ -20,6 +20,7 @@ class Hipsolver(CMakePackage): maintainers = ['srekolam'] + version('5.1.0', sha256='697ba2b2814e7ac6f79680e6455b4b5e0def1bee2014b6940f47be7d13c0ae74') version('5.0.2', sha256='cabeada451686ed7904a452c5f8fd3776721507db1c06f426cd8d7189ff4a441') version('5.0.0', sha256='c59a5783dbbcb6a601c0e73d85d4a64d6d2c8f46009c01cb2b9886323f11e02b') version('4.5.2', sha256='9807bf1da0da25940b546cf5d5d6064d46d837907e354e10c6eeb2ef7c296a93') @@ -29,7 +30,7 @@ class Hipsolver(CMakePackage): depends_on('cmake@3.5:', type='build') - for ver in ['4.5.0', '4.5.2', '5.0.0', '5.0.2']: + for ver in ['4.5.0', '4.5.2', '5.0.0', '5.0.2', '5.1.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('rocblas@' + ver, when='@' + ver) depends_on('rocsolver@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/hipsparse/package.py b/var/spack/repos/builtin/packages/hipsparse/package.py index d4e7eba948..d1b8939bb9 100644 --- a/var/spack/repos/builtin/packages/hipsparse/package.py +++ b/var/spack/repos/builtin/packages/hipsparse/package.py @@ -16,6 +16,7 @@ class Hipsparse(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala', 'haampie'] + version('5.1.0', sha256='f41329534f2ff477a0db6b7f77a72bb062f117800970c122d676db8b207ce80b') version('5.0.2', sha256='a266e8b3bbdea04617260f51b3d85cc672af6ca417cae0812d04fd9702429c47') version('5.0.0', sha256='0a1754508e06d3a6b17593a71a3c57a3e25d3b46d88573098fda11442853196c') version('4.5.2', sha256='81ca24491fbf2bc8e5aa477a6c38776877579ac9f4241ddadeca76a579a7ebb5') @@ -38,12 +39,13 @@ class Hipsparse(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) depends_on('hip@' + ver, when='@' + ver) depends_on('rocsparse@' + ver, when='@' + ver) for ver in ['3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', - '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('rocprim@' + ver, when='@' + ver) patch('e79985dccde22d826aceb3badfc643a3227979d2.patch', when='@3.5.0') 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 9afcec0593..0944d9c85e 100644 --- a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py +++ b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py @@ -22,7 +22,7 @@ class HsaRocrDev(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala', 'haampie'] version('master', branch='master') - + version('5.1.0', sha256='a5f7245059c3d28dbc037e1e6fa3f09084e29147096dd61f7ce5560291ab330f') version('5.0.2', sha256='94ce313f3b37e6571778dc6865d73dafa798cbaf4de63b5307382c4a2418e99f') version('5.0.0', sha256='61644365ea2b09fa7ec22f3dbdb74f2b6b1daa34b180138da9e0c856006a373e') version('4.5.2', sha256='d99eddedce0a97d9970932b64b0bb4743e47d2740e8db0288dbda7bec3cefa80') @@ -51,7 +51,7 @@ class HsaRocrDev(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2', 'master']: + '5.0.2', '5.1.0', 'master']: depends_on('hsakmt-roct@' + ver, when='@' + ver) depends_on('llvm-amdgpu@' + ver, when='@' + ver) # allow standalone rocm-device-libs (useful for aomp) diff --git a/var/spack/repos/builtin/packages/hsakmt-roct/package.py b/var/spack/repos/builtin/packages/hsakmt-roct/package.py index 1b07f7738d..23b6ee8787 100644 --- a/var/spack/repos/builtin/packages/hsakmt-roct/package.py +++ b/var/spack/repos/builtin/packages/hsakmt-roct/package.py @@ -19,6 +19,7 @@ class HsakmtRoct(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] version('master', branch='master') + version('5.1.0', sha256='032717e80b1aefed59f11399e575564ee86ee7c125e889f7c79c2afdfab1eb93') version('5.0.2', sha256='f2a27ac18aada1dc0dba6455beb7dd7d88a4457c1917024ea372fecb03356e97') version('5.0.0', sha256='1d803572eac0d6186260b5671268bad7513aa9433f9c2e99f14c8bf766c02122') version('4.5.2', sha256='fb8e44226b9e393baf51bfcb9873f63ce7e4fcf7ee7f530979cf51857ea4d24b') diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index df2365e516..5952002e4b 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -20,7 +20,7 @@ class LlvmAmdgpu(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala', 'haampie'] version('master', branch='amd-stg-open') - + version('5.1.0', sha256='db5d45c4a7842a908527c1b7b8d4a40c688225a41d23cfa382eab23edfffdd10') version('5.0.2', sha256='99a14394b406263576ed3d8d10334de7c78d42b349109f375d178b11492eecaf') version('5.0.0', sha256='bca2db4aaab71541cac588d6a708fde60f0ebe744809bde8a3847044a1a77413') version('4.5.2', sha256='36a4f7dd961cf373b743fc679bdf622089d2a905de2cfd6fd6c9e7ff8d8ad61f') @@ -81,6 +81,7 @@ class LlvmAmdgpu(CMakePackage): # Add device libs sources so they can be an external LLVM project for d_version, d_shasum in [ + ('5.1.0', '47dbcb41fb4739219cadc9f2b5f21358ed2f9895ce786d2f7a1b2c4fd044d30f'), ('5.0.2', '49cfa8f8fc276ba27feef40546788a2aabe259a924a97af8bef24e295d19aa5e'), ('5.0.0', '83ed7aa1c9322b4fc1f57c48a63fc7718eb4195ee6fde433009b4bc78cb363f0'), ('4.5.2', '50e9e87ecd6b561cad0d471295d29f7220e195528e567fcabe2ec73838979f61'), diff --git a/var/spack/repos/builtin/packages/migraphx/package.py b/var/spack/repos/builtin/packages/migraphx/package.py index e40d5e69f6..1406a31da3 100644 --- a/var/spack/repos/builtin/packages/migraphx/package.py +++ b/var/spack/repos/builtin/packages/migraphx/package.py @@ -15,6 +15,7 @@ class Migraphx(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='6398efaef18a74f2a475aa21bd34bc7c077332a430ee3f6ba4fde6e6a6aa9f89') version('5.0.2', sha256='3ef48ac03b909d1a1aa1f91f365ce64af2ce66635b6efb5ad0b207dc51ff2fd6') version('5.0.0', sha256='779a91ccfa4c2576251189f0c646ff7707c3646319c7d5dd137872beb52d2953') version('4.5.2', sha256='ecfd9a8e7967076f056d5b6a90b22f8919b82226443769b181193f16ebf58b83') @@ -55,7 +56,8 @@ class Migraphx(CMakePackage): depends_on('py-pybind11@2.6:', type='build', when='@4.1.0:') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', - '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) depends_on('hip@' + ver, when='@' + ver) depends_on('llvm-amdgpu@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index 69c7fd4025..955b380b53 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -17,6 +17,7 @@ class MiopenHip(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='bb50201334d68addf153b84b88ab803027c4913d71bdbda6f5ccde3f672f6fdd') version('5.0.2', sha256='e73c18c6e0791d6ca8958508d899072ce12fc6c27cf78792d0c2a5c7e34427be') version('5.0.0', sha256='4a46a2bdd11a2597c83cdb0c5e208b81728fab2ff7c585dabfca5aa05ee7a4f7') version('4.5.2', sha256='cb49bdf215ed9881755239b6312d72f829c1a0edf510e6d1fbb206c41f5406fc') @@ -47,16 +48,19 @@ class MiopenHip(CMakePackage): depends_on('half') depends_on('zlib', when='@3.9.0:') - patch('0001-Add-rocm-path-and-rocm-device-lib-path-flags.patch', when='@3.9.0:') + patch('0001-Add-rocm-path-and-rocm-device-lib-path-flags.patch', when='@3.9.0:5.0.2') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) depends_on('hip@' + ver, when='@' + ver) depends_on('rocm-clang-ocl@' + ver, when='@' + ver) depends_on('rocblas@' + ver, when='@' + ver) + for ver in ['5.1.0']: + depends_on('mlirmiopen@' + ver, when='@' + ver) + def setup_build_environment(self, env): if '@3.9.0:' in self.spec: lib_dir = self.spec['zlib'].libs.directories[0] @@ -88,4 +92,7 @@ class MiopenHip(CMakePackage): self.define('HIP_PREFIX_PATH', spec['hip'].prefix), self.define('DEVICELIBS_PREFIX_PATH', self.get_bitcode_dir()) ] + if self.spec.satisfies('@5.1.0:'): + mlir_inc = spec['mlirmiopen'].prefix.include + args.append(self.define('CMAKE_CXX_FLAGS', '-I{0}'.format(mlir_inc))) return args diff --git a/var/spack/repos/builtin/packages/miopen-opencl/package.py b/var/spack/repos/builtin/packages/miopen-opencl/package.py index 0170119bb0..02406e8161 100644 --- a/var/spack/repos/builtin/packages/miopen-opencl/package.py +++ b/var/spack/repos/builtin/packages/miopen-opencl/package.py @@ -17,6 +17,7 @@ class MiopenOpencl(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='bb50201334d68addf153b84b88ab803027c4913d71bdbda6f5ccde3f672f6fdd') version('5.0.2', sha256='e73c18c6e0791d6ca8958508d899072ce12fc6c27cf78792d0c2a5c7e34427be') version('5.0.0', sha256='4a46a2bdd11a2597c83cdb0c5e208b81728fab2ff7c585dabfca5aa05ee7a4f7') version('4.5.2', sha256='cb49bdf215ed9881755239b6312d72f829c1a0edf510e6d1fbb206c41f5406fc') @@ -45,20 +46,23 @@ class MiopenOpencl(CMakePackage): depends_on('bzip2', type='link') depends_on('sqlite', type='link') depends_on('half', type='build') - depends_on('miopengemm@1.1.6', type='link', when='@3.5.0') + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) depends_on('hip@' + ver, when='@' + ver) depends_on('rocm-opencl@' + ver, when='@' + ver) for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('miopengemm@' + ver, when='@' + ver) + for ver in ['5.1.0']: + depends_on('mlirmiopen@' + ver, when='@' + ver) + def cmake_args(self): args = [ self.define('MIOPEN_BACKEND', 'OpenCL'), diff --git a/var/spack/repos/builtin/packages/miopengemm/package.py b/var/spack/repos/builtin/packages/miopengemm/package.py index ed523729d5..5f0b163b9a 100644 --- a/var/spack/repos/builtin/packages/miopengemm/package.py +++ b/var/spack/repos/builtin/packages/miopengemm/package.py @@ -22,6 +22,7 @@ class Miopengemm(CMakePackage): url = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/archive/rocm-{0}.tar.gz" return url.format(version) + version('5.1.0', sha256='e2b20cdc20a745bcb7a554852e6b4bd39274c7dcc13fc19a81a282fb4dfa475f') version('5.0.2', sha256='64a6bf7c902af63d85563e29361763e9daa1fd3699490a91c222b057673612cc') version('5.0.0', sha256='122cfb4e79476092e84f73f48540701c90fb87e0dc20cdf39f202d92e9ff5544') version('4.5.2', sha256='e778e0ccb123cd637ac459b2aecdf0fdead158580479bc0adfc9a28879e1d1c9') @@ -45,6 +46,6 @@ class Miopengemm(CMakePackage): for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) depends_on('rocm-opencl@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/mivisionx/package.py b/var/spack/repos/builtin/packages/mivisionx/package.py index 376a0e1514..b22c7ef19a 100644 --- a/var/spack/repos/builtin/packages/mivisionx/package.py +++ b/var/spack/repos/builtin/packages/mivisionx/package.py @@ -24,6 +24,7 @@ class Mivisionx(CMakePackage): url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-{0}.tar.gz" return url.format(version) + version('5.1.0', sha256='e082415cc2fb859c53a6d6e5d72ca4529f6b4d56a4abe274dc374faaa5910513') version('5.0.2', sha256='da730c2347b7f2d0cb7a262f8305750988f18e9f1eb206cf297bacaab2f6b408') version('5.0.0', sha256='935113feb71eced2b5f21fffc2a90a188b4ef2fe009c50f0445504cb27fbc58c') version('4.5.2', sha256='26fd7fbd2e319bf4a8657900ad2f81bba1ae66745c2ba95f2f87e33903cfe69c') @@ -40,6 +41,7 @@ class Mivisionx(CMakePackage): version('1.7', sha256='ff77142fd4d4a93136fd0ac17348861f10e8f5d5f656fa9dacee08d8fcd2b1d8', deprecated=True) variant('build_type', default='Release', values=("Release", "Debug", "RelWithDebInfo"), description='CMake build type') + variant('backend', default='OPENCL', values=("HIP", "OPENCL"), description='backend type') def patch(self): if '@4.2.0' in self.spec: @@ -56,6 +58,14 @@ class Mivisionx(CMakePackage): self.spec['miopen-hip'].prefix.miopen, 'amd_openvx_extensions/CMakeLists.txt', string=True) + filter_file('${ROCM_PATH}/bin', + self.spec['hip'].prefix.bin, + 'amd_openvx/openvx/hipvx/CMakeLists.txt', + string=True) + filter_file('${ROCM_PATH}/bin', + self.spec['hip'].prefix.bin, + 'amd_openvx_extensions/amd_nn/nn_hip/CMakeLists.txt', + string=True) def flag_handler(self, name, flags): spec = self.spec @@ -77,17 +87,20 @@ class Mivisionx(CMakePackage): for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('rocm-opencl@' + ver, when='@' + ver) depends_on('miopengemm@' + ver, when='@' + ver) depends_on('miopen-opencl@' + ver, when='@' + ver) - for ver in ['4.5.0', '4.5.2', '5.0.0', '5.0.2']: + for ver in ['4.5.0', '4.5.2', '5.0.0', '5.0.2', '5.1.0']: depends_on('miopen-hip@' + ver, when='@' + ver) def cmake_args(self): spec = self.spec protobuf = spec['protobuf'].prefix.include args = [ - self.define('CMAKE_CXX_FLAGS', '-I{0}'.format(protobuf)) + self.define('CMAKE_CXX_FLAGS', '-I{0}'.format(protobuf)), + self.define_from_variant('BACKEND', 'backend'), + self.define('HIP_PATH', spec['hip'].prefix), + self.define('HSA_PATH', spec['hsa-rocr-dev'].prefix) ] return args diff --git a/var/spack/repos/builtin/packages/mlirmiopen/package.py b/var/spack/repos/builtin/packages/mlirmiopen/package.py new file mode 100644 index 0000000000..ca05f543da --- /dev/null +++ b/var/spack/repos/builtin/packages/mlirmiopen/package.py @@ -0,0 +1,56 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack import * + + +class Mlirmiopen(CMakePackage): + """Multi-Level Intermediate Representation for rocm miopen project.""" + + homepage = "https://github.com/ROCmSoftwarePlatform/llvm-project-mlir" + url = "https://github.com/ROCmSoftwarePlatform/llvm-project-mlir/archive/release/rocm-5.1.0.tar.gz" + git = "https://github.com/ROCmSoftwarePlatform/llvm-project-mlir.git" + + maintainers = ['srekolam'] + version('5.1.0', sha256='43af5f131bd688c00250fd60ac51f175ed9ce84af5dc72365ea8108dccbaf583') + + variant('build_type', default='Release', values=("Release", "Debug", "RelWithDebInfo"), description='CMake build type') + + depends_on('python', type='build') + depends_on('z3', type='link') + depends_on('zlib', type='link') + depends_on('ncurses+termlib', type='link') + depends_on('bzip2') + depends_on('sqlite') + depends_on('half') + depends_on('pkgconfig', type='build') + + for ver in ['5.1.0']: + depends_on('hip@' + ver, when='@' + ver) + depends_on('llvm-amdgpu@' + ver, when='@' + ver) + depends_on('hsa-rocr-dev@' + ver, when='@' + ver) + depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) + + def cmake_args(self): + spec = self.spec + llvm_projects = [ + 'mlir', + 'lld' + ] + args = [ + self.define( + 'CMAKE_CXX_COMPILER', + '{0}/bin/clang++'.format(spec['llvm-amdgpu'].prefix) + ), + self.define( + 'CMAKE_C_COMPILER', + '{0}/bin/clang'.format(spec['llvm-amdgpu'].prefix) + ), + self.define('HIP_PATH', spec['hip'].prefix), + self.define('BUILD_FAT_LIBMLIRMIOPEN', 'ON') + ] + args.extend([self.define('LLVM_ENABLE_PROJECTS', ';'.join(llvm_projects))]) + return args diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index f355c1626c..6b81b506a3 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -21,6 +21,7 @@ class Rccl(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] libraries = ['librccl.so'] + version('5.1.0', sha256='02b0180857e615326f9cab775573436b9162899ad8e526830f54392b8a51b1f5') version('5.0.2', sha256='a2377ad2332b93d3443a8ee74f4dd9f965ae8cbbfad473f8f57ca17905389a39') version('5.0.0', sha256='80eb70243f11b80e215458a67c278cd5a655f6e486289962b92ba3504e50af5c') version('4.5.2', sha256='36de0d3f3ffad491758d89c208ef72c5be5e0db766053a9c766e9c5c6a33a487') @@ -49,16 +50,16 @@ class Rccl(CMakePackage): depends_on('cmake@3.5:', type='build') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) depends_on('hip@' + ver, when='@' + ver) depends_on('comgr@' + ver, when='@' + ver) depends_on('hsa-rocr-dev@' + ver, when='@' + ver) for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', - '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', '5.1.0']: depends_on('numactl@2:', when='@' + ver) - for ver in ['4.5.0', '4.5.2', '5.0.0', '5.0.2']: + for ver in ['4.5.0', '4.5.2', '5.0.0', '5.0.2', '5.1.0']: depends_on('rocm-smi-lib@' + ver, when='@' + ver) @classmethod diff --git a/var/spack/repos/builtin/packages/rdc/package.py b/var/spack/repos/builtin/packages/rdc/package.py index cc1e387c7d..282843b711 100644 --- a/var/spack/repos/builtin/packages/rdc/package.py +++ b/var/spack/repos/builtin/packages/rdc/package.py @@ -22,6 +22,7 @@ class Rdc(CMakePackage): url = "https://github.com/RadeonOpenCompute/rdc/archive/rocm-{0}.tar.gz" return url.format(version) + version('5.1.0', sha256='3cf58cb07ef241b3b73b23af83b6477194884feba642584a491e67deeceff038') version('5.0.2', sha256='9e21fe7e9dd02b69425dab6be22a85469fee072bcebd2d2957633dfad8b45574') version('5.0.0', sha256='68d45a319dc4222d94e1fb1ce10df5f3464de0b745d0d2e9aebbf273493adcc5') version('4.5.2', sha256='1b467e2a473374488292ca1680562ec4e798f43847ea6464453f8f8297f12d8d') @@ -44,10 +45,11 @@ class Rdc(CMakePackage): depends_on('libcap', type=('build', 'link')) for ver in ['3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', - '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('rocm-smi-lib@' + ver, type=('build', 'link'), when='@' + ver) - for ver in ['5.0.0', '5.0.2']: + for ver in ['5.0.0', '5.0.2', '5.1.0']: depends_on('hsa-rocr-dev@' + ver, when='@' + ver) def patch(self): diff --git a/var/spack/repos/builtin/packages/rocalution/package.py b/var/spack/repos/builtin/packages/rocalution/package.py index 477e5e6419..adaf2c84a3 100644 --- a/var/spack/repos/builtin/packages/rocalution/package.py +++ b/var/spack/repos/builtin/packages/rocalution/package.py @@ -22,6 +22,7 @@ class Rocalution(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='d9122189103ebafe7ec5aeb50e60f3e02af5c2747021f9071aab91e7f875c29e') version('5.0.2', sha256='b01adaf858b9c3683523b087a55fafb655864f5db8e2a1acdbf588f53d6972e2') version('5.0.0', sha256='df9e7eacb8cc1bd5c7c4071b20356a885ee8ae13e6ab5afdabf88a272ab32c7e') version('4.5.2', sha256='8be38922320cd9d4fc465a30f0322843849f62c0c7dad2bdbe52290a1b69d2a0') @@ -47,7 +48,7 @@ class Rocalution(CMakePackage): depends_on('cmake@3.5:', type='build') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('hip@' + ver, when='@' + ver) for tgt in itertools.chain(['auto'], amdgpu_targets): rocblas_tgt = tgt if tgt != 'gfx900:xnack-' else 'gfx900' @@ -63,7 +64,7 @@ class Rocalution(CMakePackage): for ver in ['3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: for tgt in itertools.chain(['auto'], amdgpu_targets): depends_on('rocrand@{0} amdgpu_target={1}'.format(ver, tgt), when='@{0} amdgpu_target={1}'.format(ver, tgt)) diff --git a/var/spack/repos/builtin/packages/rocblas/package.py b/var/spack/repos/builtin/packages/rocblas/package.py index a33251c4f4..70def320dd 100644 --- a/var/spack/repos/builtin/packages/rocblas/package.py +++ b/var/spack/repos/builtin/packages/rocblas/package.py @@ -16,6 +16,7 @@ class Rocblas(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala', 'haampie'] + version('5.1.0', sha256='efa0c424b5ada697314aa8a78c19c93ade15f1612c4bfc8c53d71d1c9719aaa3') version('5.0.2', sha256='358a0902fc279bfc80205659a90e96269cb7d83a80386b121e4e3dfe221fec23') version('5.0.0', sha256='4b01fba937ada774f09c7ccb5e9fdc66e1a5d46c130be833e3706e6b5841b1da') version('4.5.2', sha256='15d725e38f91d1ff7772c4204b97c1515af58fa7b8ec2a2014b99b6d337909c4') @@ -67,7 +68,8 @@ class Rocblas(CMakePackage): self.run_test(exe, options=['--gtest_filter=*quick*-*known_bug*']) for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', - '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('llvm-amdgpu@' + ver, when='@' + ver) depends_on('rocminfo@' + ver, type='build', when='@' + ver) @@ -77,7 +79,7 @@ class Rocblas(CMakePackage): depends_on('rocm-smi@' + ver, type='build', when='@' + ver) for ver in ['4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', - '5.0.0', '5.0.2']: + '5.0.0', '5.0.2', '5.1.0']: depends_on('rocm-smi-lib@' + ver, type='build', when='@' + ver) # This is the default library format since 3.7.0 @@ -105,7 +107,8 @@ class Rocblas(CMakePackage): ('@4.5.0', '0f6a6d1557868d6d563cb1edf167c32c2e34fda0'), ('@4.5.2', '0f6a6d1557868d6d563cb1edf167c32c2e34fda0'), ('@5.0.0', '75b9aefe5981d85d1df32ddcebf32dab52bfdabd'), - ('@5.0.2', '75b9aefe5981d85d1df32ddcebf32dab52bfdabd') + ('@5.0.2', '75b9aefe5981d85d1df32ddcebf32dab52bfdabd'), + ('@5.1.0', 'ea38f8661281a37cd81c96cc07868e3f07d2c4da') ]: resource(name='Tensile', git='https://github.com/ROCmSoftwarePlatform/Tensile.git', diff --git a/var/spack/repos/builtin/packages/rocfft/package.py b/var/spack/repos/builtin/packages/rocfft/package.py index 173c24ce67..52952aec77 100644 --- a/var/spack/repos/builtin/packages/rocfft/package.py +++ b/var/spack/repos/builtin/packages/rocfft/package.py @@ -16,6 +16,7 @@ class Rocfft(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala', 'haampie'] + version('5.1.0', sha256='dc11c9061753ae43a9d5db9c4674aa113a8adaf50818b2701cbb940894147f68') version('5.0.2', sha256='30d4bd5fa85185ddafc69fa6d284edd8033c9d77d1e351fa328267242995eb0a') version('5.0.0', sha256='c16374dac2f85fbaf145511653e93f6db3151425ce39b282187745c716b67405') version('4.5.2', sha256='2724118ca00b9e97ac9578fe0b7e64a82d86c4fb0246d0da88d8ddd9c608b1e1') @@ -47,7 +48,7 @@ class Rocfft(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py index 6cb363650b..0f0105ea88 100644 --- a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py +++ b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py @@ -17,6 +17,7 @@ class RocmBandwidthTest(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] version('master', branch='master') + version('5.1.0', sha256='18fe51f0ba61760fc89ffc81f737fd4fa20fb4b00df3f35145be77c3e0a6162b') version('5.0.2', sha256='c93f7dbb37233aa32d81057fa8b3fa88d7c7be9b7916430b5ffc701600a5ff45') version('5.0.0', sha256='b33c6a12ad8de1d7ea9b8b380b8fa5db6b601ed426c3d3940134863f7d10740f') version('4.5.2', sha256='559ca7ef582d81047c5dd5a908f3989cb2694e89577f7f556214e324ba65e75e') @@ -38,7 +39,7 @@ class RocmBandwidthTest(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', - 'master']: + '5.1.0', 'master']: depends_on('hsa-rocr-dev@' + ver, when='@' + ver) depends_on('hsakmt-roct@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py index aeb738b129..31efe8e441 100644 --- a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py +++ b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py @@ -16,6 +16,7 @@ class RocmClangOcl(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] version('master', branch='master') + version('5.1.0', sha256='38d9e2e98cff1a262fdd45c3239fd76a9f6ad5eff38a31aa19c3bb0faea53375') version('5.0.2', sha256='5e8f39200227388817024ee7ce46a996e43e433ed308f8d5e8e4c03629d8a5e7') version('5.0.0', sha256='0dff230754b790a417eb3d6be6f50c3727f944e0157686100354eba1e47d30f3') version('4.5.2', sha256='8cc7b8658e81ef378c16bbb00fc6b29140c850da70adc4e520ecec9b4517beb8') @@ -37,7 +38,7 @@ class RocmClangOcl(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', - 'master']: + '5.1.0', 'master']: depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) depends_on('llvm-amdgpu@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocm-cmake/package.py b/var/spack/repos/builtin/packages/rocm-cmake/package.py index 44d4ed3abe..7a88be056d 100644 --- a/var/spack/repos/builtin/packages/rocm-cmake/package.py +++ b/var/spack/repos/builtin/packages/rocm-cmake/package.py @@ -13,12 +13,13 @@ 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.0.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-5.1.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] version('master', branch='master') + version('5.1.0', sha256='2eff47b7cf5bd56d465ff3c110eb936d31860df60182a82ba511ba11bbcf23fc') version('5.0.2', sha256='86a4ae0f84dcf5be95a252295eb732d6a7a271297eed37800a9d492c16474d0c') version('5.0.0', sha256='45eb958fac33aafea86fb498127ebf8f567646ce9d7288d46afbd087500553a1') version('4.5.2', sha256='85f2ef51327e4b09d81a221b4ad31c97923dabc1bc8ff127dd6c570742185751') diff --git a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py index 461e9f3434..6cf24b7e8c 100644 --- a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py +++ b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py @@ -20,6 +20,7 @@ class RocmDbgapi(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] version('master', branch='amd-master') + version('5.1.0', sha256='406db4b20bda12f6f32cbef88b03110aa001bf7bef6676f36e909b53c8354e43') version('5.0.2', sha256='b7554dfe96bda6c2ee762ad6e3e5f91f0f52b5a525e3fb29d5e1fe6f003652b5') version('5.0.0', sha256='cff72d7fe43ff791c4117fe87d57314cbebdbcb70002a0411b8a44761012a495') version('4.5.2', sha256='9fa574e8389ef69d116caf714af2f938777e0aeeaadd7fad451cf5d2e6699c6e') @@ -41,7 +42,7 @@ class RocmDbgapi(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2', 'master']: + '5.0.2', '5.1.0', 'master']: depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type=('build', 'link'), when='@' + ver) 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 aa1f7d5c58..a01c1c9abf 100644 --- a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py +++ b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py @@ -16,6 +16,7 @@ class RocmDebugAgent(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='e0ceeef575d8645385bc6e4c9c3accaa192a93c42d83545cf5626c848f59806b') version('5.0.2', sha256='4ec3cdedc4ba774d05c3dc972186b3181b3aa823af08f3843238961d5ef90e57') version('5.0.0', sha256='fb8ebe136bfa815116453bdcb4afb9617ab488f54501434c72eed9706857be3f') version('4.5.2', sha256='85c7f19485defd9a58716fffdd1a0e065ed7f779c3f124467fca18755bc634a6') @@ -46,12 +47,13 @@ class RocmDebugAgent(CMakePackage): depends_on('elfutils@:0.168', type='link') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', - '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('hsa-rocr-dev@' + ver, when='@' + ver) depends_on('hsakmt-roct@' + ver, when='@' + ver) for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', - '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', '5.1.0']: depends_on('rocm-dbgapi@' + ver, when='@' + ver) depends_on('hip@' + ver, when='@' + ver) 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 b3906a2e37..74ffe8e28f 100644 --- a/var/spack/repos/builtin/packages/rocm-device-libs/package.py +++ b/var/spack/repos/builtin/packages/rocm-device-libs/package.py @@ -18,6 +18,7 @@ class RocmDeviceLibs(CMakePackage): version('master', branch='amd-stg-open') + version('5.1.0', sha256='47dbcb41fb4739219cadc9f2b5f21358ed2f9895ce786d2f7a1b2c4fd044d30f') version('5.0.2', sha256='49cfa8f8fc276ba27feef40546788a2aabe259a924a97af8bef24e295d19aa5e') version('5.0.0', sha256='83ed7aa1c9322b4fc1f57c48a63fc7718eb4195ee6fde433009b4bc78cb363f0') version('4.5.2', sha256='50e9e87ecd6b561cad0d471295d29f7220e195528e567fcabe2ec73838979f61') @@ -49,7 +50,7 @@ class RocmDeviceLibs(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', - 'master']: + '5.1.0', 'master']: depends_on('llvm-amdgpu@' + ver, when='@' + ver) def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/rocm-gdb/package.py b/var/spack/repos/builtin/packages/rocm-gdb/package.py index 247377cd3d..6313e0364e 100644 --- a/var/spack/repos/builtin/packages/rocm-gdb/package.py +++ b/var/spack/repos/builtin/packages/rocm-gdb/package.py @@ -16,6 +16,7 @@ class RocmGdb(AutotoolsPackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='cf638149b269f838aaec59c5801098b9c0fc42f6c86a39309a8995b56978b424') version('5.0.2', sha256='0eced8cd5a2996cb4bcf254f2bd9defe24112d21c2f750e98f784ecdf94ba5c9') version('5.0.0', sha256='aa311fb557bd95e35c6e4dfd245188f35c294a93bacb77fe4d3b178b1d0097e8') version('4.5.2', sha256='e278abf50f1758ce396b26a6719d0af09a6053c195516a44ec9b2be925d79203') @@ -43,7 +44,8 @@ class RocmGdb(AutotoolsPackage): depends_on('gmp', type=('build', 'link'), when='@4.5.0:') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', - '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('rocm-dbgapi@' + ver, type='link', when='@' + ver) depends_on('comgr@' + ver, type='link', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocm-opencl/0001-fix-build-error-rocm-opencl-5.1.0.patch b/var/spack/repos/builtin/packages/rocm-opencl/0001-fix-build-error-rocm-opencl-5.1.0.patch new file mode 100644 index 0000000000..408cda8761 --- /dev/null +++ b/var/spack/repos/builtin/packages/rocm-opencl/0001-fix-build-error-rocm-opencl-5.1.0.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e5c4537..4596cb2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,6 +62,9 @@ if(DEFINED ENV{ROCM_LIBPATCH_VERSION}) + message("Using CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}") + endif() + ++if( NOT CPACK_PACKAGING_INSTALL_PREFIX ) ++ set( CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Package Installation path for OpenCL") ++endif() + #ROCM_PATH is needed to create symlink of libraries + if(NOT DEFINED ROCM_PATH) + string(REPLACE "/opencl" "" ROCM_PATH ${CPACK_PACKAGING_INSTALL_PREFIX}) diff --git a/var/spack/repos/builtin/packages/rocm-opencl/package.py b/var/spack/repos/builtin/packages/rocm-opencl/package.py index eec8bf4f61..6ca2afe24f 100644 --- a/var/spack/repos/builtin/packages/rocm-opencl/package.py +++ b/var/spack/repos/builtin/packages/rocm-opencl/package.py @@ -22,6 +22,8 @@ class RocmOpencl(CMakePackage): return url.format(version) version('master', branch='main') + + version('5.1.0', sha256='362d81303048cf7ed5d2f69fb65ed65425bc3da4734fff83e3b8fbdda51b0927') version('5.0.2', sha256='3edb1992ba28b4a7f82dd66fbd121f62bd859c1afb7ceb47fa856bd68feedc95') version('5.0.0', sha256='2aa3a628b336461f83866c4e76225ef5338359e31f802987699d6308515ae1be') version('4.5.2', sha256='96b43f314899707810db92149caf518bdb7cf39f7c0ad86e98ad687ffb0d396d') @@ -44,6 +46,7 @@ class RocmOpencl(CMakePackage): depends_on('numactl', type='link', when='@3.7.0:') for d_version, d_shasum in [ + ('5.1.0', 'f4f265604b534795a275af902b2c814f416434d9c9e16db81b3ed5d062187dfa'), ('5.0.2', '34decd84652268dde865f38e66f8fb4750a08c2457fea52ad962bced82a03e5e'), ('5.0.0', '6b72faf8819628a5c109b2ade515ab9009606d10f11316f0d7e4c4c998d7f724'), ('4.5.2', '6581916a3303a31f76454f12f86e020fb5e5c019f3dbb0780436a8f73792c4d1'), @@ -58,13 +61,14 @@ class RocmOpencl(CMakePackage): placement='rocclr', when='@{0}'.format(d_version) ) + patch('0001-fix-build-error-rocm-opencl-5.1.0.patch', when='@5.1.0') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', 'master']: depends_on('hip-rocclr@' + ver, type='build', when='@' + ver) for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', - 'master']: + '5.1.0', 'master']: depends_on('comgr@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) 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 852b5379b9..82fdefdf1b 100644 --- a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py @@ -21,6 +21,7 @@ class RocmSmiLib(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] version('master', branch='master') + version('5.1.0', sha256='21b31b43015b77a9119cf4c1d4ff3864f9ef1f34e2a52a38f985a3f710dc5f87') version('5.0.2', sha256='a169129e4ecd1cca134039dc1bf91e1b3721768781abfae4ae61fad60a633472') version('5.0.0', sha256='9d0e560072f815b441528a5d6124e901570a5a04e9cff1f21329861609b37203') version('4.5.2', sha256='d4a34db26852defb62817aa44f08ef96d678c63a6f33425bc9d48c18e5e37b7a') diff --git a/var/spack/repos/builtin/packages/rocm-tensile/package.py b/var/spack/repos/builtin/packages/rocm-tensile/package.py index 9829b47f3b..e7385b6c1e 100644 --- a/var/spack/repos/builtin/packages/rocm-tensile/package.py +++ b/var/spack/repos/builtin/packages/rocm-tensile/package.py @@ -17,6 +17,7 @@ class RocmTensile(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala', 'haampie'] + version('5.1.0', sha256='0ac86a623597152c5b1d8bb5634aad3e55afa51959476aaa5e9869d259ddf375') version('5.0.2', sha256='c6130de3b02f4f10635d18f913b3b88ea754fce2842c680e9caf5a6781da8f37') version('5.0.0', sha256='2a814ee8576ff1f06cc5ac4556300c8e7cbf77ef8c87b56992f3e66d8862f213') version('4.5.2', sha256='da20256224749c0a8b44aaede25fbcd66cfeac483081af5d22f1d1fcf49dffc1') @@ -49,7 +50,7 @@ class RocmTensile(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) depends_on('hip@' + ver, when='@' + ver) depends_on('comgr@' + ver, when='@' + ver) @@ -61,7 +62,7 @@ class RocmTensile(CMakePackage): depends_on('rocm-smi@' + ver, type='build', when='@' + ver) for ver in ['4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('rocm-smi-lib@' + ver, type='build', when='@' + ver) root_cmakelists_dir = 'Tensile/Source' diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py index 1715c1ae7f..7543a29fde 100644 --- a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py @@ -20,6 +20,7 @@ class RocmValidationSuite(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='d9b9771b885bd94e5d0352290d3fe0fa12f94ce3f384c3844002cd7614880010') version('5.0.2', sha256='f249fe700a5a96c6dabf12130a3e366ae6025fe1442a5d11d08801d6c0265af4') version('5.0.0', sha256='d4ad31db0377096117714c9f4648cb37d6808ce618cd0bb5e4cc89cc9b4e37fd') version('4.5.2', sha256='e2a128395367a60a17d4d0f62daee7d34358c75332ed582243b18da409589ab8') @@ -55,7 +56,7 @@ class RocmValidationSuite(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('hip-rocclr@' + ver, when='@' + ver) depends_on('rocminfo@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocminfo/package.py b/var/spack/repos/builtin/packages/rocminfo/package.py index 2a9b35dc6d..02463dac54 100644 --- a/var/spack/repos/builtin/packages/rocminfo/package.py +++ b/var/spack/repos/builtin/packages/rocminfo/package.py @@ -18,6 +18,7 @@ class Rocminfo(CMakePackage): version('master', branch='master') + version('5.1.0', sha256='76f6cc9e69d9fc7e692e5c7db35e89079d3b1d2d47632e4742d612e743c396d3') version('5.0.2', sha256='5fd970f08c5d6591efe7379ece564ce5580cba87fb6237531dabbd5adcb6a899') version('5.0.0', sha256='43e025de31bffa335d9cb682649add886afdd02c92090ee63e9bf77b3aaaa75b') version('4.5.2', sha256='5ea839cd1f317cbc72ea1e3634a75f33a458ba0cb5bf48377f08bb329c29222d') @@ -39,7 +40,7 @@ class Rocminfo(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', - 'master']: + '5.1.0', 'master']: depends_on('hsakmt-roct@' + ver, when='@' + ver) depends_on('hsa-rocr-dev@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocprim/package.py b/var/spack/repos/builtin/packages/rocprim/package.py index a6ad1b4988..bed8321ae0 100644 --- a/var/spack/repos/builtin/packages/rocprim/package.py +++ b/var/spack/repos/builtin/packages/rocprim/package.py @@ -15,6 +15,7 @@ class Rocprim(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='dfe106c01155e00ed816f0231d1576ff8c08750cc8278fa453926f388dc6fe48') version('5.0.2', sha256='a4280f15d470699a1c6a5f86bdd951c1387e0af227c6bee6f81cee658406f4b0') version('5.0.0', sha256='0e7e7bda6a09b70a07ddd926986882df0c8d8ff3e0a34e12cb6d44f7d0a5840e') version('4.5.2', sha256='0dc673847e67db672f2e239f299206fe16c324005ddd2e92c7cb7725bb6f4fa6') @@ -43,7 +44,7 @@ class Rocprim(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('comgr@' + ver, when='@' + ver) depends_on('hsa-rocr-dev@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py index 847d227de3..424d39863e 100644 --- a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py +++ b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py @@ -16,6 +16,7 @@ class RocprofilerDev(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='4a1c6ed887b0159392406af8796508df2794353a4c3aacc801116044fb4a10a5') version('5.0.2', sha256='48f58c3c16dd45fead2086f89a175f74636e81bc2437e30bb6e9361b1083e71d') version('5.0.0', sha256='2ed521f400e4aafd17405c2f9ad2fb3b906a982d3767b233122d9c2964c3245f') version('4.5.2', sha256='baa59826f8fb984993c03d05e2e3cdf0b830b08f8056b18ba206dfbaa367aca9') @@ -35,7 +36,8 @@ class RocprofilerDev(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', '4.0.0', '4.1.0', - '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('hsakmt-roct@' + ver, when='@' + ver) depends_on('hsa-rocr-dev@' + ver, when='@' + ver) depends_on('rocminfo@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index 63ffbc2768..92302490a2 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -19,6 +19,7 @@ class Rocrand(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='0c6f114a775d0b38be71f3f621a10bde2104a1f655d5d68c5fecb79b8b51a815') version('5.0.2', sha256='2dbce2a7fb273c2f9456c002adf3a510b9ec79f2ff32dfccdd59948f3ddb1505') version('5.0.0', sha256='356a03a74d6d5df3ae2d38da07929f23d90bb4dee71f88792c25c25069e673bc') version('4.5.2', sha256='1523997a21437c3b74d47a319d81f8cc44b8e96ec5174004944f2fb4629900db') @@ -46,11 +47,24 @@ class Rocrand(CMakePackage): depends_on('googletest@1.10.0:', type='test') + resource(name='hipRAND', + git='https://github.com/ROCmSoftwarePlatform/hipRAND.git', + branch='develop', + destination='', + placement='hiprand', + when='@5.1.0') + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', - '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) + def patch(self): + if self.spec.satisfies('@5.1.0:'): + os.rmdir('hipRAND') + os.rename('hiprand', 'hipRAND') + def setup_build_environment(self, env): env.set('CXX', self.spec['hip'].hipcc) @@ -60,39 +74,50 @@ class Rocrand(CMakePackage): # rocRAND installs librocrand.so* and libhiprand.so* to rocrand/lib and # hiprand/lib, respectively. This confuses spack's RPATH management. We # fix it by adding a symlink to the libraries. - hiprand_lib_path = join_path(self.prefix, 'hiprand', 'lib') - rocrand_lib_path = join_path(self.prefix, 'rocrand', 'lib') - mkdirp(self.prefix.lib) - with working_dir(hiprand_lib_path): - hiprand_libs = glob.glob('*.so*') - for lib in hiprand_libs: - os.symlink(join_path(hiprand_lib_path, lib), - join_path(self.prefix.lib, lib)) - with working_dir(rocrand_lib_path): - rocrand_libs = glob.glob('*.so*') - for lib in rocrand_libs: - os.symlink(join_path(rocrand_lib_path, lib), - join_path(self.prefix.lib, lib)) - """Fix the rocRAND and hipRAND include path""" - # rocRAND installs irocrand*.h* and hiprand*.h* rocrand/include and - # hiprand/include, respectively. This confuses spack's RPATH management. We - # fix it by adding a symlink to the header files. - hiprand_include_path = join_path(self.prefix, 'hiprand', 'include') - rocrand_include_path = join_path(self.prefix, 'rocrand', 'include') - - with working_dir(hiprand_include_path): - hiprand_includes = glob.glob('*.h*') - hiprand_path = join_path(self.prefix, 'hiprand') - with working_dir(hiprand_path): - for header_file in hiprand_includes: - os.symlink(join_path('include', header_file), header_file) - - with working_dir(rocrand_include_path): - rocrand_includes = glob.glob('*.h*') - rocrand_path = join_path(self.prefix, 'rocrand') - with working_dir(rocrand_path): - for header_file in rocrand_includes: - os.symlink(join_path('include', header_file), header_file) + if self.spec.satisfies('@:5.0.2'): + hiprand_lib_path = join_path(self.prefix, 'hiprand', 'lib') + rocrand_lib_path = join_path(self.prefix, 'rocrand', 'lib') + mkdirp(self.prefix.lib) + with working_dir(hiprand_lib_path): + hiprand_libs = glob.glob('*.so*') + for lib in hiprand_libs: + os.symlink(join_path(hiprand_lib_path, lib), + join_path(self.prefix.lib, lib)) + with working_dir(rocrand_lib_path): + rocrand_libs = glob.glob('*.so*') + for lib in rocrand_libs: + os.symlink(join_path(rocrand_lib_path, lib), + join_path(self.prefix.lib, lib)) + """Fix the rocRAND and hipRAND include path""" + # rocRAND installs irocrand*.h* and hiprand*.h* rocrand/include and + # hiprand/include, respectively. This confuses spack's RPATH management. We + # fix it by adding a symlink to the header files. + hiprand_include_path = join_path(self.prefix, 'hiprand', 'include') + rocrand_include_path = join_path(self.prefix, 'rocrand', 'include') + + with working_dir(hiprand_include_path): + hiprand_includes = glob.glob('*.h*') + hiprand_path = join_path(self.prefix, 'hiprand') + with working_dir(hiprand_path): + for header_file in hiprand_includes: + os.symlink(join_path('include', header_file), header_file) + with working_dir(rocrand_include_path): + rocrand_includes = glob.glob('*.h*') + rocrand_path = join_path(self.prefix, 'rocrand') + with working_dir(rocrand_path): + for header_file in rocrand_includes: + os.symlink(join_path('include', header_file), header_file) + else: + os.mkdir(os.path.join(self.prefix, 'hiprand')) + os.mkdir(os.path.join(self.prefix, 'hiprand', 'include')) + hiprand_include_path = join_path(self.prefix, 'include', 'hiprand') + with working_dir(hiprand_include_path): + hiprand_includes = glob.glob('*.h*') + hiprand_path = join_path(self.prefix, 'hiprand', 'include') + with working_dir(hiprand_path): + for header_file in hiprand_includes: + os.symlink(join_path('../../include/hiprand', + header_file), header_file) def cmake_args(self): args = [ @@ -106,4 +131,7 @@ class Rocrand(CMakePackage): if self.spec.satisfies('^cmake@3.21.0:3.21.2'): args.append(self.define('__skip_rocmclang', 'ON')) + if '@5.1.0:' in self.spec: + args.append(self.define('BUILD_HIPRAND', 'ON')) + return args diff --git a/var/spack/repos/builtin/packages/rocsolver/package.py b/var/spack/repos/builtin/packages/rocsolver/package.py index 2a272b9ddd..9afc993467 100644 --- a/var/spack/repos/builtin/packages/rocsolver/package.py +++ b/var/spack/repos/builtin/packages/rocsolver/package.py @@ -28,6 +28,7 @@ class Rocsolver(CMakePackage): size and compile time by adding specialized kernels \ for small matrix sizes') + version('5.1.0', sha256='88de515a6e75eaa3c50c9c8ae1e7ae8e3b46e712e388f44f79b63fefa9fc0831') version('5.0.2', sha256='298e0903f1ba8074055ab072690f967062d6e06a9371574de23e4e38d2997688') version('5.0.0', sha256='d444ad5348eb8a2c04646ceae6923467a0e775441f2c73150892e228e585b2e1') version('4.5.2', sha256='4639322bd1e77fedfdeb9032633bde6211a0b1cc16a612db7754f873f18a492f') @@ -60,7 +61,7 @@ class Rocsolver(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.1.0', '5.0.2']: depends_on('hip@' + ver, when='@' + ver) for tgt in itertools.chain(['auto'], amdgpu_targets): depends_on('rocblas@{0} amdgpu_target={1}'.format(ver, tgt), diff --git a/var/spack/repos/builtin/packages/rocsparse/package.py b/var/spack/repos/builtin/packages/rocsparse/package.py index 3ea2c21098..1100402a3e 100644 --- a/var/spack/repos/builtin/packages/rocsparse/package.py +++ b/var/spack/repos/builtin/packages/rocsparse/package.py @@ -28,6 +28,7 @@ class Rocsparse(CMakePackage): variant('amdgpu_target', values=auto_or_any_combination_of(*amdgpu_targets)) variant('build_type', default='Release', values=("Release", "Debug", "RelWithDebInfo"), description='CMake build type') + version('5.1.0', sha256='a2f0f8cb02b95993480bd7264fc65e8b11464a90b86f2dcd0dd82a2e6d4bd704') version('5.0.2', sha256='c9d9e1b7859e1c5aa5050f5dfdf86245cbd7c1296c0ce60d9ca5f3e22a9b748b') version('5.0.0', sha256='6d352bf27dbed08e5115a58815aa76c59eb2008ec9dcc921aadf2efe20115d2a') version('4.5.2', sha256='e37af2cd097e239a55a278df534183b5591ef4d985fe1a268a229bd11ada6599') @@ -46,7 +47,8 @@ class Rocsparse(CMakePackage): depends_on('cmake@3.5:', type='build') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', - '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('hip@' + ver, when='@' + ver) for tgt in itertools.chain(['auto'], amdgpu_targets): depends_on('rocprim@{0} amdgpu_target={1}'.format(ver, tgt), diff --git a/var/spack/repos/builtin/packages/rocthrust/package.py b/var/spack/repos/builtin/packages/rocthrust/package.py index 2e513740b4..5f9e8fb034 100644 --- a/var/spack/repos/builtin/packages/rocthrust/package.py +++ b/var/spack/repos/builtin/packages/rocthrust/package.py @@ -18,6 +18,7 @@ class Rocthrust(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='fee779ae3d55b97327d87beca784fc090fa02bc95238d9c3bf3021e266e73979') version('5.0.2', sha256='60f0cf1848cc7cd8663f15307bd695eee3c5b20d3ad3baa4bc696189ffdcfd53') version('5.0.0', sha256='10b7b1be919881904d64f8084c2afe22aa00c560f8493a75dbf5df8386443ab4') version('4.5.2', sha256='9171a05dd7438aebd4f6a939b1b33b7e87be1a0bd52d90a171b74539885cf591') @@ -41,7 +42,7 @@ class Rocthrust(CMakePackage): for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', - '5.0.2']: + '5.0.2', '5.1.0']: depends_on('hip@' + ver, when='@' + ver) depends_on('rocprim@' + ver, when='@' + ver) depends_on('rocm-cmake@%s:' % ver, type='build', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/roctracer-dev-api/package.py b/var/spack/repos/builtin/packages/roctracer-dev-api/package.py index 84ce5ba7da..e1fbae4836 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev-api/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev-api/package.py @@ -17,6 +17,7 @@ class RoctracerDevApi(Package): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='58b535f5d6772258190e4adcc23f37c916f775057a91b960e1f2ee1f40ed5aac') version('5.0.2', sha256='5ee46f079e57dfe491678ffa4cdaf5f3b3d179cb3137948e4bcafca99ded47cc') version('5.0.0', sha256='a21f4fb093cee4a806d53cbc0645d615d89db12fbde305e9eceee7e4150acdf2') version('4.5.2', sha256='7012d18b79736dbe119161aab86f4976b78553ce0b2f4753a9386752d75d5074') diff --git a/var/spack/repos/builtin/packages/roctracer-dev/package.py b/var/spack/repos/builtin/packages/roctracer-dev/package.py index bec61b0475..9f37e335ea 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev/package.py @@ -18,6 +18,7 @@ class RoctracerDev(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('5.1.0', sha256='58b535f5d6772258190e4adcc23f37c916f775057a91b960e1f2ee1f40ed5aac') version('5.0.2', sha256='5ee46f079e57dfe491678ffa4cdaf5f3b3d179cb3137948e4bcafca99ded47cc') version('5.0.0', sha256='a21f4fb093cee4a806d53cbc0645d615d89db12fbde305e9eceee7e4150acdf2') version('4.5.2', sha256='7012d18b79736dbe119161aab86f4976b78553ce0b2f4753a9386752d75d5074') @@ -41,13 +42,15 @@ class RoctracerDev(CMakePackage): depends_on('py-cppheaderparser', type='build') for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', - '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + '4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('hsakmt-roct@' + ver, when='@' + ver) depends_on('hsa-rocr-dev@' + ver, when='@' + ver) depends_on('rocminfo@' + ver, when='@' + ver) depends_on('hip@' + ver, when='@' + ver) - for ver in ['4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2']: + for ver in ['4.2.0', '4.3.0', '4.3.1', '4.5.0', '4.5.2', '5.0.0', '5.0.2', + '5.1.0']: depends_on('rocprofiler-dev@' + ver, when='@' + ver) def setup_build_environment(self, build_env): |