summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Dewar2020-08-13 11:18:36 +0100
committerAlex Dewar2020-08-13 11:24:08 +0100
commit92f6212c66ddf7626ee843c09295d9f8d1d88690 (patch)
treebeaf94f3f6895eb5349f7a9cdb5d64d5d149679e
parent3cb2f123a0b6e0ca87748ae7c7043eb164e105ee (diff)
downloadaur-92f6212c66ddf7626ee843c09295d9f8d1d88690.tar.gz
v4.3.2
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD31
2 files changed, 28 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9522f60c3f13..beae7e8695f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = genn_cpu_only
- pkgdesc = GeNN: GPU-enhanced neural networks (version 4; without CUDA backend)
- pkgver = 4.2.1
+ pkgdesc = GeNN: GPU-enhanced neural networks (without CUDA backend)
+ pkgver = 4.3.2
pkgrel = 1
epoch = 2
url = https://github.com/genn-team/genn
@@ -9,6 +9,7 @@ pkgbase = genn_cpu_only
makedepends = doxygen
makedepends = doxypypy
makedepends = python
+ makedepends = python-setuptools
makedepends = python-numpy
makedepends = swig
optdepends = python: for pygenn
@@ -18,8 +19,8 @@ pkgbase = genn_cpu_only
conflicts = genn
options = staticlibs
options = !emptydirs
- source = https://github.com/genn-team/genn/archive/4.2.1.tar.gz
- sha256sums = 39af16ab8b79f57b50e0a2796e89c2e1c568ab5c5373830009bf86fa00b6ea72
+ source = https://github.com/genn-team/genn/archive/4.3.2.tar.gz
+ sha256sums = 3d865367a51a9c23a5f7987b0197c55caf7e6e77e65d9180b63ead1b540dfe11
pkgname = genn_cpu_only
diff --git a/PKGBUILD b/PKGBUILD
index a459bcf7d610..8c57b5a6936c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
# Maintainer: Alex Dewar <a.dewar@sussex.ac.uk>
pkgname=genn_cpu_only
-pkgver=4.2.1
+pkgver=4.3.2
pkgrel=1
-pkgdesc="GeNN: GPU-enhanced neural networks (version 4; without CUDA backend)"
+pkgdesc="GeNN: GPU-enhanced neural networks (without CUDA backend)"
epoch=2
arch=(x86_64)
url="https://github.com/genn-team/genn"
license=('GPL')
-makedepends=(doxygen doxypypy python python-numpy swig)
+makedepends=(doxygen doxypypy python python-setuptools python-numpy swig)
optdepends=("python: for pygenn" "python-numpy: for pygenn" "spinecreator: for spineml2genn")
options=(staticlibs !emptydirs)
provides=(genn)
conflicts=(genn)
source=("$url/archive/${pkgver//_/-}.tar.gz")
-sha256sums=('39af16ab8b79f57b50e0a2796e89c2e1c568ab5c5373830009bf86fa00b6ea72')
+sha256sums=('3d865367a51a9c23a5f7987b0197c55caf7e6e77e65d9180b63ead1b540dfe11')
# Make sure we aren't building with CUDA support
export CUDA_PATH=
@@ -58,11 +58,19 @@ package() {
PREFIX="$pkgdir"/usr/ make install
# Install documentation
- mkdir -p "$pkgdir"/usr/share/genn/documentation
- cp -rf documentation/html/* "$pkgdir"/usr/share/genn/documentation
+ mkdir -p "$pkgdir"/usr/share/doc/genn
+ cp -rf documentation/html/* "$pkgdir"/usr/share/doc/genn
# Copy userproject folder
- cp -R userproject "$pkgdir"/usr/src/genn
+ mkdir -p "$pkgdir"/usr/share/genn
+ cp -R userproject "$pkgdir"/usr/share/genn/
+
+ # Make symlinks to userproject headers
+ pushd "$pkgdir"/usr/share/genn/userproject/include
+ for file in *; do
+ ln -s /usr/share/genn/userproject/include/$file "$pkgdir"/usr/include/genn/
+ done
+ popd
# Install standalone SpineML generator
install -m755 bin/spineml_* "$pkgdir"/usr/bin
@@ -71,7 +79,14 @@ package() {
install -m644 lib/libspineml_*.a "$pkgdir"/usr/lib
# Copy SpineML2GeNN headers
- cp -R include/spineml "$pkgdir"/usr/include
+ cp -R include/spineml "$pkgdir"/usr/include/
+
+ # The headers in common don't seem to always get included properly
+ pushd "$pkgdir"/usr/include/spineml/common
+ for f in *;do
+ ln -s /usr/include/spineml/common/$f "$pkgdir"/usr/include/spineml/
+ done
+ popd
# Install pygenn
python setup.py install --prefix=/usr --root="$pkgdir"