diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py index 63c3e5cc9a74d8f54c39b374c94787965bee194b..eac2bab6d6e8c918a4ad17fb63468f0902efcbb5 100644 --- a/packages/hxtorch/package.py +++ b/packages/hxtorch/package.py @@ -19,12 +19,14 @@ class Hxtorch(WafPackage): maintainers = ['emuller'] + version('8.0-a1', tag='hxtorch-8.0-a1') version('7.0-rc1-fixup3', tag='hxtorch-7.0-rc1-fixup3') version('7.0-rc1-fixup2', tag='hxtorch-7.0-rc1-fixup2') 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@8.0-a1', when='@8.0-a1', type=('build', 'link', 'run', 'test')) depends_on('oppulance@7.0-rc1-fixup3', when='@7.0-rc1-fixup3', type=('build', 'link', 'run', 'test')) depends_on('oppulance@7.0-rc1-fixup2', when='@7.0-rc1-fixup2', type=('build', 'link', 'run', 'test')) depends_on('oppulance@7.0-rc1-fixup1', when='@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test')) @@ -81,14 +83,23 @@ class Hxtorch(WafPackage): with working_dir(self.stage.source_path): python = which('python3') - python('./waf', 'setup', '--repo-db-url=https://github.com/electronicvisions/projects', - '--clone-depth=2', - '--without-munge', - '--without-hxcomm-hostarq', - '--without-hxcomm-extoll', - '--project=hxtorch', - '--release-branch=ebrains-' + str(self.spec.version) - ) + if self.spec.satisfies('@:7'): + python('./waf', 'setup', '--repo-db-url=https://github.com/electronicvisions/projects', + '--clone-depth=2', + '--without-munge', + '--without-hxcomm-hostarq', + '--without-hxcomm-extoll', + '--project=hxtorch', + '--release-branch=ebrains-' + str(self.spec.version) + ) + else: + python('./waf', 'setup', '--repo-db-url=https://github.com/electronicvisions/projects', + '--clone-depth=2', + '--without-munge', + '--without-hxcomm-hostarq', + '--project=hxtorch', + '--release-branch=ebrains-' + str(self.spec.version) + ) # in the configure step, we need access to all archived .git folders def custom_archive(self, destination): diff --git a/packages/oppulance/package.py b/packages/oppulance/package.py index c6e2021bf050bff4c6f2fd0f1bbe95d559bbf753..25f86d7fae9517759e5558519706d5849297d78a 100644 --- a/packages/oppulance/package.py +++ b/packages/oppulance/package.py @@ -21,6 +21,10 @@ class Oppulance(Package): depends_on('gmp') releases = [ + { + 'version': '8.0-a1', + 'tag': 'ebrains-8.0-a1' + }, { 'version': '7.0-rc1-fixup3', 'tag': 'ebrains-7.0-rc1-fixup3' diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py index 4b088549071851ddd8685e399bbb4f3cd784db08..6e9a70899565fdbfa20b14e6c4ab8fac49bc4489 100644 --- a/packages/pynn-brainscales/package.py +++ b/packages/pynn-brainscales/package.py @@ -18,13 +18,15 @@ class PynnBrainscales(WafPackage): git = "https://github.com/electronicvisions/pynn-brainscales.git" maintainers = ['emuller'] - + + version('8.0-a1', tag='pynn-brainscales-8.0-a1') version('7.0-rc1-fixup3', tag='pynn-brainscales-7.0-rc1-fixup3') version('7.0-rc1-fixup2', tag='pynn-brainscales-7.0-rc1-fixup2') 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@8.0-a1', when='@8.0-a1', type=('build', 'link', 'run', 'test')) depends_on('oppulance@7.0-rc1-fixup3', when='@7.0-rc1-fixup3', type=('build', 'link', 'run', 'test')) depends_on('oppulance@7.0-rc1-fixup2', when='@7.0-rc1-fixup2', type=('build', 'link', 'run', 'test')) depends_on('oppulance@7.0-rc1-fixup1', when='@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test')) @@ -78,14 +80,24 @@ class PynnBrainscales(WafPackage): with working_dir(self.stage.source_path): python = which('python3') - python('./waf', 'setup', '--repo-db-url=https://github.com/electronicvisions/projects', - '--clone-depth=2', - '--without-munge', - '--without-hxcomm-hostarq', - '--without-hxcomm-extoll', - '--project=pynn-brainscales', - '--release-branch=ebrains-' + str(self.spec.version) - ) + if self.spec.satisfies('@:7'): + python('./waf', 'setup', '--repo-db-url=https://github.com/electronicvisions/projects', + '--clone-depth=2', + '--without-munge', + '--without-hxcomm-hostarq', + '--without-hxcomm-extoll', + '--project=pynn-brainscales', + '--release-branch=ebrains-' + str(self.spec.version) + ) + else: + python('./waf', 'setup', '--repo-db-url=https://github.com/electronicvisions/projects', + '--clone-depth=2', + '--without-munge', + '--without-hxcomm-hostarq', + '--project=pynn-brainscales', + '--release-branch=ebrains-' + str(self.spec.version) + ) + # in the configure step, we need access to all archived .git folders def custom_archive(self, destination):