Updated to 2020.05.001, disabled GPU builds

2 files changed, 56 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d568fc871cb8..6ecd9d13c143 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = elpa
 	pkgdesc = Eigenvalue SoLvers for Petaflop-Applications
-	pkgver = 2019.11.001
-	pkgrel = 3
+	pkgver = 2020.05.001
+	pkgrel = 1
 	url = https://elpa.mpcdf.mpg.de/html/Releases
 	arch = x86_64
 	license = LGPL3
@@ -9,10 +9,9 @@ pkgbase = elpa
 	makedepends = python
 	makedepends = vim
 	depends = scalapack
-	optdepends = cuda: GPU support
 	provides = elpa
-	source = https://elpa.mpcdf.mpg.de/html/Releases/2019.11.001/elpa-2019.11.001.tar.gz
-	sha256sums = 10374a8f042e23c7e1094230f7e2993b6f3580908a213dbdf089792d05aff357
+	source = https://elpa.mpcdf.mpg.de/html/Releases/2020.05.001/elpa-2020.05.001.tar.gz
+	sha256sums = 66ff1cf332ce1c82075dc7b5587ae72511d2bcb3a45322c94af6b01996439ce5
 
 pkgname = elpa
 
diff --git a/PKGBUILD b/PKGBUILD
index f672c416626d..db665a87aae0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,83 +2,72 @@
 
 pkgname=elpa
 PkgName=ELPA
-pkgver=2019.11.001
-pkgrel=3
+pkgver=2020.05.001
+pkgrel=1
 arch=('x86_64')
 pkgdesc="Eigenvalue SoLvers for Petaflop-Applications"
 url="https://elpa.mpcdf.mpg.de/html/Releases"
 license=("LGPL3")
 depends=('scalapack')
 makedepends=('gcc-fortran' 'python' 'vim')
-optdepends=('cuda: GPU support')
 provides=('elpa')
 source=("$url/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('10374a8f042e23c7e1094230f7e2993b6f3580908a213dbdf089792d05aff357')
+sha256sums=('66ff1cf332ce1c82075dc7b5587ae72511d2bcb3a45322c94af6b01996439ce5')
 
 prepare() {
-    export CC=mpicc
-    export FC=mpifort
-    unset LDFLAGS
-   
-    # Checking if nvcc is in PATH
-    if [ $( echo -n $( which nvcc) | tail -c 4 ) == nvcc ]
-    then
-        export _ACC=yes
-        export LDFLAGS="$LDFLAGS -L/opt/cuda/lib64"
-        echo "GPU is enabled"
-    else
-        export _ACC=no
-        echo "GPU is disabled"
-    fi
-   
-    # Detecting AVX compatibility
-    _AVXCOMP=$( gcc -march=native -dM -E - < /dev/null \
-        | egrep "AVX" | sort | tail -n 1 | awk -F'_' '{print $3}' )
-    case $_AVXCOMP in
-        AVX512*)
-            _AVX=yes
-            _AVX2=yes
-            _AVX512=yes
-            echo "Full vectorization is enabled"
-            ;;
-        AVX2)
-            _AVX=yes
-            _AVX2=yes
-            _AVX512=no
-            echo "Improved vectorization is enabled"
-            ;;
-        AVX)
-            _AVX=yes
-            _AVX2=no
-            _AVX512=no
-            echo "Basic vectorization is enabled"
-            ;;
-        *)
-            _AVX=no
-            _AVX2=no
-            _AVX512=no
-            echo "No vectorization is enabled"
-            ;;
-    esac
+  export CC=mpicc
+  export FC=mpifort
+  unset CFLAGS
+  unset FCFLAGS
+  unset LDFLAGS
+  
+  # Detecting AVX compatibility
+  _AVXCOMP=$( gcc -march=native -dM -E - < /dev/null \
+      | egrep "AVX" | sort | tail -n 1 | awk -F'_' '{print $3}' )
+  case $_AVXCOMP in
+      AVX512*)
+          _AVX=yes
+          _AVX2=yes
+          _AVX512=yes
+          echo "Full vectorization is enabled"
+          ;;
+      AVX2)
+          _AVX=yes
+          _AVX2=yes
+          _AVX512=no
+          echo "Improved vectorization is enabled"
+          ;;
+      AVX)
+          _AVX=yes
+          _AVX2=no
+          _AVX512=no
+          echo "Basic vectorization is enabled"
+          ;;
+      *)
+          _AVX=no
+          _AVX2=no
+          _AVX512=no
+          echo "No vectorization is enabled"
+          ;;
+  esac
 }
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
-     ./configure --prefix=/usr                                  \
-                 --enable-openmp                                \
-                 --enable-avx=$_AVX                             \
-                 --enable-avx2=$_AVX2                           \
-                 --enable-avx512=$_AVX512                       \
-                 --enable-gpu=$_ACC                             \
-                 CFLAGS="$CFLAGS -march=native"                 \
-                 FCFLAGS="$FCFLAGS -fallow-argument-mismatch"   \
-                 LIBS='-lblas -llapack -lscalapack'
-
-    # As of 2019.11.01 parallel builds are still broken
-    make -j1
+  cd "$srcdir/$pkgname-$pkgver"
+   ./configure --prefix=/usr                        \
+               --enable-openmp                      \
+               --enable-avx=$_AVX                   \
+               --enable-avx2=$_AVX2                 \
+               --enable-avx512=$_AVX512             \
+               CFLAGS="-O3 -march=native"           \
+               FCFLAGS="-O3 -march=native"          \
+               LIBS='-lblas -llapack -lscalapack'   
+  
+  # As of 2020.05.01 parallel builds are still broken
+  make -j1
 }
 
 package() {
-    cd $srcdir/$pkgname-$pkgver
-    make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }