From a6162a642228dfcbcc880926129d5c2b0b10ad33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Tue, 12 Sep 2023 13:54:24 +0200
Subject: [PATCH] fix(BSS2): runtime/test dependency on oppulance
---
packages/hxtorch/package.py | 9 +++++----
packages/pynn-brainscales/package.py | 8 +++++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py
index 7be0e3ab..570796be 100644
--- a/packages/hxtorch/package.py
+++ b/packages/hxtorch/package.py
@@ -11,13 +11,14 @@ class Hxtorch(WafPackage):
"""hxtorch --- a PyTorch-based toplevel for the BrainScaleS-2 neuromorphic hardware systems"""
homepage = "https://github.com/electronicvisions/hxtorch"
- # This repo provides a waf binary used for the build below
+ # This repo provides a custom waf binary used for the build below
git = "https://github.com/electronicvisions/pynn-brainscales.git"
version('7.0-a1', branch='waf')
- # PPU compiler dependencies
- depends_on('oppulance@7.0-a1')
+ # compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
+ # building/linking, at runtime and for testing
+ depends_on('oppulance@7.0-a1', type=('build', 'link', 'run', 'test'))
# host software dependencies
depends_on('bitsery', type=('build', 'link', 'run'))
@@ -36,7 +37,7 @@ class Hxtorch(WafPackage):
depends_on('log4cxx@0.12.1:', type=('build', 'link', 'run'))
depends_on('pkgconfig', type=('build', 'link', 'run'))
depends_on('psmisc', type=('run', 'test'))
- depends_on('python@3.7.0:', type=('build', 'link', 'run')) # BrainScaleS(-2, type=('build', 'link', 'run')) only supports Python >= 3.7
+ depends_on('python@3.7.0:', type=('build', 'link', 'run')) # BrainScaleS-2 only supports Python >= 3.7
depends_on('py-h5py', type=('build', 'link', 'run')) # PyNN tests need it
depends_on('py-jax@0.3.25:', type=('build', 'link', 'run'))
depends_on('py-matplotlib', type=('build', 'link', 'run'))
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index 5c7d33f7..8b8a6735 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -11,12 +11,14 @@ class PynnBrainscales(WafPackage):
"""PyNN toplevel for the BrainScaleS-2 neuromorphic hardware systems"""
homepage = "https://github.com/electronicvisions/pynn-brainscales"
+ # This repo provides a custom waf binary used for the build below
git = "https://github.com/electronicvisions/pynn-brainscales.git"
version('7.0-a1', branch='waf')
- # PPU compiler dependencies
- depends_on('oppulance@7.0-a1')
+ # compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
+ # building/linking, at runtime and for testing
+ depends_on('oppulance@7.0-a1', type=('build', 'link', 'run', 'test'))
# host software dependencies
depends_on('bitsery', type=('build', 'link', 'run'))
@@ -35,7 +37,7 @@ class PynnBrainscales(WafPackage):
depends_on('log4cxx@0.12.1:', type=('build', 'link', 'run'))
depends_on('pkgconfig', type=('build', 'link', 'run'))
depends_on('psmisc', type=('run', 'test'))
- depends_on('python@3.7.0:', type=('build', 'link', 'run')) # BrainScaleS(-2, type=('build', 'link', 'run')) only supports Python >= 3.7
+ depends_on('python@3.7.0:', type=('build', 'link', 'run')) # BrainScaleS-2 only supports Python >= 3.7
depends_on('py-deap@1.3.1:', type=('build', 'link', 'run'))
depends_on('py-h5py', type=('build', 'link', 'run')) # PyNN tests need it
depends_on('py-matplotlib', type=('build', 'link', 'run'))
--
GitLab