From e2c24665f4c9fac4bd7bdac32f640dafdc3f0c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Mon, 22 Apr 2024 21:59:11 +0200
Subject: [PATCH] fix: jaxsnn deployment (introduces 8.0-a5)

---
 packages/hxtorch/package.py          | 2 ++
 packages/jaxsnn/package.py           | 1 +
 packages/oppulance/package.py        | 4 ++++
 packages/pynn-brainscales/package.py | 2 ++
 spack.yaml                           | 6 +++---
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py
index 3c9ffef0..7985472e 100644
--- a/packages/hxtorch/package.py
+++ b/packages/hxtorch/package.py
@@ -24,6 +24,7 @@ class Hxtorch(build_brainscales.BuildBrainscales):
 
     maintainers = ['emuller']
 
+    version('8.0-a5',         tag='hxtorch-8.0-a5')
     version('8.0-a4',         tag='hxtorch-8.0-a4')
     version('8.0-a3',         tag='hxtorch-8.0-a3')
     version('8.0-a2',         tag='hxtorch-8.0-a2')
@@ -35,6 +36,7 @@ class Hxtorch(build_brainscales.BuildBrainscales):
     deps_hxtorch_core = [
         # compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
         # building/linking, at runtime and for testing
+        ('oppulance@8.0-a5', { "when":'@8.0-a5', "type": ('build', 'link', 'run', 'test') } ),
         ('oppulance@8.0-a4', { "when":'@8.0-a4', "type": ('build', 'link', 'run', 'test') } ),
         ('oppulance@8.0-a3', { "when":'@8.0-a3', "type": ('build', 'link', 'run', 'test') } ),
         ('oppulance@8.0-a2', { "when":'@8.0-a2', "type": ('build', 'link', 'run', 'test') } ),
diff --git a/packages/jaxsnn/package.py b/packages/jaxsnn/package.py
index 96f7c692..c61589f3 100644
--- a/packages/jaxsnn/package.py
+++ b/packages/jaxsnn/package.py
@@ -26,6 +26,7 @@ class Jaxsnn(build_brainscales.BuildBrainscales):
 
     maintainers = ['emuller']
 
+    version('8.0-a5', tag='jaxsnn-8.0-a5')
     version('8.0-a4', tag='jaxsnn-8.0-a4')
     version('8.0-a3', tag='jaxsnn-8.0-a3')
     version('8.0-a2', tag='jaxsnn-8.0-a2')
diff --git a/packages/oppulance/package.py b/packages/oppulance/package.py
index 07253e6a..0d6feb97 100644
--- a/packages/oppulance/package.py
+++ b/packages/oppulance/package.py
@@ -22,6 +22,10 @@ class Oppulance(Package):
     depends_on('gmp')
 
     releases = [
+        {
+            'version': '8.0-a5',
+            'tag': 'ebrains-8.0-a5'
+        },
         {
             'version': '8.0-a4',
             'tag': 'ebrains-8.0-a4'
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index 8717ebf9..1ba865b8 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -24,6 +24,7 @@ class PynnBrainscales(build_brainscales.BuildBrainscales):
 
     maintainers = ['emuller']
 
+    version('8.0-a5',         tag='pynn-brainscales-8.0-a5')
     version('8.0-a4',         tag='pynn-brainscales-8.0-a4')
     version('8.0-a3',         tag='pynn-brainscales-8.0-a3')
     version('8.0-a2',         tag='pynn-brainscales-8.0-a2')
@@ -34,6 +35,7 @@ class PynnBrainscales(build_brainscales.BuildBrainscales):
 
     # compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
     # building/linking, at runtime and for testing
+    depends_on('oppulance@8.0-a5', when='@8.0-a5', type=('build', 'link', 'run', 'test'))
     depends_on('oppulance@8.0-a4', when='@8.0-a4', type=('build', 'link', 'run', 'test'))
     depends_on('oppulance@8.0-a3', when='@8.0-a3', type=('build', 'link', 'run', 'test'))
     depends_on('oppulance@8.0-a2', when='@8.0-a2', type=('build', 'link', 'run', 'test'))
diff --git a/spack.yaml b/spack.yaml
index 423b558f..e65872cd 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -12,10 +12,10 @@ spack:
     - biobb-model@4.0.0
     - biobb-structure-checking@3.12.1
     - biobb-structure-utils@4.0.0
-    - hxtorch@8.0-a4
+    - hxtorch@8.0-a5
     - nest@3.7 +sonata
     - neuron@8.2.3 +mpi
-    - jaxsnn@8.0-a4
+    - jaxsnn@8.0-a5
     - py-bluepyefe@2.2.18
     - py-bluepymm@0.7.65
     - py-bluepyopt@1.13.86
@@ -54,7 +54,7 @@ spack:
     - py-tvb-multiscale@2.1.0.ebrains
     - py-tvb-storage@2.9
     - py-viziphant@0.4.0
-    - pynn-brainscales@8.0-a4
+    - pynn-brainscales@8.0-a5
     - r-rgsl@0.1.1
     - r-sbtabvfgen@0.1
     - r-uqsa@2.2
-- 
GitLab