From 1a1461a073dcb00ae8841ab127bf55ecf1be235c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Thu, 9 Jun 2022 14:05:57 +0200
Subject: [PATCH] Fix pynn-brainscales build #2 (and revert to rc2)
This should fix the error about an ambiguous template instantiation
for 'struct halco::common::detail::limits<
halco::hicann_dls::vx::v1::SynapseOnSynapseRow, void>' which isn't
triggered on newer g++s. We dropped support for old `v1` hardware; this
was planned anyways.
---
packages/pynn-brainscales/package.py | 42 ++++++++++++++--------------
spack.yaml | 2 +-
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index a766263d..c1d58889 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -9,10 +9,9 @@ class PynnBrainscales(WafPackage):
"""PyNN toplevel for the BrainScaleS-2 neuromorphic hardware systems"""
homepage = "https://github.com/electronicvisions/pynn-brainscales"
- #url = "https://github.com/electronicvisions/pynn-brainscales/archive/v0.1.0.tar.gz"
git = "https://github.com/electronicvisions/pynn-brainscales.git"
- version('2.0-rc1', branch='waf')
+ version('2.0-rc2', branch='waf')
# PPU compiler dependencies
depends_on('oppulance@2.0-rc2')
@@ -102,25 +101,26 @@ class PynnBrainscales(WafPackage):
"""Setup and configure the project."""
self.waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects', '--without-munge',
- '--project=pynn-brainscales@ebrains_release-2-rc1',
- '--project=haldls@ebrains_release-2-rc1',
- '--project=grenade@ebrains_release-2-rc1',
- '--project=code-format@ebrains_release-2-rc1',
- '--project=logger@ebrains_release-2-rc1',
- '--project=halco@ebrains_release-2-rc1',
- '--project=hate@ebrains_release-2-rc1',
- '--project=fisch@ebrains_release-2-rc1',
- '--project=ztl@ebrains_release-2-rc1',
- '--project=hxcomm@ebrains_release-2-rc1',
- '--project=rant@ebrains_release-2-rc1',
- '--project=pywrap@ebrains_release-2-rc1',
- '--project=lib-boost-patches@ebrains_release-2-rc1',
- '--project=sctrltp@ebrains_release-2-rc1',
- '--project=hwdb@ebrains_release-2-rc1',
- '--project=visions-slurm@ebrains_release-2-rc1',
- '--project=flange@ebrains_release-2-rc1',
- '--project=lib-rcf@ebrains_release-2-rc1',
- '--project=bss-hw-params@ebrains_release-2-rc1'
+ '--project=pynn-brainscales@ebrains-' + str(spec.version),
+ '--project=haldls@ebrains-2.0-rc3',
+ '--project=grenade@ebrains-' + str(spec.version),
+ '--project=code-format@ebrains-' + str(spec.version),
+ '--project=logger@ebrains-' + str(spec.version),
+ '--project=halco@ebrains-2.0-rc3',
+ '--project=hate@ebrains-' + str(spec.version),
+ '--project=fisch@ebrains-2.0-rc3',
+ '--project=ztl@ebrains-' + str(spec.version),
+ '--project=hxcomm@ebrains-2.0-rc3', # fix for ebrains build
+ '--project=rant@ebrains-' + str(spec.version),
+ '--project=pywrap@ebrains-' + str(spec.version),
+ '--project=lib-boost-patches@ebrains-' + str(spec.version),
+ '--project=sctrltp@ebrains-' + str(spec.version),
+ '--project=hwdb@ebrains-' + str(spec.version),
+ '--project=visions-slurm@ebrains-' + str(spec.version),
+ '--project=flange@ebrains-' + str(spec.version),
+ '--project=lib-rcf@ebrains-' + str(spec.version),
+ '--project=bss-hw-params@ebrains-' + str(spec.version),
+ '--project=libnux@ebrains-2.0-rc3'
)
args = ['--prefix={0}'.format(self.prefix)]
diff --git a/spack.yaml b/spack.yaml
index 14538e8c..0bec1623 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -28,7 +28,7 @@ spack:
- py-pyaescrypt
- py-formencode
- tvb-framework ^binutils+ld+gold
- - pynn-brainscales@2.0-rc1 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
+ - pynn-brainscales@2.0-rc2 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
- py-neo
#- py-cerebstats
#- py-cerebunit
--
GitLab