diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py index c4991029b69d1d1262b06201a0d7c91c66988e18..6178979112627af4ff3d7481734d967320ea37e0 100644 --- a/packages/hxtorch/package.py +++ b/packages/hxtorch/package.py @@ -16,11 +16,11 @@ class Hxtorch(WafPackage): 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 # 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 depends_on('bitsery', type=('build', 'link', 'run', 'test')) @@ -132,10 +132,6 @@ class Hxtorch(WafPackage): env.prepend_path('PATH', ':'.join(path)) 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 = [] diff --git a/packages/oppulance/package.py b/packages/oppulance/package.py index c8525f3b94374a5c7dcf94e0db7ea12fd620ad5e..7b99f0d4ac856f5e0dfec9204eac4038ec52ebbb 100644 --- a/packages/oppulance/package.py +++ b/packages/oppulance/package.py @@ -22,8 +22,8 @@ class Oppulance(Package): releases = [ { - 'version': '7.0-rc1', - 'tag': 'ebrains-7.0-rc1' + 'version': '7.0-rc1-fixup1', + 'tag': 'ebrains-7.0-rc1-fixup1' }, ] diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py index 7ce106c83d3eb05445c416900ac915b01b2aa6a8..42e60e8db467a9d31e08e1fad09e5e68e326767e 100644 --- a/packages/pynn-brainscales/package.py +++ b/packages/pynn-brainscales/package.py @@ -16,11 +16,11 @@ class PynnBrainscales(WafPackage): 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 # 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 depends_on('bitsery', type=('build', 'link', 'run', 'test')) @@ -109,10 +109,6 @@ class PynnBrainscales(WafPackage): env.prepend_path('PATH', ':'.join(path)) 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 = [] diff --git a/spack.yaml b/spack.yaml index 28faf98c78b6878f7df88806ae23b04156fb9bdb..ab6e6c426f11465b36d3c9e0e27c2357e92c511a 100644 --- a/spack.yaml +++ b/spack.yaml @@ -12,7 +12,7 @@ spack: - biobb-model@4.0.0 - biobb-structure-checking@3.12.1 - biobb-structure-utils@4.0.0 - - hxtorch@7.0-rc1 + - hxtorch@7.0-rc1-fixup1 - nest@3.6 +sonata - neuron@8.2.3 +mpi - py-bluepyefe@2.2.18 @@ -52,7 +52,7 @@ spack: - py-tvb-multiscale@2.1.0.ebrains - py-tvb-storage@2.8.1 - py-viziphant@0.3.0 - - pynn-brainscales@7.0-rc1 + - pynn-brainscales@7.0-rc1-fixup1 - r-rgsl@0.1.1 - r-sbtabvfgen@0.1 - r-uqsa@2.2