remove hypre variant from mfem and all references to it (#17885)
This commit is contained in:
parent
afaae70855
commit
acfa2ea018
3 changed files with 3 additions and 9 deletions
|
@ -124,7 +124,7 @@ class Axom(CMakePackage, CudaPackage):
|
||||||
depends_on('umpire cuda_arch={0}'.format(sm_),
|
depends_on('umpire cuda_arch={0}'.format(sm_),
|
||||||
when='+umpire cuda_arch={0}'.format(sm_))
|
when='+umpire cuda_arch={0}'.format(sm_))
|
||||||
|
|
||||||
depends_on("mfem~mpi~hypre~metis~zlib", when="+mfem")
|
depends_on("mfem~mpi~metis~zlib", when="+mfem")
|
||||||
|
|
||||||
depends_on("python", when="+python")
|
depends_on("python", when="+python")
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,8 @@ class Cardioid(CMakePackage):
|
||||||
depends_on('lapack')
|
depends_on('lapack')
|
||||||
depends_on('mpi')
|
depends_on('mpi')
|
||||||
depends_on('cuda', when="+cuda")
|
depends_on('cuda', when="+cuda")
|
||||||
depends_on('mfem+hypre+superlu-dist+lapack', when="+mfem~cuda")
|
depends_on('mfem+mpi+superlu-dist+lapack', when="+mfem~cuda")
|
||||||
depends_on('mfem+hypre+superlu-dist+lapack^hypre+cuda', when="+mfem+cuda")
|
depends_on('mfem+mpi+superlu-dist+lapack^hypre+cuda', when="+mfem+cuda")
|
||||||
depends_on('cmake@3.1:', type='build')
|
depends_on('cmake@3.1:', type='build')
|
||||||
depends_on('perl', type='build')
|
depends_on('perl', type='build')
|
||||||
|
|
||||||
|
|
|
@ -92,12 +92,6 @@ class Mfem(Package):
|
||||||
# Can we make the default value for 'metis' to depend on the 'mpi' value?
|
# Can we make the default value for 'metis' to depend on the 'mpi' value?
|
||||||
variant('metis', default=True,
|
variant('metis', default=True,
|
||||||
description='Enable METIS support')
|
description='Enable METIS support')
|
||||||
# TODO: The 'hypre' variant is the same as 'mpi', we may want to remove it.
|
|
||||||
# For now, keep the 'hypre' variant while ignoring its setting. This
|
|
||||||
# is done to preserve compatibility with other packages that refer to
|
|
||||||
# it, e.g. xSDK.
|
|
||||||
variant('hypre', default=True,
|
|
||||||
description='Required for MPI parallelism')
|
|
||||||
variant('openmp', default=False,
|
variant('openmp', default=False,
|
||||||
description='Enable OpenMP parallelism')
|
description='Enable OpenMP parallelism')
|
||||||
variant('cuda', default=False, description='Enable CUDA support')
|
variant('cuda', default=False, description='Enable CUDA support')
|
||||||
|
|
Loading…
Reference in a new issue