Skip to content
Snippets Groups Projects
Commit 72c7ee20 authored by Eric Müller's avatar Eric Müller :mountain_bicyclist:
Browse files

feat(bss2): update software (fix python install paths)

This incorporates changes in the BrainScaleS-2 repos (touch almost
all repositories) to install Python libraries (incl. CPython extension
libraries) into some local site-packages path, instead of a `lib/` path.
parent b987335a
No related branches found
No related tags found
2 merge requests!461create new experimental release,!460feat(bss2): update software (fix python install paths)
Pipeline #26256 passed with stage
in 3 hours, 17 minutes, and 48 seconds
...@@ -16,11 +16,11 @@ class Hxtorch(WafPackage): ...@@ -16,11 +16,11 @@ class Hxtorch(WafPackage):
maintainers = ['emuller'] maintainers = ['emuller']
version('7.0-rc1', branch='waf') version('7.0-rc1-fixup1', branch='waf')
# compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for # compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
# building/linking, at runtime and for testing # building/linking, at runtime and for testing
depends_on('oppulance@7.0-rc1', type=('build', 'link', 'run', 'test')) depends_on('oppulance@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
# host software dependencies # host software dependencies
depends_on('bitsery', type=('build', 'link', 'run', 'test')) depends_on('bitsery', type=('build', 'link', 'run', 'test'))
...@@ -132,10 +132,6 @@ class Hxtorch(WafPackage): ...@@ -132,10 +132,6 @@ class Hxtorch(WafPackage):
env.prepend_path('PATH', ':'.join(path)) env.prepend_path('PATH', ':'.join(path))
def _setup_common_env(self, env): def _setup_common_env(self, env):
# TODO: use standard install layout for Python modules and extensions'
# shared objects => remove then
env.prepend_path('PYTHONPATH', self.prefix.lib)
# grenade needs to find some libraries for the JIT-compilation of # grenade needs to find some libraries for the JIT-compilation of
# programs for BrainScaleS-2's embedded processor. # programs for BrainScaleS-2's embedded processor.
ppu_include_dirs = [] ppu_include_dirs = []
......
...@@ -22,8 +22,8 @@ class Oppulance(Package): ...@@ -22,8 +22,8 @@ class Oppulance(Package):
releases = [ releases = [
{ {
'version': '7.0-rc1', 'version': '7.0-rc1-fixup1',
'tag': 'ebrains-7.0-rc1' 'tag': 'ebrains-7.0-rc1-fixup1'
}, },
] ]
......
...@@ -16,11 +16,11 @@ class PynnBrainscales(WafPackage): ...@@ -16,11 +16,11 @@ class PynnBrainscales(WafPackage):
maintainers = ['emuller'] maintainers = ['emuller']
version('7.0-rc1', branch='waf') version('7.0-rc1-fixup1', branch='waf')
# compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for # compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
# building/linking, at runtime and for testing # building/linking, at runtime and for testing
depends_on('oppulance@7.0-rc1', type=('build', 'link', 'run', 'test')) depends_on('oppulance@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
# host software dependencies # host software dependencies
depends_on('bitsery', type=('build', 'link', 'run', 'test')) depends_on('bitsery', type=('build', 'link', 'run', 'test'))
...@@ -109,10 +109,6 @@ class PynnBrainscales(WafPackage): ...@@ -109,10 +109,6 @@ class PynnBrainscales(WafPackage):
env.prepend_path('PATH', ':'.join(path)) env.prepend_path('PATH', ':'.join(path))
def _setup_common_env(self, env): def _setup_common_env(self, env):
# TODO: use standard install layout for Python modules and extensions'
# shared objects => remove then
env.prepend_path('PYTHONPATH', self.prefix.lib)
# grenade needs to find some libraries for the JIT-compilation of # grenade needs to find some libraries for the JIT-compilation of
# programs for BrainScaleS-2's embedded processor. # programs for BrainScaleS-2's embedded processor.
ppu_include_dirs = [] ppu_include_dirs = []
......
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