diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py index 68dbdeff7dcf1f2d5ed17cc6a4c8e091c8bdbb71..a766263d4cf10749ca6b6a1f650c664150402edd 100644 --- a/packages/pynn-brainscales/package.py +++ b/packages/pynn-brainscales/package.py @@ -15,14 +15,7 @@ class PynnBrainscales(WafPackage): version('2.0-rc1', branch='waf') # PPU compiler dependencies - depends_on('gettext') - depends_on('zlib') - depends_on('bison') - depends_on('flex') - depends_on('m4') - depends_on('texinfo') - depends_on('wget') - conflicts('flex', when='@2.6.3', msg='Binutils 2.25 for Nux doesn\'t build with flex 2.6.3.') + depends_on('oppulance@2.0-rc2') # host software dependencies depends_on('bitsery', type=('build', 'link', 'run')) @@ -108,7 +101,7 @@ class PynnBrainscales(WafPackage): def configure(self, spec, prefix): """Setup and configure the project.""" - self.waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects', '--without-grenade-ppu-support', '--without-munge', + self.waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects', '--without-munge', '--project=pynn-brainscales@ebrains_release-2-rc1', '--project=haldls@ebrains_release-2-rc1', '--project=grenade@ebrains_release-2-rc1', diff --git a/spack.yaml b/spack.yaml index cbd61944346648fdaed74f83bc3df664d9c3db17..14538e8cb2522356fbb51317fc1eef71c590d676 100644 --- a/spack.yaml +++ b/spack.yaml @@ -30,7 +30,6 @@ spack: - tvb-framework ^binutils+ld+gold - pynn-brainscales@2.0-rc1 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock - py-neo - - oppulance@2.0-rc2 #- py-cerebstats #- py-cerebunit - py-cerebrus