diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2022-02-10 16:52:23 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 16:52:23 -0600 |
| commit | e502a264b5541209a23afa65c6a8f10490f8b3d0 (patch) | |
| tree | 729c5d56d3988066781e80feb98c3c0370cf8548 /var | |
| parent | 93e7efdc42aa2c562e1a33060afac7ed8e11d9bf (diff) | |
| download | spack-e502a264b5541209a23afa65c6a8f10490f8b3d0.tar.gz spack-e502a264b5541209a23afa65c6a8f10490f8b3d0.tar.bz2 spack-e502a264b5541209a23afa65c6a8f10490f8b3d0.tar.xz spack-e502a264b5541209a23afa65c6a8f10490f8b3d0.zip | |
MAGMA: declare cuda_arch support conflicts (#28811)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/magma/package.py | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/magma/sm_37.patch | 27 |
2 files changed, 11 insertions, 28 deletions
diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py index b9d26fa290..fb9d1b4aa3 100644 --- a/var/spack/repos/builtin/packages/magma/package.py +++ b/var/spack/repos/builtin/packages/magma/package.py @@ -57,13 +57,23 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage): # https://bitbucket.org/icl/magma/issues/25/error-cusparsesolveanalysisinfo_t-does-not conflicts('^cuda@11:', when='@:2.5.3') + # Many cuda_arch values are not yet recognized by MAGMA's CMakeLists.txt + for target in [10, 11, 12, 13, 21, 32, 52, 53, 61, 62, 72, 86]: + 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') + patch('ibm-xl.patch', when='@2.2:2.5.0%xl') patch('ibm-xl.patch', when='@2.2:2.5.0%xl_r') patch('magma-2.3.0-gcc-4.8.patch', when='@2.3.0%gcc@:4.8') patch('magma-2.5.0.patch', when='@2.5.0') patch('magma-2.5.0-cmake.patch', when='@2.5.0') patch('cmake-W.patch', when='@2.5.0:%nvhpc') - patch('sm_37.patch', when='@2.5.4 cuda_arch=37') @run_before('cmake') def generate_cuda(self): diff --git a/var/spack/repos/builtin/packages/magma/sm_37.patch b/var/spack/repos/builtin/packages/magma/sm_37.patch deleted file mode 100644 index 0d7eaf0dce..0000000000 --- a/var/spack/repos/builtin/packages/magma/sm_37.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/CMakeLists.txt 2021-06-19 15:53:21.028881552 +0000 -+++ b/CMakeLists.txt 2021-06-19 15:54:09.204228276 +0000 -@@ -132,7 +132,7 @@ - endif() - - if (GPU_TARGET MATCHES Kepler) -- set( GPU_TARGET "${GPU_TARGET} sm_30 sm_35" ) -+ set( GPU_TARGET "${GPU_TARGET} sm_30 sm_35 sm_37" ) - endif() - - if (GPU_TARGET MATCHES Maxwell) -@@ -182,6 +182,15 @@ - message( STATUS " compile for CUDA arch 3.5 (Kepler)" ) - endif() - -+ if (GPU_TARGET MATCHES sm_37) -+ if (NOT MIN_ARCH) -+ set( MIN_ARCH 300 ) -+ endif() -+ set( NV_SM ${NV_SM} -gencode arch=compute_37,code=sm_37 ) -+ set( NV_COMP -gencode arch=compute_37,code=compute_37 ) -+ message( STATUS " compile for CUDA arch 3.7 (Kepler)" ) -+ endif() -+ - if (GPU_TARGET MATCHES sm_50) - if (NOT MIN_ARCH) - set( MIN_ARCH 500 ) |