zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unofficial MAGMA release and enabled MAGMA in e4s (#24400)

Browse Source
This commit is contained in:
G-Ragghianti 2021-06-18 13:28:35 -04:00 committed by GitHub
parent 58272c9d57
commit 94d6d3951a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
View File

@ -178,7 +178,7 @@ spack:
- hpx +cuda cuda_arch=70 - hpx +cuda cuda_arch=70
- kokkos +cuda +wrapper cuda_arch=70 - kokkos +cuda +wrapper cuda_arch=70
- kokkos-kernels +cuda cuda_arch=70 ^kokkos +cuda +wrapper cuda_arch=70 - kokkos-kernels +cuda cuda_arch=70 ^kokkos +cuda +wrapper cuda_arch=70
#- magma cuda_arch=70 - magma cuda_arch=70
- raja +cuda cuda_arch=70 - raja +cuda cuda_arch=70
- slate +cuda cuda_arch=70 - slate +cuda cuda_arch=70
- strumpack +cuda ~slate cuda_arch=70 - strumpack +cuda ~slate cuda_arch=70

4
var/spack/repos/builtin/packages/magma/package.py
View File

@ -15,11 +15,10 @@ class Magma(CMakePackage, CudaPackage):
homepage = "http://icl.cs.utk.edu/magma/" homepage = "http://icl.cs.utk.edu/magma/"
url = "http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-2.2.0.tar.gz" url = "http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-2.2.0.tar.gz"
maintainers = ['stomov', 'luszczek'] maintainers = ['stomov', 'luszczek', 'G-Ragghianti']
test_requires_compiler = True test_requires_compiler = True
version('2.6.0', sha256='82e34aff266253dac0ab9f795dc60dc891469f617c37856b04fc2f7679ba0d22')
version('2.5.4', sha256='7734fb417ae0c367b418dea15096aef2e278a423e527c615aab47f0683683b67') version('2.5.4', sha256='7734fb417ae0c367b418dea15096aef2e278a423e527c615aab47f0683683b67')
version('2.5.3', sha256='c602d269a9f9a3df28f6a4f593be819abb12ed3fa413bba1ff8183de721c5ef6') version('2.5.3', sha256='c602d269a9f9a3df28f6a4f593be819abb12ed3fa413bba1ff8183de721c5ef6')
version('2.5.2', sha256='065feb85558f9dd6f4cc4db36ac633a3f787827fc832d0b578a049a43a195620') version('2.5.2', sha256='065feb85558f9dd6f4cc4db36ac633a3f787827fc832d0b578a049a43a195620')
@ -56,7 +55,6 @@ class Magma(CMakePackage, CudaPackage):
patch('magma-2.5.0.patch', when='@2.5.0') patch('magma-2.5.0.patch', when='@2.5.0')
patch('magma-2.5.0-cmake.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('cmake-W.patch', when='@2.5.0:%nvhpc')
patch('sm_37.patch', when='@2.6.0 cuda_arch=37')
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec

27
var/spack/repos/builtin/packages/magma/sm_37.patch
View File

@ -1,27 +0,0 @@
--- a/CMakeLists.txt 2021-06-17 05:48:48.000000000 +0000
+++ b/CMakeLists.txt 2021-06-17 15:50:13.683664538 +0000
@@ -145,7 +145,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)
@@ -195,6 +195,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 )