Skip to content
Snippets Groups Projects
Commit ae520b17 authored by Eleni Mathioulaki's avatar Eleni Mathioulaki
Browse files

Merge branch 'fix_BrainScaleS_dep_on_boost' into 'test-spack-0.18.1'

Fix[hxtorch,pynn-brainscales] dependency on boost

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!194
parents 62f34857 7098205a
No related branches found
No related tags found
3 merge requests!206create new experimental release,!202Update Spack version and build image/scripts,!194Fix[hxtorch,pynn-brainscales] dependency on boost
Pipeline #19523 passed with stage
in 5 hours, 29 minutes, and 55 seconds
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import * from spack import *
from spack.pkg.builtin.boost import Boost
import os import os
...@@ -21,6 +22,7 @@ class Hxtorch(WafPackage): ...@@ -21,6 +22,7 @@ class Hxtorch(WafPackage):
# host software dependencies # host software dependencies
depends_on('bitsery', type=('build', 'link', 'run')) depends_on('bitsery', type=('build', 'link', 'run'))
depends_on('binutils+gold+ld+plugins', type=('build', 'link', 'run')) # specialize depends_on('binutils+gold+ld+plugins', type=('build', 'link', 'run')) # specialize
depends_on(Boost.with_default_variants)
depends_on('boost@1.69.0: +graph+icu+mpi+python+numpy+coroutine+context cxxstd=17', type=('build', 'link', 'run')) # specialize boost (non-clingo, type=('build', 'link', 'run')) depends_on('boost@1.69.0: +graph+icu+mpi+python+numpy+coroutine+context cxxstd=17', type=('build', 'link', 'run')) # specialize boost (non-clingo, type=('build', 'link', 'run'))
depends_on('cereal', type=('build', 'link', 'run')) depends_on('cereal', type=('build', 'link', 'run'))
depends_on('cppcheck', type=('build', 'link', 'run')) depends_on('cppcheck', type=('build', 'link', 'run'))
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import * from spack import *
from spack.pkg.builtin.boost import Boost
class PynnBrainscales(WafPackage): class PynnBrainscales(WafPackage):
...@@ -19,6 +20,7 @@ class PynnBrainscales(WafPackage): ...@@ -19,6 +20,7 @@ class PynnBrainscales(WafPackage):
# host software dependencies # host software dependencies
depends_on('bitsery', type=('build', 'link', 'run')) depends_on('bitsery', type=('build', 'link', 'run'))
depends_on('binutils+gold+ld+plugins', type=('build', 'link', 'run')) # specialize depends_on('binutils+gold+ld+plugins', type=('build', 'link', 'run')) # specialize
depends_on(Boost.with_default_variants)
depends_on('boost@1.69.0: +graph+icu+mpi+python+numpy+coroutine+context cxxstd=17', type=('build', 'link', 'run')) # specialize boost (non-clingo, type=('build', 'link', 'run')) depends_on('boost@1.69.0: +graph+icu+mpi+python+numpy+coroutine+context cxxstd=17', type=('build', 'link', 'run')) # specialize boost (non-clingo, type=('build', 'link', 'run'))
depends_on('cereal', type=('build', 'link', 'run')) depends_on('cereal', type=('build', 'link', 'run'))
depends_on('cppcheck', type=('build', 'link', 'run')) depends_on('cppcheck', type=('build', 'link', 'run'))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment