Merge branch 'update_brainscales' into 'master'

feat: Update BrainScaleS software

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!361

packages/hxtorch/package.py

@@ -14,10 +14,10 @@ class Hxtorch(WafPackage):
     # This repo provides a waf binary used for the build below
     git      = "https://github.com/electronicvisions/pynn-brainscales.git"
 
-    version('5.0-rc1', branch='waf')
+    version('6.0-a1', branch='waf')
 
     # PPU compiler dependencies
-    depends_on('oppulance@5.0-rc1')
+    depends_on('oppulance@6.0-a1')
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run'))
@@ -28,6 +28,7 @@ class Hxtorch(WafPackage):
     depends_on('genpybind@ebrains', type=('build', 'link', 'run'))
     depends_on('gflags', type=('build', 'link', 'run'))
     depends_on('googletest@1.11.0:+gmock', type=('build', 'link', 'run')) # variadic templates needed
+    depends_on('inja', type=('build', 'link', 'run')) # template engine for PPU source jit generation
     depends_on('intel-tbb', type=('build', 'link', 'run'))  # ppu gdbserver
     depends_on('libelf', type=('build', 'link', 'run'))
     depends_on('liblockfile', type=('build', 'link', 'run'))

packages/inja/package.py

+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+
+class Inja(CMakePackage):
+    """Inja is a template engine for modern C++, loosely inspired by jinja for
+    python."""
+
+    homepage = "https://github.com/pantor/inja"
+    url      = "https://github.com/pantor/inja/archive/refs/tags/v3.3.0.tar.gz"
+
+    version('3.3.0', sha256='e628d994762dcdaa9a97f63a9b8b73d9af51af0ffa5acea6bdbba0aceaf8ee25')
+
+    depends_on('nlohmann-json@3.8.0:')
+
+    def cmake_args(self):
+        args = [
+            '-DINJA_USE_EMBEDDED_JSON:BOOL=OFF',
+            '-DINJA_BUILD_TESTS:BOOL=OFF',
+            '-DBUILD_BENCHMARK:BOOL=OFF',
+            '-DCOVERALLS:BOOL=OFF',
+        ]
+        return args

packages/oppulance/package.py

@@ -22,8 +22,8 @@ class Oppulance(Package):
 
     releases = [
         {
-            'version': '5.0-rc1',
-            'tag': 'ebrains-5.0-rc1'
+            'version': '6.0-a1',
+            'tag': 'ebrains-6.0-a1'
         },
     ]
 

packages/pynn-brainscales/package.py

@@ -13,10 +13,10 @@ class PynnBrainscales(WafPackage):
     homepage = "https://github.com/electronicvisions/pynn-brainscales"
     git      = "https://github.com/electronicvisions/pynn-brainscales.git"
 
-    version('5.0-rc1', branch='waf')
+    version('6.0-a1', branch='waf')
 
     # PPU compiler dependencies
-    depends_on('oppulance@5.0-rc1')
+    depends_on('oppulance@6.0-a1')
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run'))
@@ -27,6 +27,7 @@ class PynnBrainscales(WafPackage):
     depends_on('genpybind@ebrains', type=('build', 'link', 'run'))
     depends_on('gflags', type=('build', 'link', 'run'))
     depends_on('googletest@1.11.0:+gmock', type=('build', 'link', 'run')) # variadic templates needed
+    depends_on('inja', type=('build', 'link', 'run')) # template engine for PPU source jit generation
     depends_on('intel-tbb', type=('build', 'link', 'run'))  # ppu gdbserver
     depends_on('libelf', type=('build', 'link', 'run'))
     depends_on('liblockfile', type=('build', 'link', 'run'))

spack.yaml

@@ -21,7 +21,7 @@ spack:
     - biobb-model@4.0.0
     - biobb-structure-checking@3.12.1
     - biobb-structure-utils@4.0.0
-    - hxtorch@5.0-rc1
+    - hxtorch@6.0-a1
     - nest@3.5_rc1 +sonata
     - neuron@8.2.2 +mpi
     - nglview@3.0.4
@@ -63,7 +63,7 @@ spack:
     - py-tvb-library@2.8.1
     - py-tvb-storage@2.8.1
     - py-viziphant@0.3.0
-    - pynn-brainscales@5.0-rc1
+    - pynn-brainscales@6.0-a1
     - r-rgsl@0.1
     - r-sbtabvfgen@0.1
     - r-uqsa@2.2