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

fix(BSS2): provide include dirs for runtime ppu build flow

parent d0343621
No related branches found
No related tags found
No related merge requests found
......@@ -129,11 +129,28 @@ class Hxtorch(WafPackage):
env.set('WAF_CONFIGURE_LD_LIBRARY_PATH', ':'.join(library))
env.prepend_path('PATH', ':'.join(path))
def setup_dependent_build_environment(self, env, dependent_spec):
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
# programs for BrainScaleS-2's embedded processor.
ppu_include_dirs = []
ppu_dep_names = ['bitsery', 'boost']
for ppu_dep_name in ppu_dep_names:
dep = self.spec[ppu_dep_name]
dep_include_dirs = set(dep.headers.directories)
print('ppu includes (', dep.name, '):', dep_include_dirs, "\n")
ppu_include_dirs.extend(list(dep_include_dirs))
env.set('C_INCLUDE_PATH', ':'.join(ppu_include_dirs))
env.set('CPLUS_INCLUDE_PATH', ':'.join(ppu_include_dirs))
def setup_dependent_build_environment(self, env, dependent_spec):
self._setup_common_env(env)
def setup_run_environment(self, env):
env.prepend_path('PYTHONPATH', self.prefix.lib)
self._setup_common_env(env)
# override configure step as we perform a project setup first
def configure(self, spec, prefix):
......
......@@ -106,11 +106,28 @@ class PynnBrainscales(WafPackage):
env.set('WAF_CONFIGURE_LD_LIBRARY_PATH', ':'.join(library))
env.prepend_path('PATH', ':'.join(path))
def setup_dependent_build_environment(self, env, dependent_spec):
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
# programs for BrainScaleS-2's embedded processor.
ppu_include_dirs = []
ppu_dep_names = ['bitsery', 'boost']
for ppu_dep_name in ppu_dep_names:
dep = self.spec[ppu_dep_name]
dep_include_dirs = set(dep.headers.directories)
print('ppu includes (', dep.name, '):', dep_include_dirs, "\n")
ppu_include_dirs.extend(list(dep_include_dirs))
env.set('C_INCLUDE_PATH', ':'.join(ppu_include_dirs))
env.set('CPLUS_INCLUDE_PATH', ':'.join(ppu_include_dirs))
def setup_dependent_build_environment(self, env, dependent_spec):
self._setup_common_env(env)
def setup_run_environment(self, env):
env.prepend_path('PYTHONPATH', self.prefix.lib)
self._setup_common_env(env)
# override configure step as we perform a project setup first
def configure(self, spec, prefix):
......
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