diff options
| author | Aiden Grossman <39388941+boomanaiden154@users.noreply.github.com> | 2023-07-19 00:47:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-19 03:47:26 -0400 |
| commit | a99eaa954150778624f23459bafd49ce0397b099 (patch) | |
| tree | 77e2358e6a002c52ef4698db8424301f60ee1276 | |
| parent | 76b6436ade842ad038f9087b8ccc401bea9d3f6e (diff) | |
| download | spack-a99eaa954150778624f23459bafd49ce0397b099.tar.gz spack-a99eaa954150778624f23459bafd49ce0397b099.tar.bz2 spack-a99eaa954150778624f23459bafd49ce0397b099.tar.xz spack-a99eaa954150778624f23459bafd49ce0397b099.zip | |
magma: add package name to conflict messages (#38984)
Without the package name being present in the conflict messages, it is
significantly more difficult to debug concretization failures in
environments that contain many packages.
| -rw-r--r-- | var/spack/repos/builtin/packages/magma/package.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py index 257c82eff2..8ef8701355 100644 --- a/var/spack/repos/builtin/packages/magma/package.py +++ b/var/spack/repos/builtin/packages/magma/package.py @@ -48,10 +48,12 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage): depends_on("hipsparse", when="+rocm") depends_on("python", when="@master", type="build") - conflicts("~cuda", when="~rocm", msg="Either CUDA or HIP support must be enabled") - conflicts("+rocm", when="+cuda", msg="CUDA must be disabled to support HIP (ROCm)") - conflicts("+rocm", when="@:2.5.4", msg="HIP support starts in version 2.6.0") - conflicts("cuda_arch=none", when="+cuda", msg="Please indicate a CUDA arch value or values") + conflicts("~cuda", when="~rocm", msg="magma: Either CUDA or HIP support must be enabled") + conflicts("+rocm", when="+cuda", msg="magma: CUDA must be disabled to support HIP (ROCm)") + conflicts("+rocm", when="@:2.5.4", msg="magma: HIP support starts in version 2.6.0") + conflicts( + "cuda_arch=none", when="+cuda", msg="magma: Please indicate a CUDA arch value or values" + ) # currently not compatible with CUDA-11 # https://bitbucket.org/icl/magma/issues/22/cuda-11-changes-issue @@ -63,11 +65,11 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage): conflicts("cuda_arch={}".format(target)) # Some cuda_arch values had support added recently - conflicts("cuda_arch=37", when="@:2.5") - conflicts("cuda_arch=60", when="@:2.2") - conflicts("cuda_arch=70", when="@:2.2") - conflicts("cuda_arch=75", when="@:2.5.0") - conflicts("cuda_arch=80", when="@:2.5.3") + conflicts("cuda_arch=37", when="@:2.5", msg="magma: cuda_arch=37 needs a version > 2.5") + conflicts("cuda_arch=60", when="@:2.2", msg="magma: cuda_arch=60 needs a version > 2.2") + conflicts("cuda_arch=70", when="@:2.2", msg="magma: cuda_arch=70 needs a version > 2.2") + conflicts("cuda_arch=75", when="@:2.5.0", msg="magma: cuda_arch=75 needs a version > 2.5.0") + conflicts("cuda_arch=80", when="@:2.5.3", msg="magma: cuda_arch=80 needs a version > 2.5.3") patch("ibm-xl.patch", when="@2.2:2.5.0%xl") patch("ibm-xl.patch", when="@2.2:2.5.0%xl_r") |