From c6c9213766c5755ae893d202d1336883ad2296fa Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Fri, 3 Sep 2021 18:19:57 +0200 Subject: rocblas: use AMDGPU_TARGETS instead of Tensile_ARCHITECTURE (#25778) --- var/spack/repos/builtin/packages/rocblas/package.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/rocblas/package.py b/var/spack/repos/builtin/packages/rocblas/package.py index 700b6a45b4..f289d4b3e9 100644 --- a/var/spack/repos/builtin/packages/rocblas/package.py +++ b/var/spack/repos/builtin/packages/rocblas/package.py @@ -82,6 +82,9 @@ class Rocblas(CMakePackage): def cmake_args(self): arch = self.spec.variants['tensile_architecture'].value + if self.spec.satisfies('@4.1.0:'): + if arch == 'gfx906' or arch == 'gfx908': + arch = arch + ':xnack-' tensile = join_path(self.stage.source_path, 'Tensile') @@ -104,10 +107,11 @@ class Rocblas(CMakePackage): if '@3.7.0:' in self.spec: args.append(self.define('Tensile_LIBRARY_FORMAT', 'msgpack')) - if self.spec.satisfies('@4.1.0:'): - if arch == 'gfx906' or arch == 'gfx908': - arch = arch + ':xnack-' - args.append(self.define('Tensile_ARCHITECTURE', arch)) + # See https://github.com/ROCmSoftwarePlatform/rocBLAS/commit/c1895ba4bb3f4f5947f3818ebd155cf71a27b634 + if self.spec.satisfies('@:4.2.0'): + args.append(self.define('Tensile_ARCHITECTURE', arch)) + else: + args.append(self.define('AMDGPU_TARGETS', arch)) # See https://github.com/ROCmSoftwarePlatform/rocBLAS/issues/1196 if self.spec.satisfies('^cmake@3.21:'): -- cgit v1.2.3-70-g09d2