From 001413b20498af42103ee8fdf854011d2821555a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Thu, 2 Dec 2021 18:04:07 +0100
Subject: [PATCH 1/2] Update pynn-brainscales
---
packages/pynn-brainscales/package.py | 31 ++++++++++++++++++++--------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index bede7410..f0fd2108 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -12,7 +12,7 @@ class PynnBrainscales(WafPackage):
#url = "https://github.com/electronicvisions/pynn-brainscales/archive/v0.1.0.tar.gz"
git = "https://github.com/electronicvisions/pynn-brainscales.git"
- version('1.0-rc2', branch='waf')
+ version('2.0-rc0', branch='waf')
depends_on('meta-brainscales', type=('build', 'link', 'run'))
extends('python')
@@ -64,14 +64,27 @@ class PynnBrainscales(WafPackage):
def configure(self, spec, prefix):
"""Setup and configure the project."""
- self.waf('setup', '--project=pynn-brainscales', '--without-grenade-ppu-support', '--without-munge',
- '--project=grenade@ebrains_release-1-rc2',
- '--project=hate@ebrains_release-1-rc2',
- '--project=hxcomm@ebrains_release-1-rc2',
- '--project=lib-rcf@ebrains_release-1-rc2',
- '--project=fisch@ebrains_release-1-rc2',
- '--project=haldls@ebrains_release-1-rc2'
- )
+ self.waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects', '--without-grenade-ppu-support', '--without-munge',
+ '--project=pynn-brainscales@ebrains_release-2-rc0',
+ '--project=haldls@ebrains_release-2-rc0',
+ '--project=grenade@ebrains_release-2-rc0',
+ '--project=code-format@ebrains_release-2-rc0',
+ '--project=logger@ebrains_release-2-rc0',
+ '--project=halco@ebrains_release-2-rc0',
+ '--project=hate@ebrains_release-2-rc0',
+ '--project=fisch@ebrains_release-2-rc0',
+ '--project=ztl@ebrains_release-2-rc0',
+ '--project=hxcomm@ebrains_release-2-rc0',
+ '--project=rant@ebrains_release-2-rc0',
+ '--project=pywrap@ebrains_release-2-rc0',
+ '--project=lib-boost-patches@ebrains_release-2-rc0',
+ '--project=sctrltp@ebrains_release-2-rc0',
+ '--project=hwdb@ebrains_release-2-rc0',
+ '--project=visions-slurm@ebrains_release-2-rc0',
+ '--project=flange@ebrains_release-2-rc0',
+ '--project=lib-rcf@ebrains_release-2-rc0',
+ '--project=bss-hw-params@ebrains_release-2-rc0'
+ )
args = ['--prefix={0}'.format(self.prefix)]
args += self.configure_args()
--
GitLab
From e274a7e75942ab0211dfa2a4eb2f5cf5f506d75b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Thu, 2 Dec 2021 18:04:37 +0100
Subject: [PATCH 2/2] Re-enable pynn-brainscales (with new version)
---
spack.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spack.yaml b/spack.yaml
index e91a97da..bceab47a 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -28,7 +28,7 @@ spack:
- py-formencode %gcc@10.3.0
- tvb-framework ^binutils+ld+gold %gcc@10.3.0
- meta-brainscales %gcc@10.3.0
- #- pynn-brainscales@1.0-rc2 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock %gcc@10.3.0
+ - pynn-brainscales@2.0-rc0 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock %gcc@10.3.0
# demo for codejam12
- funniest1022 %gcc@10.3.0
# NRP
--
GitLab