From 4d34c21378489dfcd29dfa596165336f97f1a937 Mon Sep 17 00:00:00 2001
From: Eleni Mathioulaki <emathioulaki@athenarc.gr>
Date: Wed, 8 Jun 2022 10:42:41 +0200
Subject: [PATCH] Revert "Merge branch 'update_pynn-brainscales' into 'master'"
This reverts merge request !102
---
packages/pynn-brainscales/package.py | 41 ++++++++++++++--------------
spack.yaml | 2 +-
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index a6b673e3..a766263d 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -9,9 +9,10 @@ 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-rc2', branch='waf')
+ version('2.0-rc1', branch='waf')
# PPU compiler dependencies
depends_on('oppulance@2.0-rc2')
@@ -101,25 +102,25 @@ 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-' + spec.version,
- '--project=haldls@ebrains-' + spec.version,
- '--project=grenade@ebrains-' + spec.version,
- '--project=code-format@ebrains-' + spec.version,
- '--project=logger@ebrains-' + spec.version,
- '--project=halco@ebrains-' + spec.version,
- '--project=hate@ebrains-' + spec.version,
- '--project=fisch@ebrains-' + spec.version,
- '--project=ztl@ebrains-' + spec.version,
- '--project=hxcomm@ebrains-' + spec.version,
- '--project=rant@ebrains-' + spec.version,
- '--project=pywrap@ebrains-' + spec.version,
- '--project=lib-boost-patches@ebrains-' + spec.version,
- '--project=sctrltp@ebrains-' + spec.version,
- '--project=hwdb@ebrains-' + spec.version,
- '--project=visions-slurm@ebrains-' + spec.version,
- '--project=flange@ebrains-' + spec.version,
- '--project=lib-rcf@ebrains-' + spec.version,
- '--project=bss-hw-params@ebrains-' + spec.version
+ '--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'
)
args = ['--prefix={0}'.format(self.prefix)]
diff --git a/spack.yaml b/spack.yaml
index 0bec1623..14538e8c 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-rc2 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
+ - pynn-brainscales@2.0-rc1 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
- py-neo
#- py-cerebstats
#- py-cerebunit
--
GitLab