summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorCory Bloor <Cordell.Bloor@amd.com>2021-09-30 14:57:28 -0600
committerGitHub <noreply@github.com>2021-09-30 22:57:28 +0200
commit4238318de217cc41fc1e9a66b015e7dbb2c16ec8 (patch)
tree0d0d2a9a79ea97dff83239b5e3eca87946a2afbc /var
parent7694c58736c12ad497783555235e2832515da673 (diff)
downloadspack-4238318de217cc41fc1e9a66b015e7dbb2c16ec8.tar.gz
spack-4238318de217cc41fc1e9a66b015e7dbb2c16ec8.tar.bz2
spack-4238318de217cc41fc1e9a66b015e7dbb2c16ec8.tar.xz
spack-4238318de217cc41fc1e9a66b015e7dbb2c16ec8.zip
rocsolver: Tighten rocsolver package dependencies (#25917)
- Specify CMake minimum version more precisely - Ensure rocBLAS is available at build time - Limit workaround for missing rocblas include path to the only affected version (4.1.0) - Make hip a build and link dependency - Remove hip's link dependencies Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/rocsolver/package.py15
1 files changed, 5 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/rocsolver/package.py b/var/spack/repos/builtin/packages/rocsolver/package.py
index d1fda66d97..432f663aff 100644
--- a/var/spack/repos/builtin/packages/rocsolver/package.py
+++ b/var/spack/repos/builtin/packages/rocsolver/package.py
@@ -37,18 +37,13 @@ class Rocsolver(CMakePackage):
version('3.7.0', sha256='8c1c630595952806e658c539fd0f3056bd45bafc22b57f0dd10141abefbe4595')
version('3.5.0', sha256='d655e8c762fb9e123b9fd7200b4258512ceef69973de4d0588c815bc666cb358')
- depends_on('cmake@3:', type='build')
- 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', '4.2.0',
- '4.3.0', '4.3.1']:
- depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver)
+ depends_on('cmake@3.8:', type='build', when='@4.1.0:')
+ 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']:
- depends_on('hip@' + ver, type='build', when='@' + ver)
- depends_on('comgr@' + ver, type='build', when='@' + ver)
- depends_on('rocblas@' + ver, type='link', when='@' + ver)
+ depends_on('hip@' + ver, when='@' + ver)
+ depends_on('rocblas@' + ver, when='@' + ver)
depends_on('rocm-cmake@' + ver, type='build', when='@' + ver)
def cmake_args(self):
@@ -58,7 +53,7 @@ class Rocsolver(CMakePackage):
self.define('BUILD_CLIENTS_TESTS', 'OFF'),
self.define('BUILD_CLIENTS_BENCHMARKS', 'OFF')
]
- if self.spec.satisfies('@4.1.0:'):
+ if self.spec.satisfies('@4.1.0'):
incl = self.spec['rocblas'].prefix
args.append(self.define(
'CMAKE_CXX_FLAGS',