axom: need to specify +rocm as part of dependency constraints (#35066)
* axom: need to specify +cuda, +rocm as part of dependency constraints * remove lines 120, 128 * fix line length, spack style issue
This commit is contained in:
		| @@ -117,7 +117,6 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): | ||||
|         depends_on("umpire@6.0.0", when="@0.6.0") | ||||
|         depends_on("umpire@5:5.0.1", when="@:0.5.0") | ||||
|         depends_on("umpire +openmp", when="+openmp") | ||||
|         depends_on("umpire +cuda", when="+cuda") | ||||
| 
 | ||||
|     with when("+raja"): | ||||
|         depends_on("raja@2022.03.0:", when="@0.7.0:") | ||||
| @@ -125,15 +124,18 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): | ||||
|         depends_on("raja@:0.13.0", when="@:0.5.0") | ||||
|         depends_on("raja~openmp", when="~openmp") | ||||
|         depends_on("raja+openmp", when="+openmp") | ||||
|         depends_on("raja+cuda", when="+cuda") | ||||
| 
 | ||||
|     for val in CudaPackage.cuda_arch_values: | ||||
|         depends_on("raja cuda_arch={0}".format(val), when="+raja cuda_arch={0}".format(val)) | ||||
|         depends_on("umpire cuda_arch={0}".format(val), when="+umpire cuda_arch={0}".format(val)) | ||||
|         raja_cuda = "raja +cuda cuda_arch={0}".format(val) | ||||
|         umpire_cuda = "umpire +cuda cuda_arch={0}".format(val) | ||||
|         depends_on(raja_cuda, when="+{0}".format(raja_cuda)) | ||||
|         depends_on(umpire_cuda, when="+{0}".format(umpire_cuda)) | ||||
| 
 | ||||
|     for val in ROCmPackage.amdgpu_targets: | ||||
|         depends_on("raja amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val)) | ||||
|         depends_on("umpire amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val)) | ||||
|         raja_rocm = "raja +rocm amdgpu_target={0}".format(val) | ||||
|         umpire_rocm = "umpire +rocm amdgpu_target={0}".format(val) | ||||
|         depends_on(raja_rocm, when="+{0}".format(raja_rocm)) | ||||
|         depends_on(umpire_rocm, when="+{0}".format(umpire_rocm)) | ||||
| 
 | ||||
|     depends_on("mfem", when="+mfem") | ||||
|     depends_on("mfem~mpi", when="+mfem~mpi") | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 eugeneswalker
					eugeneswalker