From 11bd19f35b06131d3f8526cd13944910c949be89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Fri, 7 Mar 2025 14:07:12 +0100
Subject: [PATCH] feat(BSS2): update packages (end-of-July 2024 -> "now")
---
packages/build-brainscales/package.py | 8 ++++++++
packages/genpybind/package.py | 1 +
packages/oppulance/package.py | 7 +++++++
packages/wf-brainscales2-demos/package.py | 1 +
spack.yaml | 8 ++++----
5 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/packages/build-brainscales/package.py b/packages/build-brainscales/package.py
index 327501d1..9d78d8ce 100644
--- a/packages/build-brainscales/package.py
+++ b/packages/build-brainscales/package.py
@@ -15,6 +15,13 @@ import spack.build_environment
class BuildBrainscales(WafPackage):
"""Common stuff for BrainScaleS packages..."""
+ version(
+ "10.0-a1",
+ git="https://github.com/electronicvisions/releases-ebrains",
+ tag="ebrains-10.0-a1",
+ commit="d9bd675b446be8f313972aef2d6657ffbbb91ed2",
+ submodules=True,
+ )
version(
"9.0-a9",
git="https://github.com/electronicvisions/releases-ebrains",
@@ -59,6 +66,7 @@ class BuildBrainscales(WafPackage):
)
# common dependencies of BuildBrainscales-derived packages
+ depends_on('oppulance@10.0-a1', when='@10.0-a1', type=('build', 'link', 'run', 'test'))
depends_on('oppulance@9.0-a9', when='@9.0-a9', type=('build', 'link', 'run', 'test'))
depends_on('oppulance@9.0-a8', when='@9.0-a8', type=('build', 'link', 'run', 'test'))
depends_on('oppulance@9.0-a7', when='@9.0-a7', type=('build', 'link', 'run', 'test'))
diff --git a/packages/genpybind/package.py b/packages/genpybind/package.py
index bca2c483..79e1d7e8 100644
--- a/packages/genpybind/package.py
+++ b/packages/genpybind/package.py
@@ -21,6 +21,7 @@ class Genpybind(WafPackage):
version('develop', branch='develop')
version('visions', branch='master', git='https://github.com/electronicvisions/genpybind')
+ # good for ebrains-10.0 too…
version('ebrains-llvm15', tag='ebrains-9.0-a9', git='https://github.com/electronicvisions/genpybind')
version('ebrains', tag='ebrains_release-1-rc1', git='https://github.com/electronicvisions/genpybind')
diff --git a/packages/oppulance/package.py b/packages/oppulance/package.py
index 7dc37d0a..ede72e35 100644
--- a/packages/oppulance/package.py
+++ b/packages/oppulance/package.py
@@ -22,6 +22,13 @@ class Oppulance(Package):
depends_on('wget')
depends_on('gmp')
+ version(
+ "10.0-a1",
+ git="https://github.com/electronicvisions/releases-ebrains",
+ tag="ebrains-10.0-a1",
+ commit="d9bd675b446be8f313972aef2d6657ffbbb91ed2",
+ submodules=True,
+ )
version(
"9.0-a9",
git="https://github.com/electronicvisions/releases-ebrains",
diff --git a/packages/wf-brainscales2-demos/package.py b/packages/wf-brainscales2-demos/package.py
index 02592a1d..e98423a2 100644
--- a/packages/wf-brainscales2-demos/package.py
+++ b/packages/wf-brainscales2-demos/package.py
@@ -16,6 +16,7 @@ class WfBrainscales2Demos(Package):
maintainers = ["emuller", "muffgaga"]
# ECM: we probably should build the ipynb file in this package
+ version("10.0-a1", tag="jupyter-notebooks-10.0-a1")
version("9.0-a9", tag="jupyter-notebooks-9.0-a9")
version("9.0-a8", tag="jupyter-notebooks-9.0-a8")
version("9.0-a7", tag="jupyter-notebooks-9.0-a7")
diff --git a/spack.yaml b/spack.yaml
index 9d86fd2f..beaf68f9 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -12,10 +12,10 @@ spack:
- py-biobb-model@4.1.0
- py-biobb-structure-checking@3.13.4
- py-biobb-structure-utils@4.1.0
- - hxtorch@9.0-a9
+ - hxtorch@10.0-a1
- nest@3.8 +sonata
- neuron@8.2.3 +mpi
- - jaxsnn@9.0-a9
+ - jaxsnn@10.0-a1
- py-bluepyefe@2.3.6
- py-bluepymm@0.8.7
- py-bluepyopt@1.14.11
@@ -62,14 +62,14 @@ spack:
- py-tvb-ext-xircuits@1.1.0
- py-viziphant@0.4.0
- py-vbi
- - pynn-brainscales@9.0-a9
+ - pynn-brainscales@10.0-a1
- r-rgsl@0.1.1
- r-sbtabvfgen@0.1
- r-uqsa@2.2
- sda@7.3.3d
# Workflows (meta-packages)
- wf-biobb
- - wf-brainscales2-demos@9.0-a9
+ - wf-brainscales2-demos@10.0-a1
- wf-bsb@4.4 +nest +neuron
- wf-protein-association-rates@0.1
- wf-multi-area-model@1.2.0
--
GitLab