From b2d3d35528ccf90feca71e2efd62e903256a3029 Mon Sep 17 00:00:00 2001 From: Sreenivasa Murthy Kolam <67086238+srekolam@users.noreply.github.com> Date: Tue, 27 Apr 2021 14:38:14 -0400 Subject: Add git repo path for rocm packages (#23270) --- var/spack/repos/builtin/packages/comgr/package.py | 5 ++++- var/spack/repos/builtin/packages/hip-rocclr/package.py | 10 +++++++++- var/spack/repos/builtin/packages/hipify-clang/package.py | 5 ++++- .../repos/builtin/packages/rocm-bandwidth-test/package.py | 5 ++++- var/spack/repos/builtin/packages/rocm-clang-ocl/package.py | 8 +++++--- var/spack/repos/builtin/packages/rocm-dbgapi/package.py | 5 ++++- var/spack/repos/builtin/packages/rocm-device-libs/package.py | 8 ++++++-- .../repos/builtin/packages/rocm-opencl-runtime/package.py | 4 +++- var/spack/repos/builtin/packages/rocm-opencl/package.py | 6 ++++-- 9 files changed, 43 insertions(+), 13 deletions(-) diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index fb959c19b1..3aed67b152 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -12,10 +12,12 @@ class Comgr(CMakePackage): contains one library, the Code Object Manager (Comgr)""" homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" + git = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport.git" url = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.1.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('master', branch='amd-stg-open') version('4.1.0', sha256='ffb625978555c63582aa46857672431793261166aa31761eff4fe5c2cab661ae') version('4.0.0', sha256='f389601fb70b2d9a60d0e2798919af9ddf7b8376a2e460141507fe50073dfb31') version('3.10.0', sha256='b44ee5805a6236213d758fa4b612bb859d8f774b9b4bdc3a2699bb009dd631bc') @@ -37,7 +39,8 @@ 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', '4.0.0', '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', + 'master']: 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 3025f54438..2ac345a17c 100644 --- a/var/spack/repos/builtin/packages/hip-rocclr/package.py +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -13,6 +13,7 @@ class HipRocclr(CMakePackage): runtimes to work on Windows as well as on Linux without much effort.""" homepage = "https://github.com/ROCm-Developer-Tools/ROCclr" + git = "https://github.com/ROCm-Developer-Tools/ROCclr.git" maintainers = ['srekolam', 'arjun-raj-kuppala'] @@ -24,6 +25,7 @@ class HipRocclr(CMakePackage): url = "https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-{0}.tar.gz" return url.format(version) + version('master', branch='main') version('4.1.0', sha256='9eb1d88cfc9474979aaf29b99bcf9d3769a0f7f1f8f10660941aabf83d9eeb0c') version('4.0.0', sha256='8db502d0f607834e3b882f939d33e8abe2f9b55ddafaf1b0c2cd29a0425ed76a') version('3.10.0', sha256='d1ac02840c2dcb3d5fa3008fe9e313767ebe6d1dcf978a924341834ec96ebfe2') @@ -37,7 +39,8 @@ class HipRocclr(CMakePackage): depends_on('libelf', type='link', when="@3.7.0:3.8.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', '4.0.0', '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', + 'master']: 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) @@ -101,6 +104,11 @@ class HipRocclr(CMakePackage): destination='', placement='opencl-on-vdi', when='@4.1.0') + resource(name='opencl-on-vdi', + git='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git', + destination='', + placement='opencl-on-vdi', + when='@master') @run_after('install') def deploy_missing_files(self): diff --git a/var/spack/repos/builtin/packages/hipify-clang/package.py b/var/spack/repos/builtin/packages/hipify-clang/package.py index e246822658..810b4914d1 100644 --- a/var/spack/repos/builtin/packages/hipify-clang/package.py +++ b/var/spack/repos/builtin/packages/hipify-clang/package.py @@ -11,10 +11,12 @@ class HipifyClang(CMakePackage): sources into HIP sources""" homepage = "https://github.com/ROCm-Developer-Tools/HIPIFY" + git = "https://github.com/ROCm-Developer-Tools/HIPIFY.git" url = "https://github.com/ROCm-Developer-Tools/HIPIFY/archive/rocm-4.1.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('master', branch='master') version('4.1.0', sha256='ec9cc410167b6ab31706742f3d7a77dbd29eb548e7371134b3aace8597665475') version('4.0.0', sha256='9d3906d606fca2bcb58f5f2a70cc4b9e298ca0e12a84ee5f18e42b7df97b38a4') version('3.10.0', sha256='7ebba22ed70100150bedddffa08a84f91b546347662862487b6703a1edce2623') @@ -26,5 +28,6 @@ class HipifyClang(CMakePackage): variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type') 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']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', + 'master']: depends_on('llvm-amdgpu@' + ver, 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 401c440959..9ab994985e 100644 --- a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py +++ b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py @@ -11,10 +11,12 @@ class RocmBandwidthTest(CMakePackage): """Test to measure PciE bandwidth on ROCm platforms""" homepage = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test" + git = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test.git" url = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test/archive/rocm-4.1.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('master', branch='master') version('4.1.0', sha256='4e34b60a7e4090d6475f0cdd86594b1b9a7b85d4e343999b9e148e196f0c2f4c') version('4.0.0', sha256='bde2aa743979eac195dd13ec8d0fcb7da183fff489da32c28b872eed7f6681b3') version('3.10.0', sha256='ad1dedad9023ccb050082c866fa5131665d9c3b50de0b78e4618730c29a07773') @@ -27,7 +29,8 @@ class RocmBandwidthTest(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']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', + 'master']: depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) depends_on('hsakmt-roct@' + ver, type='build', 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 ae43339ddb..91e734fe84 100644 --- a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py +++ b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py @@ -10,10 +10,11 @@ class RocmClangOcl(CMakePackage): """ OpenCL compilation with clang compiler """ homepage = "https://github.com/RadeonOpenCompute/clang-ocl" + git = "https://github.com/RadeonOpenCompute/clang-ocl.git" url = "https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-4.1.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] - + version('master', branch='master') version('4.1.0', sha256='c6e65da5541df9ee940caeeffe1b87c92547edc1770538fd2010c9c998a593b5') version('4.0.0', sha256='c8f9091396ee0096f6d7c1cd13d80532c424e838bec1e4cebf903ebaf649e82e') version('3.10.0', sha256='17fc8fb8c38b18f9f0cac339dda6cea3e9e66805f7a92ec2456072fc1e72fa85') @@ -26,9 +27,10 @@ class RocmClangOcl(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']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', + 'master']: depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) depends_on('llvm-amdgpu@' + ver, type='build', when='@' + ver) - for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0']: + for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', 'master']: depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py index fe8b8c7c4f..e4be3740de 100644 --- a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py +++ b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py @@ -14,10 +14,12 @@ class RocmDbgapi(CMakePackage): AMD's commercially available GPU architectures.""" homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi" + git = "https://github.com/ROCm-Developer-Tools/ROCdbgapi.git" url = "https://github.com/ROCm-Developer-Tools/ROCdbgapi/archive/rocm-4.1.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('master', branch='amd-master') version('4.1.0', sha256='d04fd9b2005691313547c4134b027b56b0ec6089f67d3bccbdb8fb1c92cde9bd') version('4.0.0', sha256='e87f31b3a22861397eb62d8363dd1e153596097ccfe68c6eefc1a83a2432ae18') version('3.10.0', sha256='89a8d352d59e4c0dc13160b1bf1f4bc3bfec5af544050030aa619b1ff88f1850') @@ -28,7 +30,8 @@ class RocmDbgapi(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']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.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-device-libs/package.py b/var/spack/repos/builtin/packages/rocm-device-libs/package.py index 456b4d6bd4..356e74cc8f 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,12 @@ class RocmDeviceLibs(CMakePackage): """set of AMD specific device-side language runtime libraries""" homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs" + git = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs.git" url = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-4.1.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('master', branch='amd-stg-open') version('4.1.0', sha256='f5f5aa6bfbd83ff80a968fa332f80220256447c4ccb71c36f1fbd2b4a8e9fc1b') version('4.0.0', sha256='d0aa495f9b63f6d8cf8ac668f4dc61831d996e9ae3f15280052a37b9d7670d2a') version('3.10.0', sha256='bca9291385d6bdc91a8b39a46f0fd816157d38abb1725ff5222e6a0daa0834cc') @@ -28,8 +30,10 @@ 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', '4.0.0', '4.1.0']: - depends_on('llvm-amdgpu@' + 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', + 'master']: + depends_on('llvm-amdgpu@' + ver, type=('build', 'link'), when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/rocm-opencl-runtime/package.py b/var/spack/repos/builtin/packages/rocm-opencl-runtime/package.py index 50ae210b48..9ee1a57138 100644 --- a/var/spack/repos/builtin/packages/rocm-opencl-runtime/package.py +++ b/var/spack/repos/builtin/packages/rocm-opencl-runtime/package.py @@ -12,10 +12,12 @@ class RocmOpenclRuntime(CMakePackage): It Supports offline and in-process/in-memory compilation""" homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" + git = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git" url = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.1.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('master', branch='main') version('4.1.0', sha256='0729e6c2adf1e3cf649dc6e679f9cb936f4f423f4954ad9852857c0a53ef799c') version('4.0.0', sha256='d43ea5898c6b9e730b5efabe8367cc136a9260afeac5d0fe85b481d625dd7df1') version('3.10.0', sha256='3aa9dc5a5f570320b04b35ee129ce9ff21062d2770df934c6c307913f975e93d') @@ -28,7 +30,7 @@ class RocmOpenclRuntime(CMakePackage): depends_on('libelf', type='link', when="@3.7.0:3.8.0") depends_on('numactl', type='link', when="@3.7.0:") - for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0']: + for ver in ['3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', 'master']: 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) diff --git a/var/spack/repos/builtin/packages/rocm-opencl/package.py b/var/spack/repos/builtin/packages/rocm-opencl/package.py index c80e9387a3..6d0710e4f4 100644 --- a/var/spack/repos/builtin/packages/rocm-opencl/package.py +++ b/var/spack/repos/builtin/packages/rocm-opencl/package.py @@ -10,6 +10,7 @@ class RocmOpencl(CMakePackage): """OpenCL: Open Computing Language on ROCclr""" homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" + git = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git" maintainers = ['srekolam', 'arjun-raj-kuppala'] @@ -19,7 +20,7 @@ class RocmOpencl(CMakePackage): url = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-{0}.tar.gz" return url.format(version) - + version('master', branch='main') version('4.1.0', sha256='0729e6c2adf1e3cf649dc6e679f9cb936f4f423f4954ad9852857c0a53ef799c') version('4.0.0', sha256='d43ea5898c6b9e730b5efabe8367cc136a9260afeac5d0fe85b481d625dd7df1') version('3.10.0', sha256='3aa9dc5a5f570320b04b35ee129ce9ff21062d2770df934c6c307913f975e93d') @@ -32,7 +33,8 @@ class RocmOpencl(CMakePackage): depends_on('mesa18~llvm@18.3:', type='link') depends_on('numactl', type='link', when='@3.7.0:') - for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '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', + 'master']: depends_on('hip-rocclr@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) -- cgit v1.2.3-70-g09d2