diff options
| author | Alex Dewar | 2019-04-30 15:21:55 +0100 |
|---|---|---|
| committer | Alex Dewar | 2019-04-30 15:22:14 +0100 |
| commit | 45dd61644510f022ff097ed7b55f71fbc0eabbb3 (patch) | |
| tree | 11e2c9cfd4bd4988122986644a74e36d3b349579 | |
| parent | abd0f31feb1b7eacbbc154badb984be38906c643 (diff) | |
| download | aur-45dd61644510f022ff097ed7b55f71fbc0eabbb3.tar.gz | |
Set CUDA_PATH for GeNN
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | set-CUDA_PATH.patch | 14 |
3 files changed, 33 insertions, 5 deletions
@@ -1,15 +1,18 @@ pkgbase = genn pkgdesc = GeNN: GPU-enhanced neural networks (version 4) pkgver = 4.0.0_RC1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/genn-team/genn arch = x86_64 license = GPL makedepends = doxygen depends = cuda options = staticlibs + options = !emptydirs source = https://github.com/genn-team/genn/archive/4.0.0-RC1.tar.gz + source = set-CUDA_PATH.patch sha256sums = b94c0b8c05d8525987f9d4279478dd41f68e8d9824cb5344adb5fbe257b38e99 + sha256sums = a42059714b49bb84ec961053507aa4d2f7658b4ecfb059573a43bc101184c33a pkgname = genn @@ -1,7 +1,7 @@ # Maintainer: Alex Dewar <a.dewar@sussex.ac.uk> pkgname=genn pkgver=4.0.0_RC1 -pkgrel=1 +pkgrel=2 pkgdesc="GeNN: GPU-enhanced neural networks (version 4)" arch=(x86_64) url="https://github.com/genn-team/genn" @@ -9,8 +9,20 @@ license=('GPL') depends=(cuda) makedepends=(doxygen) options=(staticlibs !emptydirs) -source=("$url/archive/${pkgver//_/-}.tar.gz") -sha256sums=('b94c0b8c05d8525987f9d4279478dd41f68e8d9824cb5344adb5fbe257b38e99') +source=("$url/archive/${pkgver//_/-}.tar.gz" + "set-CUDA_PATH.patch") +sha256sums=('b94c0b8c05d8525987f9d4279478dd41f68e8d9824cb5344adb5fbe257b38e99' + 'a42059714b49bb84ec961053507aa4d2f7658b4ecfb059573a43bc101184c33a') + +prepare() { + cd genn-${pkgver//_/-} + + # Set install path + sed -i 's|/usr/local|'$pkgdir'/usr|' Makefile + + # Set CUDA_PATH to correct location on Arch + patch -Np0 < ../set-CUDA_PATH.patch +} build() { cd genn-${pkgver//_/-} @@ -19,7 +31,6 @@ build() { ./makedoc # Build libgenn.a etc. - sed -i 's|/usr/local|'$pkgdir'/usr|' Makefile make } diff --git a/set-CUDA_PATH.patch b/set-CUDA_PATH.patch new file mode 100644 index 000000000000..0a9b22d176e6 --- /dev/null +++ b/set-CUDA_PATH.patch @@ -0,0 +1,14 @@ +--- bin/genn-buildmodel.sh 2019-04-16 17:59:16.000000000 +0100 ++++ bin/genn-buildmodel2.sh 2019-04-30 15:16:07.374193751 +0100 +@@ -70,9 +70,8 @@ + GENERATOR="$GENERATOR"_coverage + fi + +-# If CUDA path isn't set, default to standard path for (at least Ubuntu) Linux systems +-# **NOTE** setting CUDA_PATH is a REQUIRED post-installation action when installing CUDA so this shouldn't be required +-export CUDA_PATH=${CUDA_PATH-/usr/local/cuda} ++# Set to default path for Arch Linux ++export CUDA_PATH=/opt/cuda + + # generate model code + BASEDIR=$(dirname "$0") |