[arch-commits] Commit in magma/trunk (PKGBUILD cuda11.1.patch cuda11.patch)

2020-10-01 Thread Konstantin Gizdov via arch-commits
Date: Thursday, October 1, 2020 @ 21:54:02
  Author: kgizdov
Revision: 714404

upgpkg: magma 2.5.3-4: cuda 11.1 rebuild

Added:
  magma/trunk/cuda11.1.patch
Modified:
  magma/trunk/PKGBUILD
Deleted:
  magma/trunk/cuda11.patch

+
 PKGBUILD   |   22 +++---
 cuda11.1.patch |   84 +++
 cuda11.patch   |   57 -
 3 files changed, 95 insertions(+), 68 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-01 21:53:53 UTC (rev 714403)
+++ PKGBUILD2020-10-01 21:54:02 UTC (rev 714404)
@@ -5,25 +5,25 @@
 
 pkgname=magma
 pkgver=2.5.3
-pkgrel=3
+pkgrel=4
 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')
+depends=('blas' 'lapack' 'cuda')
+makedepends=('gcc-fortran' 'cmake' 'ninja')
 optdepends=('python: for examples and tests'
-'gcc9-fortran: Fortran interface')
+'gcc-fortran: Fortran interface')
 
source=("${pkgname}-${pkgver}.tar.gz::http://icl.cs.utk.edu/projectsfiles/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz;
-'cuda11.patch'
+'cuda11.1.patch'
 'disable_magma_sparse.patch')
 sha256sums=('c602d269a9f9a3df28f6a4f593be819abb12ed3fa413bba1ff8183de721c5ef6'
-'7a32d8de6fa845131eed3f7345baeb1531ef1d3cfa7e565b258e4cfbbaa66a5c'
+'4d6e7e844a5aa5a771480a1fa61daaf85981f52d852ee444d7ffda63ac9a2db2'
 '259c38004b26395278cdaf431591974e0589dedc0f8bfc14413f854c2a10424f')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/cuda11.patch"
+  patch -Np1 -i "${srcdir}/cuda11.1.patch"
 
   # Temporarily disable magma-sparse until it's fixed by magma upstream:
   # https://bugs.archlinux.org/task/67094
@@ -33,9 +33,9 @@
 build() {
   cd ${pkgname}-${pkgver}
 
-  CC=gcc-9 \
-  CXX=g++-9 \
-  FC=gfortran-9 \
+  CC=/usr/bin/gcc \
+  CXX=/usr/bin/g++ \
+  FC=/usr/bin/gfortran \
   cmake \
 -Bbuild \
 -GNinja \
@@ -42,7 +42,7 @@
 -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"
+-DGPU_TARGET="sm_52 sm_53 sm_60 sm_61 sm_62 sm_70 sm_72 sm_75 sm_80 sm_86"
   ninja -C build
 }
 

Added: cuda11.1.patch
===
--- cuda11.1.patch  (rev 0)
+++ cuda11.1.patch  2020-10-01 21:54:02 UTC (rev 714404)
@@ -0,0 +1,84 @@
+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-10-01 23:41:29.087168262 +0300
 magma-2.5.3-new/CMakeLists.txt 2020-10-01 23:46:00.735320487 +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}" )
+@@ -136,21 +136,25 @@
+ endif()
+ 
+ if (${GPU_TARGET} MATCHES Maxwell)
+-set( GPU_TARGET "${GPU_TARGET} sm_50" )
++set( GPU_TARGET "${GPU_TARGET} sm_50 sm_52 sm_53" )
+ endif()
+ 
+ if (${GPU_TARGET} MATCHES Pascal)
+-set( GPU_TARGET "${GPU_TARGET} sm_60" )
++set( GPU_TARGET "${GPU_TARGET} sm_60 sm_61 sm_62" )
+ endif()
+ 
+ if (${GPU_TARGET} MATCHES Volta)
+-set( GPU_TARGET "${GPU_TARGET} sm_70" )
++set( GPU_TARGET "${GPU_TARGET} sm_70 sm_72" )
+ endif()
+ 
+ if (${GPU_TARGET} MATCHES Turing)
+ set( GPU_TARGET "${GPU_TARGET} sm_75" )
+ endif()
+ 
++if (${GPU_TARGET} MATCHES Ampere)
++set( GPU_TARGET "${GPU_TARGET} sm_80 sm_86" )
++endif()
++
+ if (${GPU_TARGET} MATCHES sm_20)
+ if (NOT MIN_ARCH)
+ set( MIN_ARCH 200 )
+@@ -259,8 +263,26 @@
+ 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 (${GPU_TARGET} MATCHES sm_86)
++if (NOT MIN_ARCH)
++set( MIN_ARCH 860 )
++endif()
++set( NV_SM ${NV_SM} -gencode arch=compute_86,code=sm_86 )
++set( 

[arch-commits] Commit in magma/trunk (PKGBUILD)

2020-07-13 Thread Sven-Hendrik Haase via arch-commits
Date: Tuesday, July 14, 2020 @ 00:07:47
  Author: svenstaro
Revision: 663557

upgpkg: magma 2.5.3-3: Switch to Python 3 optdep

Modified:
  magma/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-13 23:33:35 UTC (rev 663556)
+++ PKGBUILD2020-07-14 00:07:47 UTC (rev 663557)
@@ -5,7 +5,7 @@
 
 pkgname=magma
 pkgver=2.5.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Matrix Algebra on GPU and Multicore Architectures"
 arch=('x86_64')
 url="https://icl.cs.utk.edu/magma/;
@@ -12,7 +12,7 @@
 license=('custom')
 depends=('blas' 'gcc9' 'lapack' 'cuda')
 makedepends=('gcc9-fortran' 'cmake' 'ninja')
-optdepends=('python2: for examples and tests'
+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'


[arch-commits] Commit in magma/trunk (PKGBUILD disable_magma_sparse.patch)

2020-07-12 Thread Sven-Hendrik Haase via arch-commits
Date: Monday, July 13, 2020 @ 01:04:19
  Author: svenstaro
Revision: 663386

upgpkg: magma 2.5.3-2: cuda 11 rebuild

I had to disable magma-sparse for the time being but that's ok as pytorch 
doesn't need it.

Added:
  magma/trunk/disable_magma_sparse.patch
Modified:
  magma/trunk/PKGBUILD

+
 PKGBUILD   |   32 ---
 disable_magma_sparse.patch |   69 +++
 2 files changed, 89 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-13 00:35:19 UTC (rev 663385)
+++ PKGBUILD2020-07-13 01:04:19 UTC (rev 663386)
@@ -5,42 +5,50 @@
 
 pkgname=magma
 pkgver=2.5.3
-pkgrel=1
+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')
+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')
+'cuda11.patch'
+'disable_magma_sparse.patch')
 sha256sums=('c602d269a9f9a3df28f6a4f593be819abb12ed3fa413bba1ff8183de721c5ef6'
-'7a32d8de6fa845131eed3f7345baeb1531ef1d3cfa7e565b258e4cfbbaa66a5c')
+'7a32d8de6fa845131eed3f7345baeb1531ef1d3cfa7e565b258e4cfbbaa66a5c'
+'259c38004b26395278cdaf431591974e0589dedc0f8bfc14413f854c2a10424f')
 
 prepare() {
-  mkdir "${srcdir}"/build
-  patch -Np1 -i "${srcdir}/cuda11.patch" -d "${srcdir}/${pkgname}-${pkgver}"
+  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 "${srcdir}"/build
+  cd ${pkgname}-${pkgver}
 
   CC=gcc-9 \
   CXX=g++-9 \
   FC=gfortran-9 \
-  cmake "${srcdir}/${pkgname}-${pkgver}" \
+  cmake \
+-Bbuild \
+-GNinja \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DBUILD_SHARED_LIBS=ON \
--DGPU_TARGET="sm_35 sm_37 sm_50 sm_53 sm_60 sm_61 sm_62 sm_70 sm_72 sm_75 
sm_80"
-  make
+-DGPU_TARGET="sm_53 sm_60 sm_61 sm_62 sm_70 sm_72 sm_75 sm_80"
+  ninja -C build
 }
 
 package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
