From 36ddc10669b7ba1f96f583c546f5beba0484017f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Wed, 22 Nov 2023 11:34:02 +0100
Subject: [PATCH] fix(BSS2): build on JUSUF
The current 2024 stage compiler (gcc@12.3.0) reports a missing header and
fails.
---
packages/hxtorch/package.py | 4 +++-
packages/oppulance/package.py | 4 ++++
packages/pynn-brainscales/package.py | 4 +++-
spack.yaml | 4 ++--
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py
index 61789791..1b3b9e06 100644
--- a/packages/hxtorch/package.py
+++ b/packages/hxtorch/package.py
@@ -16,11 +16,13 @@ class Hxtorch(WafPackage):
maintainers = ['emuller']
+ version('7.0-rc1-fixup2', branch='waf')
version('7.0-rc1-fixup1', branch='waf')
# compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
# building/linking, at runtime and for testing
- depends_on('oppulance@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
+ depends_on('oppulance@7.0-rc1-fixup2', when='@7.0-rc1-fixup2', type=('build', 'link', 'run', 'test'))
+ depends_on('oppulance@7.0-rc1-fixup1', when='@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
# host software dependencies
depends_on('bitsery', type=('build', 'link', 'run', 'test'))
diff --git a/packages/oppulance/package.py b/packages/oppulance/package.py
index 7b99f0d4..a12fac91 100644
--- a/packages/oppulance/package.py
+++ b/packages/oppulance/package.py
@@ -21,6 +21,10 @@ class Oppulance(Package):
depends_on('gmp')
releases = [
+ {
+ 'version': '7.0-rc1-fixup2',
+ 'tag': 'ebrains-7.0-rc1-fixup2'
+ },
{
'version': '7.0-rc1-fixup1',
'tag': 'ebrains-7.0-rc1-fixup1'
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index 42e60e8d..6ad4f12e 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -16,11 +16,13 @@ class PynnBrainscales(WafPackage):
maintainers = ['emuller']
+ version('7.0-rc1-fixup2', branch='waf')
version('7.0-rc1-fixup1', branch='waf')
# compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
# building/linking, at runtime and for testing
- depends_on('oppulance@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
+ depends_on('oppulance@7.0-rc1-fixup2', when='@7.0-rc1-fixup2', type=('build', 'link', 'run', 'test'))
+ depends_on('oppulance@7.0-rc1-fixup1', when='@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
# host software dependencies
depends_on('bitsery', type=('build', 'link', 'run', 'test'))
diff --git a/spack.yaml b/spack.yaml
index db671a35..f825a848 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -12,7 +12,7 @@ spack:
- biobb-model@4.0.0
- biobb-structure-checking@3.12.1
- biobb-structure-utils@4.0.0
- - hxtorch@7.0-rc1-fixup1
+ - hxtorch@7.0-rc1-fixup2
- nest@3.6 +sonata
- neuron@8.2.3 +mpi
- py-bluepyefe@2.2.18
@@ -52,7 +52,7 @@ spack:
- py-tvb-multiscale@2.1.0.ebrains
- py-tvb-storage@2.8.1
- py-viziphant@0.4.0
- - pynn-brainscales@7.0-rc1-fixup1
+ - pynn-brainscales@7.0-rc1-fixup2
- r-rgsl@0.1.1
- r-sbtabvfgen@0.1
- r-uqsa@2.2
--
GitLab