diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2021-06-17 11:52:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-17 03:52:33 -0600 |
| commit | 011a940f44053171d0df3ce926948ca6bfa2ae97 (patch) | |
| tree | d81fbc3a8ef7008c5bbbbc2b8d1e63ee78d4f697 /var/spack/repos/builtin/packages/comgr/package.py | |
| parent | 85c55896203bc176805b094f0aede8dcc38601b6 (diff) | |
| download | spack-011a940f44053171d0df3ce926948ca6bfa2ae97.tar.gz spack-011a940f44053171d0df3ce926948ca6bfa2ae97.tar.bz2 spack-011a940f44053171d0df3ce926948ca6bfa2ae97.tar.xz spack-011a940f44053171d0df3ce926948ca6bfa2ae97.zip | |
Break llvm-amdgpu circular dependency with rocm-device-libs (#23859)
Diffstat (limited to 'var/spack/repos/builtin/packages/comgr/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/comgr/package.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index cdb573ea8d..ed1963655d 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -15,7 +15,7 @@ class Comgr(CMakePackage): git = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport.git" url = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-4.2.0.tar.gz" - maintainers = ['srekolam', 'arjun-raj-kuppala'] + maintainers = ['srekolam', 'arjun-raj-kuppala', 'haampie'] version('master', branch='amd-stg-open') @@ -43,8 +43,12 @@ 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', 'master']: - depends_on('llvm-amdgpu@' + ver, type='build', when='@' + ver) - depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) + # llvm libs are linked statically, so this *could* be a build dep + depends_on('llvm-amdgpu@' + ver, when='@' + ver) + + # aomp may not build rocm-device-libs as part of llvm-amdgpu, so make + # that a conditional dependency + depends_on('rocm-device-libs@' + ver, when='@{0} ^llvm-amdgpu ~rocm-device-libs'.format(ver)) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) root_cmakelists_dir = join_path('lib', 'comgr') |