+  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/

Added: disable_magma_sparse.patch
===
--- disable_magma_sparse.patch  (rev 0)
+++ disable_magma_sparse.patch  2020-07-13 01:04:19 UTC (rev 663386)
@@ -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.0 +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} )
++# 

[arch-commits] Commit in magma/trunk (PKGBUILD cuda11.patch)

2020-06-22 Thread Konstantin Gizdov via arch-commits
Date: Monday, June 22, 2020 @ 14:04:08
  Author: kgizdov
Revision: 650558

update patch

Modified:
  magma/trunk/PKGBUILD
  magma/trunk/cuda11.patch

--+
 PKGBUILD |2 +-
 cuda11.patch |   28 ++--
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-22 13:51:44 UTC (rev 650557)
+++ PKGBUILD2020-06-22 14:04:08 UTC (rev 650558)
@@ -17,7 +17,7 @@
 
source=("${pkgname}-${pkgver}.tar.gz::http://icl.cs.utk.edu/projectsfiles/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz;
 'cuda11.patch')
 sha256sums=('c602d269a9f9a3df28f6a4f593be819abb12ed3fa413bba1ff8183de721c5ef6'
-'958467ea765b025a89b53bb74d7aea476d01c926ae0631ba0ed5520f9c697646')
+'7a32d8de6fa845131eed3f7345baeb1531ef1d3cfa7e565b258e4cfbbaa66a5c')
 
 prepare() {
   mkdir "${srcdir}"/build

Modified: cuda11.patch
===
--- cuda11.patch2020-06-22 13:51:44 UTC (rev 650557)
+++ cuda11.patch2020-06-22 14:04:08 UTC (rev 650558)
@@ -1,6 +1,15 @@
 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-03-30 03:48:20.0 +0300
-+++ magma-2.5.3-new/CMakeLists.txt 2020-06-22 13:45:54.865895509 +0300
+--- 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()
@@ -31,3 +40,18 @@
  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.0 +0300
 magma-2.5.3-new/interface_cuda/interface.cpp   2020-06-22 
15:48:15.192500739 +0300
+@@ -458,7 +458,11 @@
+ err = cudaPointerGetAttributes( , const_cast( A ));
+ if ( ! err ) {
+ // definitely know type
++#if (CUDA_VERSION >= 1)
++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=529


[arch-commits] Commit in magma/trunk (PKGBUILD)

2020-06-22 Thread Konstantin Gizdov via arch-commits
Date: Monday, June 22, 2020 @ 11:07:23
  Author: kgizdov
Revision: 650378

fix typo

Modified:
  magma/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-22 11:03:52 UTC (rev 650377)
+++ PKGBUILD2020-06-22 11:07:23 UTC (rev 650378)
@@ -34,7 +34,7 @@
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DBUILD_SHARED_LIBS=ON \
--DGPU_TARGET="sm_35 sm_37 sm_50 sm_53 sm_60 sm_61 sm_62 sm_70 sm_72 sm_75 
sm_80" \
+-DGPU_TARGET="sm_35 sm_37 sm_50 sm_53 sm_60 sm_61 sm_62 sm_70 sm_72 sm_75 
sm_80"
   make
 }
 


[arch-commits] Commit in magma/trunk (PKGBUILD cuda11.patch)

2020-06-22 Thread Konstantin Gizdov via arch-commits
Date: Monday, June 22, 2020 @ 11:00:17
  Author: kgizdov
Revision: 650375

cuda11 rebuild

Added:
  magma/trunk/cuda11.patch
Modified:
  magma/trunk/PKGBUILD

--+
 PKGBUILD |   37 ++---
 cuda11.patch |   33 +
 2 files changed, 55 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-22 10:03:44 UTC (rev 650374)
+++ PKGBUILD2020-06-22 11:00:17 UTC (rev 650375)
@@ -10,36 +10,43 @@
 arch=('x86_64')
 url="https://icl.cs.utk.edu/magma/;
 license=('custom')
-depends=('blas' 'lapack' 'cuda')
-makedepends=('gcc-fortran' 'cmake')
-optdepends=('python2: for examples and tests')
-source=("http://icl.cs.utk.edu/projectsfiles/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz;)
-sha256sums=('c602d269a9f9a3df28f6a4f593be819abb12ed3fa413bba1ff8183de721c5ef6')
+depends=('blas' 'gcc9' 'lapack' 'cuda')
+makedepends=('gcc9-fortran' 'cmake')
+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')
+sha256sums=('c602d269a9f9a3df28f6a4f593be819abb12ed3fa413bba1ff8183de721c5ef6'
+'958467ea765b025a89b53bb74d7aea476d01c926ae0631ba0ed5520f9c697646')
 
 prepare() {
-  mkdir "${srcdir}/magma-${pkgver}"/build
+  mkdir "${srcdir}"/build
+  patch -Np1 -i "${srcdir}/cuda11.patch" -d "${srcdir}/${pkgname}-${pkgver}"
 }
 
 build() {
-  cd "${srcdir}/magma-${pkgver}"/build
+  cd "${srcdir}"/build
 
-  cmake .. \
+  CC=gcc-9 \
+  CXX=g++-9 \
+  FC=gfortran-9 \
+  cmake "${srcdir}/${pkgname}-${pkgver}" \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DBUILD_SHARED_LIBS=ON \
--DGPU_TARGET="sm_30 sm_32 sm_35 sm_37 sm_50 sm_53 sm_60 sm_61 sm_62 sm_70 
sm_72 sm_75"
+-DGPU_TARGET="sm_35 sm_37 sm_50 sm_53 sm_60 sm_61 sm_62 sm_70 sm_72 sm_75 
sm_80" \
   make
 }
 
 package() {
-  cd "${srcdir}"/magma-${pkgver}/build
+  cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
 
-  mkdir -p ${pkgdir}/usr/share/magma/example
-  cp -r ${srcdir}/magma-${pkgver}/example/* ${pkgdir}/usr/share/magma/example/
-  mkdir -p ${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
+  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:

Added: cuda11.patch
===
--- cuda11.patch(rev 0)
+++ cuda11.patch2020-06-22 11:00:17 UTC (rev 650375)
@@ -0,0 +1,33 @@
+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-03-30 03:48:20.0 +0300
 magma-2.5.3-new/CMakeLists.txt 2020-06-22 13:45:54.865895509 +0300
+@@ -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} )


[arch-commits] Commit in magma/trunk (PKGBUILD)

2020-05-13 Thread Sven-Hendrik Haase via arch-commits
Date: Thursday, May 14, 2020 @ 02:07:52
  Author: svenstaro
Revision: 627807

upgpkg: magma 2.5.3-1

Modified:
  magma/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-14 01:56:26 UTC (rev 627806)
+++ PKGBUILD2020-05-14 02:07:52 UTC (rev 627807)
@@ -4,8 +4,8 @@
 # Contributor: cornholio 
 
 pkgname=magma
-pkgver=2.5.2
-pkgrel=4
+pkgver=2.5.3
+pkgrel=1
 pkgdesc="Matrix Algebra on GPU and Multicore Architectures"
 arch=('x86_64')
 url="https://icl.cs.utk.edu/magma/;
@@ -14,7 +14,7 @@
 makedepends=('gcc-fortran' 'cmake')
 optdepends=('python2: for examples and tests')
 
source=("http://icl.cs.utk.edu/projectsfiles/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz;)
-sha256sums=('065feb85558f9dd6f4cc4db36ac633a3f787827fc832d0b578a049a43a195620')
+sha256sums=('c602d269a9f9a3df28f6a4f593be819abb12ed3fa413bba1ff8183de721c5ef6')
 
 prepare() {
   mkdir "${srcdir}/magma-${pkgver}"/build


[arch-commits] Commit in magma/trunk (PKGBUILD)

2020-02-16 Thread Sven-Hendrik Haase via arch-commits
Date: Sunday, February 16, 2020 @ 19:56:35
  Author: svenstaro
Revision: 572816

upgpkg: magma 2.5.2-4: Rebuild

Modified:
  magma/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-16 19:55:59 UTC (rev 572815)
+++ PKGBUILD2020-02-16 19:56:35 UTC (rev 572816)
@@ -5,7 +5,7 @@
 
 pkgname=magma
 pkgver=2.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Matrix Algebra on GPU and Multicore Architectures"
 arch=('x86_64')
 url="https://icl.cs.utk.edu/magma/;
@@ -16,11 +16,13 @@
 
source=("http://icl.cs.utk.edu/projectsfiles/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz;)
 sha256sums=('065feb85558f9dd6f4cc4db36ac633a3f787827fc832d0b578a049a43a195620')
 
+prepare() {
+  mkdir "${srcdir}/magma-${pkgver}"/build
+}
+
 build() {
-  cd "${srcdir}/magma-${pkgver}"
+  cd "${srcdir}/magma-${pkgver}"/build
 
-  mkdir -p build
-  cd build
   cmake .. \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \


[arch-commits] Commit in magma/trunk (PKGBUILD)

2019-12-08 Thread Konstantin Gizdov via arch-commits
Date: Sunday, December 8, 2019 @ 11:14:52
  Author: kgizdov
Revision: 536337

upgpkg: magma 2.5.2-3

protobuf rebuild

Modified:
  magma/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-08 09:09:31 UTC (rev 536336)
+++ PKGBUILD2019-12-08 11:14:52 UTC (rev 536337)
@@ -5,7 +5,7 @@
 
 pkgname=magma
 pkgver=2.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Matrix Algebra on GPU and Multicore Architectures"
 arch=('x86_64')
 url="https://icl.cs.utk.edu/magma/;


[arch-commits] Commit in magma/trunk (PKGBUILD)

2019-11-26 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, November 27, 2019 @ 06:26:51
  Author: svenstaro
Revision: 533836

upgpkg: magma 2.5.2-2

cuda 10.2 rebuild

Modified:
  magma/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-27 06:26:10 UTC (rev 533835)
+++ PKGBUILD2019-11-27 06:26:51 UTC (rev 533836)
@@ -5,7 +5,7 @@
 
 pkgname=magma
 pkgver=2.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Matrix Algebra on GPU and Multicore Architectures"
 arch=('x86_64')
 url="https://icl.cs.utk.edu/magma/;


[arch-commits] Commit in magma/trunk (PKGBUILD)

2019-11-26 Thread Sven-Hendrik Haase via arch-commits
Date: Tuesday, November 26, 2019 @ 15:13:42
  Author: svenstaro
Revision: 533473

upgpkg: magma 2.5.2-1

Modified:
  magma/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-26 14:00:00 UTC (rev 533472)
+++ PKGBUILD2019-11-26 15:13:42 UTC (rev 533473)
@@ -4,7 +4,7 @@
 # Contributor: cornholio 
 
 pkgname=magma
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=1
 pkgdesc="Matrix Algebra on GPU and Multicore Architectures"
 arch=('x86_64')
@@ -14,7 +14,7 @@
 makedepends=('gcc-fortran' 'cmake')
 optdepends=('python2: for examples and tests')
 
source=("http://icl.cs.utk.edu/projectsfiles/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz;)
-sha256sums=('ce32c199131515336b30c92a907effe0c441ebc5c5bdb255e4b06b2508de109f')
+sha256sums=('065feb85558f9dd6f4cc4db36ac633a3f787827fc832d0b578a049a43a195620')
 
 build() {
   cd "${srcdir}/magma-${pkgver}"


[arch-commits] Commit in magma/trunk (PKGBUILD)

2019-09-04 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, September 4, 2019 @ 11:55:43
  Author: svenstaro
Revision: 508009

upgpkg: magma 2.5.1-1

Modified:
  magma/trunk/PKGBUILD

--+
 PKGBUILD |   45 +++--
 1 file changed, 7 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-04 10:57:15 UTC (rev 508008)
+++ PKGBUILD2019-09-04 11:55:43 UTC (rev 508009)
@@ -3,8 +3,7 @@
 # Contributor: pingplug 
 # Contributor: cornholio 
 
-pkgbase=magma
-pkgname=(magma magma-cuda)
+pkgname=magma
 pkgver=2.5.1
 pkgrel=1
 pkgdesc="Matrix Algebra on GPU and Multicore Architectures"
@@ -11,43 +10,27 @@
 arch=('x86_64')
 url="https://icl.cs.utk.edu/magma/;
 license=('custom')
-depends=('blas' 'lapack')
-makedepends=('gcc-fortran' 'cmake' 'cuda')
+depends=('blas' 'lapack' 'cuda')
+makedepends=('gcc-fortran' 'cmake')
 optdepends=('python2: for examples and tests')
 
source=("http://icl.cs.utk.edu/projectsfiles/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz;)
 sha256sums=('ce32c199131515336b30c92a907effe0c441ebc5c5bdb255e4b06b2508de109f')
 
-[ -n "${_GPU_TARGET}" ]   && 
_CMAKE_FLAGS+=(-DGPU_TARGET=${_GPU_TARGET})
-[ -f "/usr/lib/ccache/bin/nvcc-ccache" ]  && _CMAKE_FLAGS+=( 
-DCUDA_NVCC_EXECUTABLE=/usr/lib/ccache/bin/nvcc-ccache )
-
-if _cuda_gcc=$(basename $(readlink /opt/cuda/bin/gcc)) ; then
-  [ -L "/usr/lib/ccache/bin/$_cuda_gcc" ] && _CMAKE_FLAGS+=( 
-DCUDA_HOST_COMPILER=/usr/lib/ccache/bin/$_cuda_gcc )
-fi
-
 build() {
   cd "${srcdir}/magma-${pkgver}"
 
-  mkdir -p build build-cuda
+  mkdir -p build
   cd build
   cmake .. \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
--DBUILD_SHARED_LIBS=ON
-  make magma magma_sparse
-
-  cd ../build-cuda
-  cmake .. \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
 -DBUILD_SHARED_LIBS=ON \
 -DGPU_TARGET="sm_30 sm_32 sm_35 sm_37 sm_50 sm_53 sm_60 sm_61 sm_62 sm_70 
sm_72 sm_75"
-  make magma magma_sparse
+  make
 }
 
-package_magma() {
-  cd ${srcdir}/magma-${pkgver}/build
-  # do not build test
-  sed -i "s/install: preinstall/install: magma_sparse/g" Makefile
+package() {
+  cd "${srcdir}"/magma-${pkgver}/build
   make DESTDIR="${pkgdir}" install
 
   mkdir -p ${pkgdir}/usr/share/magma/example
@@ -57,18 +40,4 @@
   install -Dm644 ${srcdir}/magma-${pkgver}/COPYRIGHT 
${pkgdir}/usr/share/licenses/magma/LICENSE
 }
 
-package_magma-cuda() {
-  depends+=('cuda')
-  cd ${srcdir}/magma-${pkgver}/build-uda
-  # do not build test
-  sed -i "s/install: preinstall/install: magma_sparse/g" Makefile
-  make DESTDIR="${pkgdir}" install
-
-  mkdir -p ${pkgdir}/usr/share/magma/example
-  cp -r ${srcdir}/magma-${pkgver}/example/* ${pkgdir}/usr/share/magma/example/
-  mkdir -p ${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: