From d5bb12658deaf53b06fbed167bdb31a5512a842d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de> Date: Wed, 26 Feb 2025 13:14:55 +0100 Subject: [PATCH] fix(genpybind): build on llvm@15 --- packages/genpybind/package.py | 1 + packages/hxtorch/package.py | 2 +- packages/pynn-brainscales/package.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/genpybind/package.py b/packages/genpybind/package.py index f5398139..012d2e5b 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') + 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') depends_on( diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py index ef237ceb..d4a5ea66 100644 --- a/packages/hxtorch/package.py +++ b/packages/hxtorch/package.py @@ -53,7 +53,7 @@ class Hxtorch(build_brainscales.BuildBrainscales): ('boost@1.69.0: +graph+icu+mpi+numpy+coroutine+context+filesystem+python+serialization+system+thread+program_options cxxstd=17', { "type": ('build', 'link', 'run', 'test') } ), ('cereal', { "type": ('build', 'link', 'run', 'test') } ), ('cppcheck', { "type": ('build', 'link', 'run') } ), - ('genpybind@ebrains', { "type": ('build', 'link') } ), + ('genpybind@ebrains-llvm15', { "type": ('build', 'link') } ), ('gflags', { "type": ('build', 'link', 'run') } ), ('googletest@1.11.0:+gmock', { "type": ('build', 'link', 'run') } ), # variadic templates needed ('inja', { "type": ('build', 'link', 'run', 'test') } ),# template engine for PPU source jit generation diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py index 3e68558d..e0836671 100644 --- a/packages/pynn-brainscales/package.py +++ b/packages/pynn-brainscales/package.py @@ -51,7 +51,7 @@ class PynnBrainscales(build_brainscales.BuildBrainscales): depends_on('boost@1.69.0: +graph+icu+mpi+numpy+coroutine+context+filesystem+python+serialization+system+thread+program_options cxxstd=17', type=('build', 'link', 'run', 'test')) depends_on('cereal', type=('build', 'link', 'run', 'test')) depends_on('cppcheck', type=('build', 'link', 'run')) - depends_on('genpybind@ebrains', type=('build', 'link')) + depends_on('genpybind@ebrains-llvm15', type=('build', 'link')) 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', 'test')) # template engine for PPU source jit generation -- GitLab