From 32a31d01afeb8bdbb1c40664d34f6fe7d92a4589 Mon Sep 17 00:00:00 2001 From: Alberto Invernizzi <9337627+albestro@users.noreply.github.com> Date: Mon, 8 Aug 2022 11:40:37 +0200 Subject: sirius: inherit from rocmpackage (#31207) Co-authored-by: Harmen Stoppels --- var/spack/repos/builtin/packages/sirius/package.py | 25 +--------------------- 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sirius/package.py b/var/spack/repos/builtin/packages/sirius/package.py index 57b957e397..449a7dd464 100644 --- a/var/spack/repos/builtin/packages/sirius/package.py +++ b/var/spack/repos/builtin/packages/sirius/package.py @@ -8,7 +8,7 @@ import os from spack.package import * -class Sirius(CMakePackage, CudaPackage): +class Sirius(CMakePackage, CudaPackage, ROCmPackage): """Domain specific library for electronic structure calculations""" homepage = "https://github.com/electronic-structure/SIRIUS" @@ -130,19 +130,6 @@ class Sirius(CMakePackage, CudaPackage): deprecated=True, ) - amdgpu_targets = ( - "gfx701", - "gfx801", - "gfx802", - "gfx803", - "gfx900", - "gfx906", - "gfx908", - "gfx1010", - "gfx1011", - "gfx1012", - ) - variant("shared", default=True, description="Build shared libraries") variant("openmp", default=True, description="Build with OpenMP support") variant( @@ -160,14 +147,6 @@ class Sirius(CMakePackage, CudaPackage): variant("scalapack", default=False, description="Enable scalapack support") variant("magma", default=False, description="Enable MAGMA support") variant("nlcglib", default=False, description="enable robust wave function optimization") - variant("rocm", default=False, description="Use ROCm GPU support") - variant( - "amdgpu_target", - default="gfx803,gfx900,gfx906", - multi=True, - values=amdgpu_targets, - when="+rocm", - ) variant( "build_type", default="Release", @@ -225,8 +204,6 @@ class Sirius(CMakePackage, CudaPackage): depends_on("scalapack", when="+scalapack") - # rocm - depends_on("hip", when="+rocm") depends_on("rocblas", when="+rocm") # FindHIP cmake script only works for < 4.1 -- cgit v1.2.3-70-g09d2