[arch-commits] Commit in magma/repos/community-testing-x86_64 (6 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Tue Jul 14 00:07:57 UTC 2020
Date: Tuesday, July 14, 2020 @ 00:07:56
Author: svenstaro
Revision: 663558
archrelease: copy trunk to community-testing-x86_64
Added:
magma/repos/community-testing-x86_64/PKGBUILD
(from rev 663557, magma/trunk/PKGBUILD)
magma/repos/community-testing-x86_64/cuda11.patch
(from rev 663557, magma/trunk/cuda11.patch)
magma/repos/community-testing-x86_64/disable_magma_sparse.patch
(from rev 663557, magma/trunk/disable_magma_sparse.patch)
Deleted:
magma/repos/community-testing-x86_64/PKGBUILD
magma/repos/community-testing-x86_64/cuda11.patch
magma/repos/community-testing-x86_64/disable_magma_sparse.patch
----------------------------+
PKGBUILD | 120 ++++++++++++++++++-------------------
cuda11.patch | 114 +++++++++++++++++------------------
disable_magma_sparse.patch | 138 +++++++++++++++++++++----------------------
3 files changed, 186 insertions(+), 186 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-14 00:07:47 UTC (rev 663557)
+++ PKGBUILD 2020-07-14 00:07:56 UTC (rev 663558)
@@ -1,60 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Contributor: bartus <arch-user-repoᘓbartus.33mail.com>
-# Contributor: pingplug <pingplug at foxmail.com>
-# Contributor: cornholio <vigo.the.unholy.carpathian at gmail.com>
-
-pkgname=magma
-pkgver=2.5.3
-pkgrel=2
-pkgdesc="Matrix Algebra on GPU and Multicore Architectures"
-arch=('x86_64')
-url="https://icl.cs.utk.edu/magma/"
-license=('custom')
-depends=('blas' 'gcc9' 'lapack' 'cuda')
-makedepends=('gcc9-fortran' 'cmake' 'ninja')
-optdepends=('python2: for examples and tests'
- 'gcc9-fortran: Fortran interface')
-source=("${pkgname}-${pkgver}.tar.gz::http://icl.cs.utk.edu/projectsfiles/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz"
- 'cuda11.patch'
- 'disable_magma_sparse.patch')
-sha256sums=('c602d269a9f9a3df28f6a4f593be819abb12ed3fa413bba1ff8183de721c5ef6'
- '7a32d8de6fa845131eed3f7345baeb1531ef1d3cfa7e565b258e4cfbbaa66a5c'
- '259c38004b26395278cdaf431591974e0589dedc0f8bfc14413f854c2a10424f')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i "${srcdir}/cuda11.patch"
-
- # Temporarily disable magma-sparse until it's fixed by magma upstream:
- # https://bugs.archlinux.org/task/67094
- patch -Np1 -i "${srcdir}/disable_magma_sparse.patch"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- CC=gcc-9 \
- CXX=g++-9 \
- FC=gfortran-9 \
- cmake \
- -Bbuild \
- -GNinja \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_SHARED_LIBS=ON \
- -DGPU_TARGET="sm_53 sm_60 sm_61 sm_62 sm_70 sm_72 sm_75 sm_80"
- ninja -C build
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- DESTDIR="${pkgdir}" ninja -Cbuild install
-
- install -d "${pkgdir}"/usr/share/magma/example
- cp -r "${srcdir}"/magma-${pkgver}/example/* "${pkgdir}"/usr/share/magma/example/
- install -d "${pkgdir}"/usr/share/magma/testing
- cp -r "${srcdir}"/magma-${pkgver}/testing/* "${pkgdir}"/usr/share/magma/testing/
- install -Dm644 "${srcdir}"/magma-${pkgver}/COPYRIGHT "${pkgdir}"/usr/share/licenses/magma/LICENSE
-}
-
-# vim:set ts=2 sw=2 et:
Copied: magma/repos/community-testing-x86_64/PKGBUILD (from rev 663557, magma/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-07-14 00:07:56 UTC (rev 663558)
@@ -0,0 +1,60 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: bartus <arch-user-repoᘓbartus.33mail.com>
+# Contributor: pingplug <pingplug at foxmail.com>
+# Contributor: cornholio <vigo.the.unholy.carpathian at gmail.com>
+
+pkgname=magma
+pkgver=2.5.3
+pkgrel=3
+pkgdesc="Matrix Algebra on GPU and Multicore Architectures"
+arch=('x86_64')
+url="https://icl.cs.utk.edu/magma/"
+license=('custom')
+depends=('blas' 'gcc9' 'lapack' 'cuda')
+makedepends=('gcc9-fortran' 'cmake' 'ninja')
+optdepends=('python: for examples and tests'
+ 'gcc9-fortran: Fortran interface')
+source=("${pkgname}-${pkgver}.tar.gz::http://icl.cs.utk.edu/projectsfiles/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz"
+ 'cuda11.patch'
+ 'disable_magma_sparse.patch')
+sha256sums=('c602d269a9f9a3df28f6a4f593be819abb12ed3fa413bba1ff8183de721c5ef6'
+ '7a32d8de6fa845131eed3f7345baeb1531ef1d3cfa7e565b258e4cfbbaa66a5c'
+ '259c38004b26395278cdaf431591974e0589dedc0f8bfc14413f854c2a10424f')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i "${srcdir}/cuda11.patch"
+
+ # Temporarily disable magma-sparse until it's fixed by magma upstream:
+ # https://bugs.archlinux.org/task/67094
+ patch -Np1 -i "${srcdir}/disable_magma_sparse.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ CC=gcc-9 \
+ CXX=g++-9 \
+ FC=gfortran-9 \
+ cmake \
+ -Bbuild \
+ -GNinja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=ON \
+ -DGPU_TARGET="sm_53 sm_60 sm_61 sm_62 sm_70 sm_72 sm_75 sm_80"
+ ninja -C build
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ DESTDIR="${pkgdir}" ninja -Cbuild install
+
+ install -d "${pkgdir}"/usr/share/magma/example
+ cp -r "${srcdir}"/magma-${pkgver}/example/* "${pkgdir}"/usr/share/magma/example/
+ install -d "${pkgdir}"/usr/share/magma/testing
+ cp -r "${srcdir}"/magma-${pkgver}/testing/* "${pkgdir}"/usr/share/magma/testing/
+ install -Dm644 "${srcdir}"/magma-${pkgver}/COPYRIGHT "${pkgdir}"/usr/share/licenses/magma/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: cuda11.patch
===================================================================
--- cuda11.patch 2020-07-14 00:07:47 UTC (rev 663557)
+++ cuda11.patch 2020-07-14 00:07:56 UTC (rev 663558)
@@ -1,57 +0,0 @@
-diff -aur --color magma-2.5.3-old/CMakeLists.txt magma-2.5.3-new/CMakeLists.txt
---- magma-2.5.3-old/CMakeLists.txt 2020-06-22 16:18:13.789152294 +0300
-+++ magma-2.5.3-new/CMakeLists.txt 2020-06-22 17:00:01.365798021 +0300
-@@ -101,7 +101,7 @@
-
- # ----------------------------------------
- # locate CUDA libraries
--set( GPU_TARGET "Kepler Maxwell Pascal" CACHE STRING "CUDA architectures to compile for; one or more of Fermi, Kepler, Maxwell, Pascal, Volta, or valid sm_[0-9][0-9]" )
-+set( GPU_TARGET "Kepler Maxwell Pascal" CACHE STRING "CUDA architectures to compile for; one or more of Fermi, Kepler, Maxwell, Pascal, Volta, Turing, Ampere or valid sm_[0-9][0-9]" )
- find_package( CUDA )
- if (CUDA_FOUND)
- message( STATUS "Found CUDA ${CUDA_VERSION}" )
-@@ -151,6 +151,10 @@
- set( GPU_TARGET "${GPU_TARGET} sm_75" )
- endif()
-
-+ if (${GPU_TARGET} MATCHES Ampere)
-+ set( GPU_TARGET "${GPU_TARGET} sm_80" )
-+ endif()
-+
- if (${GPU_TARGET} MATCHES sm_20)
- if (NOT MIN_ARCH)
- set( MIN_ARCH 200 )
-@@ -259,8 +263,17 @@
- message( STATUS " compile for CUDA arch 7.5 (Turing)" )
- endif()
-
-+ if (${GPU_TARGET} MATCHES sm_80)
-+ if (NOT MIN_ARCH)
-+ set( MIN_ARCH 800 )
-+ endif()
-+ set( NV_SM ${NV_SM} -gencode arch=compute_80,code=sm_80 )
-+ set( NV_COMP -gencode arch=compute_80,code=compute_80 )
-+ message( STATUS " compile for CUDA arch 8.0 (Ampere)" )
-+ endif()
-+
- if (NOT MIN_ARCH)
-- message( FATAL_ERROR "GPU_TARGET must contain one or more of Fermi, Kepler, Maxwell, Pascal, Volta, Turing, or valid sm_[0-9][0-9]" )
-+ message( FATAL_ERROR "GPU_TARGET must contain one or more of Fermi, Kepler, Maxwell, Pascal, Volta, Turing, Ampere or valid sm_[0-9][0-9]" )
- endif()
-
- set( CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC -DHAVE_CUBLAS ${NV_SM} ${NV_COMP} ${FORTRAN_CONVENTION} )
-diff -aur --color magma-2.5.3-old/interface_cuda/interface.cpp magma-2.5.3-new/interface_cuda/interface.cpp
---- magma-2.5.3-old/interface_cuda/interface.cpp 2020-03-30 03:48:24.000000000 +0300
-+++ magma-2.5.3-new/interface_cuda/interface.cpp 2020-06-22 15:48:15.192500739 +0300
-@@ -458,7 +458,11 @@
- err = cudaPointerGetAttributes( &attr, const_cast<void*>( A ));
- if ( ! err ) {
- // definitely know type
-+#if (CUDA_VERSION >= 10000)
-+ return (attr.type == cudaMemoryTypeDevice);
-+#else
- return (attr.memoryType == cudaMemoryTypeDevice);
-+#endif
- }
- else if ( err == cudaErrorInvalidValue ) {
- // clear error; see http://icl.cs.utk.edu/magma/forum/viewtopic.php?f=2&t=529
Copied: magma/repos/community-testing-x86_64/cuda11.patch (from rev 663557, magma/trunk/cuda11.patch)
===================================================================
--- cuda11.patch (rev 0)
+++ cuda11.patch 2020-07-14 00:07:56 UTC (rev 663558)
@@ -0,0 +1,57 @@
+diff -aur --color magma-2.5.3-old/CMakeLists.txt magma-2.5.3-new/CMakeLists.txt
+--- magma-2.5.3-old/CMakeLists.txt 2020-06-22 16:18:13.789152294 +0300
++++ magma-2.5.3-new/CMakeLists.txt 2020-06-22 17:00:01.365798021 +0300
+@@ -101,7 +101,7 @@
+
+ # ----------------------------------------
+ # locate CUDA libraries
+-set( GPU_TARGET "Kepler Maxwell Pascal" CACHE STRING "CUDA architectures to compile for; one or more of Fermi, Kepler, Maxwell, Pascal, Volta, or valid sm_[0-9][0-9]" )
++set( GPU_TARGET "Kepler Maxwell Pascal" CACHE STRING "CUDA architectures to compile for; one or more of Fermi, Kepler, Maxwell, Pascal, Volta, Turing, Ampere or valid sm_[0-9][0-9]" )
+ find_package( CUDA )
+ if (CUDA_FOUND)
+ message( STATUS "Found CUDA ${CUDA_VERSION}" )
+@@ -151,6 +151,10 @@
+ set( GPU_TARGET "${GPU_TARGET} sm_75" )
+ endif()
+
++ if (${GPU_TARGET} MATCHES Ampere)
++ set( GPU_TARGET "${GPU_TARGET} sm_80" )
++ endif()
++
+ if (${GPU_TARGET} MATCHES sm_20)
+ if (NOT MIN_ARCH)
+ set( MIN_ARCH 200 )
+@@ -259,8 +263,17 @@
+ message( STATUS " compile for CUDA arch 7.5 (Turing)" )
+ endif()
+
++ if (${GPU_TARGET} MATCHES sm_80)
++ if (NOT MIN_ARCH)
++ set( MIN_ARCH 800 )
++ endif()
++ set( NV_SM ${NV_SM} -gencode arch=compute_80,code=sm_80 )
++ set( NV_COMP -gencode arch=compute_80,code=compute_80 )
++ message( STATUS " compile for CUDA arch 8.0 (Ampere)" )
++ endif()
++
+ if (NOT MIN_ARCH)
+- message( FATAL_ERROR "GPU_TARGET must contain one or more of Fermi, Kepler, Maxwell, Pascal, Volta, Turing, or valid sm_[0-9][0-9]" )
++ message( FATAL_ERROR "GPU_TARGET must contain one or more of Fermi, Kepler, Maxwell, Pascal, Volta, Turing, Ampere or valid sm_[0-9][0-9]" )
+ endif()
+
+ set( CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC -DHAVE_CUBLAS ${NV_SM} ${NV_COMP} ${FORTRAN_CONVENTION} )
+diff -aur --color magma-2.5.3-old/interface_cuda/interface.cpp magma-2.5.3-new/interface_cuda/interface.cpp
+--- magma-2.5.3-old/interface_cuda/interface.cpp 2020-03-30 03:48:24.000000000 +0300
++++ magma-2.5.3-new/interface_cuda/interface.cpp 2020-06-22 15:48:15.192500739 +0300
+@@ -458,7 +458,11 @@
+ err = cudaPointerGetAttributes( &attr, const_cast<void*>( A ));
+ if ( ! err ) {
+ // definitely know type
++#if (CUDA_VERSION >= 10000)
++ return (attr.type == cudaMemoryTypeDevice);
++#else
+ return (attr.memoryType == cudaMemoryTypeDevice);
++#endif
+ }
+ else if ( err == cudaErrorInvalidValue ) {
+ // clear error; see http://icl.cs.utk.edu/magma/forum/viewtopic.php?f=2&t=529
Deleted: disable_magma_sparse.patch
===================================================================
--- disable_magma_sparse.patch 2020-07-14 00:07:47 UTC (rev 663557)
+++ disable_magma_sparse.patch 2020-07-14 00:07:56 UTC (rev 663558)
@@ -1,69 +0,0 @@
-diff -ruN magma-2.5.3/CMakeLists.txt magma-2.5.3-patched/CMakeLists.txt
---- magma-2.5.3/CMakeLists.txt 2020-03-30 02:48:20.000000000 +0200
-+++ magma-2.5.3-patched/CMakeLists.txt 2020-07-13 02:39:59.957710966 +0200
-@@ -491,19 +504,19 @@
- # compile MAGMA sparse library
-
- # sparse doesn't have Fortran at the moment, so no need for above shenanigans
--include_directories( sparse/include )
--include_directories( sparse/control )
--include_directories( testing )
--cuda_add_library( magma_sparse ${libsparse_all} )
--target_link_libraries( magma_sparse
-- magma
-- ${blas_fix}
-- ${LAPACK_LIBRARIES}
-- ${CUDA_CUDART_LIBRARY}
-- ${CUDA_CUBLAS_LIBRARIES}
-- ${CUDA_cusparse_LIBRARY}
--)
--add_custom_target( sparse-lib DEPENDS magma_sparse )
-+# include_directories( sparse/include )
-+# include_directories( sparse/control )
-+# include_directories( testing )
-+# cuda_add_library( magma_sparse ${libsparse_all} )
-+# target_link_libraries( magma_sparse
-+# magma
-+# ${blas_fix}
-+# ${LAPACK_LIBRARIES}
-+# ${CUDA_CUDART_LIBRARY}
-+# ${CUDA_CUBLAS_LIBRARIES}
-+# ${CUDA_cusparse_LIBRARY}
-+# )
-+# add_custom_target( sparse-lib DEPENDS magma_sparse )
-
-
- # ----------------------------------------
-@@ -534,21 +547,21 @@
-
- # ----------------------------------------
- # compile each sparse tester
--set( CMAKE_RUNTIME_OUTPUT_DIRECTORY sparse/testing )
--foreach( TEST ${sparse_testing_all} )
-- string( REGEX REPLACE "\\.(cpp|f90|F90)" "" EXE ${TEST} )
-- string( REGEX REPLACE "sparse/testing/" "" EXE ${EXE} )
-- #message( "${TEST} --> ${EXE}" )
-- add_executable( ${EXE} ${TEST} )
-- target_link_libraries( ${EXE} magma_sparse magma )
-- list( APPEND sparse-testing ${EXE} )
--endforeach()
--add_custom_target( sparse-testing DEPENDS ${sparse-testing} )
-+# set( CMAKE_RUNTIME_OUTPUT_DIRECTORY sparse/testing )
-+# foreach( TEST ${sparse_testing_all} )
-+# string( REGEX REPLACE "\\.(cpp|f90|F90)" "" EXE ${TEST} )
-+# string( REGEX REPLACE "sparse/testing/" "" EXE ${EXE} )
-+# #message( "${TEST} --> ${EXE}" )
-+# add_executable( ${EXE} ${TEST} )
-+# target_link_libraries( ${EXE} magma_sparse magma )
-+# list( APPEND sparse-testing ${EXE} )
-+# endforeach()
-+# add_custom_target( sparse-testing DEPENDS ${sparse-testing} )
-
-
- # ----------------------------------------
- # what to install
--install( TARGETS magma magma_sparse ${blas_fix}
-+install( TARGETS magma ${blas_fix}
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib )
Copied: magma/repos/community-testing-x86_64/disable_magma_sparse.patch (from rev 663557, magma/trunk/disable_magma_sparse.patch)
===================================================================
--- disable_magma_sparse.patch (rev 0)
+++ disable_magma_sparse.patch 2020-07-14 00:07:56 UTC (rev 663558)
@@ -0,0 +1,69 @@
+diff -ruN magma-2.5.3/CMakeLists.txt magma-2.5.3-patched/CMakeLists.txt
+--- magma-2.5.3/CMakeLists.txt 2020-03-30 02:48:20.000000000 +0200
++++ magma-2.5.3-patched/CMakeLists.txt 2020-07-13 02:39:59.957710966 +0200
+@@ -491,19 +504,19 @@
+ # compile MAGMA sparse library
+
+ # sparse doesn't have Fortran at the moment, so no need for above shenanigans
+-include_directories( sparse/include )
+-include_directories( sparse/control )
+-include_directories( testing )
+-cuda_add_library( magma_sparse ${libsparse_all} )
+-target_link_libraries( magma_sparse
+- magma
+- ${blas_fix}
+- ${LAPACK_LIBRARIES}
+- ${CUDA_CUDART_LIBRARY}
+- ${CUDA_CUBLAS_LIBRARIES}
+- ${CUDA_cusparse_LIBRARY}
+-)
+-add_custom_target( sparse-lib DEPENDS magma_sparse )
++# include_directories( sparse/include )
++# include_directories( sparse/control )
++# include_directories( testing )
++# cuda_add_library( magma_sparse ${libsparse_all} )
++# target_link_libraries( magma_sparse
++# magma
++# ${blas_fix}
++# ${LAPACK_LIBRARIES}
++# ${CUDA_CUDART_LIBRARY}
++# ${CUDA_CUBLAS_LIBRARIES}
++# ${CUDA_cusparse_LIBRARY}
++# )
++# add_custom_target( sparse-lib DEPENDS magma_sparse )
+
+
+ # ----------------------------------------
+@@ -534,21 +547,21 @@
+
+ # ----------------------------------------
+ # compile each sparse tester
+-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY sparse/testing )
+-foreach( TEST ${sparse_testing_all} )
+- string( REGEX REPLACE "\\.(cpp|f90|F90)" "" EXE ${TEST} )
+- string( REGEX REPLACE "sparse/testing/" "" EXE ${EXE} )
+- #message( "${TEST} --> ${EXE}" )
+- add_executable( ${EXE} ${TEST} )
+- target_link_libraries( ${EXE} magma_sparse magma )
+- list( APPEND sparse-testing ${EXE} )
+-endforeach()
+-add_custom_target( sparse-testing DEPENDS ${sparse-testing} )
++# set( CMAKE_RUNTIME_OUTPUT_DIRECTORY sparse/testing )
++# foreach( TEST ${sparse_testing_all} )
++# string( REGEX REPLACE "\\.(cpp|f90|F90)" "" EXE ${TEST} )
++# string( REGEX REPLACE "sparse/testing/" "" EXE ${EXE} )
++# #message( "${TEST} --> ${EXE}" )
++# add_executable( ${EXE} ${TEST} )
++# target_link_libraries( ${EXE} magma_sparse magma )
++# list( APPEND sparse-testing ${EXE} )
++# endforeach()
++# add_custom_target( sparse-testing DEPENDS ${sparse-testing} )
+
+
+ # ----------------------------------------
+ # what to install
+-install( TARGETS magma magma_sparse ${blas_fix}
++install( TARGETS magma ${blas_fix}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib )
More information about the arch-commits
mailing list