From 0b9bd92511cec9c8e3bb49d412f1f8de49257ad7 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Tue, 13 Apr 2021 11:58:19 +0200 Subject: SIRIUS and SpFFT versions need ROCm < 4.1 (#22957) FindHIP.cmake script is not working for both 4.0 and 4.1. It's fixed in their develop branches --- var/spack/repos/builtin/packages/sirius/package.py | 3 +++ var/spack/repos/builtin/packages/spfft/package.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/var/spack/repos/builtin/packages/sirius/package.py b/var/spack/repos/builtin/packages/sirius/package.py index 1e9cc15c24..50e8a073c1 100644 --- a/var/spack/repos/builtin/packages/sirius/package.py +++ b/var/spack/repos/builtin/packages/sirius/package.py @@ -115,6 +115,9 @@ class Sirius(CMakePackage, CudaPackage): depends_on('hsa-rocr-dev', when='+rocm', type='link') depends_on('rocblas', when='+rocm') + # FindHIP cmake script only works for < 4.1 + depends_on('hip@:4.0', when='@:7.2.0 +rocm') + extends('python', when='+python') conflicts('+shared', when='@6.3.0:6.4.999') diff --git a/var/spack/repos/builtin/packages/spfft/package.py b/var/spack/repos/builtin/packages/spfft/package.py index d5a54624d5..5829ddb977 100644 --- a/var/spack/repos/builtin/packages/spfft/package.py +++ b/var/spack/repos/builtin/packages/spfft/package.py @@ -55,6 +55,9 @@ class Spfft(CMakePackage, CudaPackage): depends_on('cuda@:10', when='@:0.9.11 +cuda') + # FindHIP cmake script only works for < 4.1 + depends_on('hip@:4.0', when='@:1.0.1 +rocm') + def cmake_args(self): spec = self.spec args = [ -- cgit v1.2.3-60-g2f50