diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml
index a05635d..db8fa59 100644
--- a/.github/workflows/python_actions.yml
+++ b/.github/workflows/python_actions.yml
@@ -1,17 +1,16 @@
# Copyright (c) 2020 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
# This workflow will install Python dependencies, run lint and rat with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
@@ -23,28 +22,28 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- python-version: [3.7, 3.8, 3.9, "3.10"]
+ python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Checkout SupportScripts
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
with:
repository: SpiNNakerManchester/SupportScripts
path: support
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install pip, etc
uses: ./support/actions/python-tools
- name: Install Spinnaker Dependencies
- uses: ./support/actions/checkout-spinn-deps
+ uses: ./support/actions/install-spinn-deps
with:
repositories: >
- SpiNNUtils SpiNNMachine SpiNNMan PACMAN DataSpecification spalloc
+ SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc
SpiNNFrontEndCommon sPyNNaker
install: true
@@ -60,17 +59,24 @@ jobs:
uses: ./support/actions/pylint
with:
package: balanced_random learning sudoku synfire
+ exitcheck: 39
validate:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Checkout SupportScripts
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
with:
repository: SpiNNakerManchester/SupportScripts
path: support
- name: Run rat copyright enforcement
- if: matrix.python-version == 3.8
+ if: matrix.python-version == 3.12
uses: ./support/actions/check-copyrights
+ with:
+ config_file: rat_asl20.xml
+
+ - name: Validate CITATION.cff
+ if: matrix.python-version == 3.12
+ uses: dieghernan/cff-validator@main
diff --git a/.ratexcludes b/.ratexcludes
index 8ce0243..1c8e98f 100644
--- a/.ratexcludes
+++ b/.ratexcludes
@@ -8,7 +8,6 @@
**/SpiNNMachine/**
**/SpiNNMan/**
**/PACMAN/**
-**/DataSpecification/**
**/spalloc/**
**/SpiNNFrontEndCommon/**
**/sPyNNaker/**
diff --git a/CITATION.cff b/CITATION.cff
new file mode 100644
index 0000000..26d4bb1
--- /dev/null
+++ b/CITATION.cff
@@ -0,0 +1,108 @@
+# Copyright (c) 2017 The University of Manchester
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cff-version: 1.2.0
+message: If you use this software, please cite it as below.
+preferred-citation:
+ type: article
+ doi: 10.3389/fnins.2018.00816
+ issn: 1662-453X
+ url: https://www.frontiersin.org/articles/10.3389/fnins.2018.00816
+ title: "sPyNNaker: A Software Package for Running PyNN Simulations on SpiNNaker"
+ journal: Frontiers in Neuroscience
+ volume: 12
+ year: 2018
+ month: 11
+ abstract: This work presents sPyNNaker 4.0.0, the latest version of the software package for simulating PyNN-defined spiking neural networks (SNNs) on the SpiNNaker neuromorphic platform. Operations underpinning realtime SNN execution are presented, including an event-based operating system facilitating efficient time-driven neuron state updates and pipelined event-driven spike processing. Preprocessing, realtime execution, and neuron/synapse model implementations are discussed, all in the context of a simple example SNN. Simulation results are demonstrated, together with performance profiling providing insights into how software interacts with the underlying hardware to achieve realtime execution. System performance is shown to be within a factor of 2 of the original design target of 10,000 synaptic events per millisecond, however SNN topology is shown to influence performance considerably. A cost model is therefore developed characterizing the effect of network connectivity and SNN partitioning. This model enables users to estimate SNN simulation performance, allows the SpiNNaker team to make predictions on the impact of performance improvements, and helps demonstrate the continued potential of the SpiNNaker neuromorphic hardware.
+ authors:
+ - given-names: Oliver
+ family-names: Rhodes
+ affiliation: University Of Manchester
+ orcid: https://orcid.org/0000-0003-1728-2828
+ website: https://research.manchester.ac.uk/en/persons/oliver.rhodes
+ - given-names: Petrut
+ family-names: Bogdan
+ affiliation: University Of Manchester
+ orcid: https://orcid.org/0000-0001-5535-7865
+ - given-names: Christian Y.
+ family-names: Brenninkmeijer
+ affiliation: University Of Manchester
+ email: christian.brenninkmeijer@manchester.ac.uk
+ orcid: https://orcid.org/0000-0002-2937-7819
+ website: https://www.researchgate.net/profile/Christian_Brenninkmeijer
+ - given-names: Simon
+ family-names: Davidson
+ affiliation: University Of Manchester
+ orcid: https://orcid.org/0000-0001-5385-442X
+ website: https://research.manchester.ac.uk/en/persons/simon.davidson
+ - given-names: Donal
+ family-names: Fellows
+ affiliation: University Of Manchester
+ orcid: https://orcid.org/0000-0002-9091-5938
+ website: https://www.researchgate.net/profile/Donal-Fellows
+ - given-names: Andrew
+ family-names: Gait
+ affiliation: University Of Manchester
+ orcid: https://orcid.org/0000-0001-9349-1096
+ website: https://personalpages.manchester.ac.uk/staff/andrew.gait/
+ - given-names: David R.
+ family-names: Lester
+ affiliation: University Of Manchester
+ orcid: https://orcid.org/0000-0002-7267-291X
+ - given-names: Mantas
+ family-names: Mikaitis
+ affiliation: University Of Manchester
+ orcid: https://orcid.org/0000-0001-8706-1436
+ website: https://research.manchester.ac.uk/en/persons/mantas.mikaitis
+ - given-names: Luis A.
+ family-names: Plana
+ affiliation: University Of Manchester
+ orcid: https://orcid.org/0000-0002-6113-3929
+ website: https://research.manchester.ac.uk/en/persons/luis.plana
+ - given-names: Andrew G. D.
+ family-names: Rowley
+ affiliation: University Of Manchester
+ email: Andrew.Rowley@manchester.ac.uk
+ orcid: https://orcid.org/0000-0002-2646-8520
+ website: https://www.researchgate.net/profile/Andrew_Rowley2
+ - given-names: Alan B.
+ family-names: Stokes
+ affiliation: University Of Manchester
+ orcid: https://orcid.org/0000-0002-6110-1484
+ - given-names: Steve B.
+ family-names: Furber
+ affiliation: University Of Manchester
+ orcid: https://orcid.org/0000-0002-6524-3367
+ website: https://research.manchester.ac.uk/en/persons/steve.furber
+
+title: These are the examples typically used in the Introduction to PyNN talks.
+authors:
+ - name: SpiNNaker Software Team
+ alias: For a list of contributors see https://github.com/SpiNNakerManchester/IntroLab/graphs/contributors or for a combined list see https://spinnakermanchester.github.io/latest/LicenseAgreement.html#contributors
+ address: University of Manchester, Oxford Road
+ city: Manchester
+ country: GB
+ email: spinnakerusers@googlegroups.com
+ post-code: M13 9PL
+ website: https://apt.cs.manchester.ac.uk/projects/SpiNNaker/
+url: https://spinnakermanchester.github.io/
+contact:
+- address: University of Manchester, Oxford Road
+ city: Manchester
+ country: GB
+ email: spinnakerusers@googlegroups.com
+ name: SpiNNaker Software Team
+ post-code: M13 9PL
+license: Apache-2.0
+repository: https://github.com/SpiNNakerManchester/IntroLab
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..62589ed
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ https://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/LICENSE.md b/LICENSE_POLICY.md
similarity index 52%
rename from LICENSE.md
rename to LICENSE_POLICY.md
index 3d2cb59..6103176 100644
--- a/LICENSE.md
+++ b/LICENSE_POLICY.md
@@ -1,17 +1,17 @@
# License Agreement
-Up to date information for the whole [SpiNNakerManchester Projects](https://github.com/SpiNNakerManchester) can be found [here](http://spinnakermanchester.github.io/common_pages/4.0.0/LicenseAgreement.html)
+Up to date information for the whole [SpiNNakerManchester Projects](https://github.com/SpiNNakerManchester) can be found [here](https://spinnakermanchester.github.io/latest/LicenseAgreement.html)
-As shown there the software is currently being released under the GPL version 3 license listed [here](http://www.gnu.org/copyleft/gpl.html)
+As shown there the software is currently being released under the Apache License 2.0 listed [here](https://www.apache.org/licenses/LICENSE-2.0)
# Paper Authorship
-See: [here](http://spinnakermanchester.github.io/common_pages/4.0.0/LicenseAgreement.html#paper-authorship)
+See: [here](https://spinnakermanchester.github.io/latest/LicenseAgreement.html#paper-authorship)
# Modifications
-See: [here](http://spinnakermanchester.github.io/common_pages/4.0.0/LicenseAgreement.html#modifications)
+See: [here](https://spinnakermanchester.github.io/latest/LicenseAgreement.html#modifications)
# Contributors
@@ -19,5 +19,5 @@ For up to date information on Contributors see the graphs/contributors pages on
For example [https://github.com/SpiNNakerManchester/IntroLab/graphs/contributors](https://github.com/SpiNNakerManchester/IntroLab/graphs/contributors)
-[Combined list](http://spinnakermanchester.github.io/common_pages/4.0.0/LicenseAgreement.html#contributors)
+[Combined list](https://spinnakermanchester.github.io/latest/LicenseAgreement.html#contributors)
diff --git a/README.md b/README.md
index b384fff..33d8426 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
+[](https://github.com/SpiNNakerManchester/IntroLab/actions?query=workflow%3A%22Python+Actions%22+branch%3Amaster)
+
# IntroLab
These are the examples typically used in the Introduction to PyNN talks.
diff --git a/balanced_random/__init__.py b/balanced_random/__init__.py
index 70661c8..6725518 100644
--- a/balanced_random/__init__.py
+++ b/balanced_random/__init__.py
@@ -1,14 +1,13 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/balanced_random/balanced_random.py b/balanced_random/balanced_random.py
index 1d70868..a2c4777 100644
--- a/balanced_random/balanced_random.py
+++ b/balanced_random/balanced_random.py
@@ -1,17 +1,16 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
import matplotlib.pyplot as pylab
import numpy
@@ -28,7 +27,6 @@
weight_exc = 0.1
weight_inh = -5.0 * weight_exc
weight_input = 0.001
-rng = p.NumpyRNG(0)
pop_input = p.Population(100, p.SpikeSourcePoisson(rate=0.0),
additional_parameters={
@@ -36,27 +34,26 @@
"seed": 0},
label="Input")
-pop_exc = p.Population(n_exc, p.IF_curr_exp, label="Excitatory")
-pop_inh = p.Population(n_inh, p.IF_curr_exp, label="Inhibitory")
+pop_exc = p.Population(n_exc, p.IF_curr_exp, label="Excitatory", seed=1)
+pop_inh = p.Population(n_inh, p.IF_curr_exp, label="Inhibitory", seed=2)
stim_exc = p.Population(
n_exc, p.SpikeSourcePoisson(rate=1000.0), label="Stim_Exc",
- additional_parameters={"seed": 1})
+ additional_parameters={"seed": 3})
stim_inh = p.Population(
n_inh, p.SpikeSourcePoisson(rate=1000.0), label="Stim_Inh",
- additional_parameters={"seed": 2})
+ additional_parameters={"seed": 4})
delays_exc = RandomDistribution(
- "normal_clipped", mu=1.5, sigma=0.75, low=1.0, high=1.6, rng=rng)
+ "normal_clipped", mu=1.5, sigma=0.75, low=1.0, high=1.6)
weights_exc = RandomDistribution(
- "normal_clipped", mu=weight_exc, sigma=0.1, low=0, high=numpy.inf, rng=rng)
-conn_exc = p.FixedProbabilityConnector(0.1, rng=rng)
+ "normal_clipped", mu=weight_exc, sigma=0.1, low=0, high=numpy.inf)
+conn_exc = p.FixedProbabilityConnector(0.1)
synapse_exc = p.StaticSynapse(weight=weights_exc, delay=delays_exc)
delays_inh = RandomDistribution(
- "normal_clipped", mu=0.75, sigma=0.375, low=1.0, high=1.6, rng=rng)
+ "normal_clipped", mu=0.75, sigma=0.375, low=1.0, high=1.6)
weights_inh = RandomDistribution(
- "normal_clipped", mu=weight_inh, sigma=0.1, low=-numpy.inf, high=0,
- rng=rng)
-conn_inh = p.FixedProbabilityConnector(0.1, rng=rng)
+ "normal_clipped", mu=weight_inh, sigma=0.1, low=-numpy.inf, high=0)
+conn_inh = p.FixedProbabilityConnector(0.1)
synapse_inh = p.StaticSynapse(weight=weights_inh, delay=delays_inh)
p.Projection(
pop_exc, pop_exc, conn_exc, synapse_exc, receptor_type="excitatory")
@@ -75,17 +72,16 @@
stim_inh, pop_inh, conn_stim, synapse_stim, receptor_type="excitatory")
delays_input = RandomDistribution(
- "normal_clipped", mu=1.5, sigma=0.75, low=1.0, high=1.6, rng=rng)
+ "normal_clipped", mu=1.5, sigma=0.75, low=1.0, high=1.6)
weights_input = RandomDistribution(
- "normal_clipped", mu=weight_input, sigma=0.01, low=0, high=numpy.inf,
- rng=rng)
+ "normal_clipped", mu=weight_input, sigma=0.01, low=0, high=numpy.inf)
p.Projection(pop_input, pop_exc, p.AllToAllConnector(), p.StaticSynapse(
weight=weights_input, delay=delays_input))
pop_exc.initialize(
- v=RandomDistribution("uniform", low=-65.0, high=-55.0, rng=rng))
+ v=RandomDistribution("uniform", low=-65.0, high=-55.0))
pop_inh.initialize(
- v=RandomDistribution("uniform", low=-65.0, high=-55.0, rng=rng))
+ v=RandomDistribution("uniform", low=-65.0, high=-55.0))
pop_exc.record("spikes")
diff --git a/balanced_random/split/balanced_random_split.py b/balanced_random/split/balanced_random_split.py
index 175bc54..94a7902 100755
--- a/balanced_random/split/balanced_random_split.py
+++ b/balanced_random/split/balanced_random_split.py
@@ -15,7 +15,6 @@
weight_exc = 0.1
weight_inh = -5.0 * weight_exc
weight_input = 0.001
-rng = p.NumpyRNG(0)
pop_input_splitter = SplitterPoissonDelegate()
pop_input = p.Population(100, p.SpikeSourcePoisson(rate=0.0),
@@ -28,32 +27,33 @@
pop_exc_splitter = \
SplitterAbstractPopulationVertexNeuronsSynapses(1, 128, False)
pop_exc = p.Population(n_exc, p.IF_curr_exp, label="Excitatory",
- additional_parameters={"splitter": pop_exc_splitter})
+ additional_parameters={"splitter": pop_exc_splitter,
+ "seed": 1})
pop_inh_splitter = \
SplitterAbstractPopulationVertexNeuronsSynapses(1, 128, False)
pop_inh = p.Population(n_inh, p.IF_curr_exp, label="Inhibitory",
- additional_parameters={"splitter": pop_inh_splitter})
+ additional_parameters={"splitter": pop_inh_splitter,
+ "seed": 2})
stim_exc_splitter = SplitterPoissonDelegate()
stim_exc = p.Population(
n_exc, p.SpikeSourcePoisson(rate=1000.0), label="Stim_Exc",
- additional_parameters={"seed": 1, "splitter": stim_exc_splitter})
+ additional_parameters={"seed": 3, "splitter": stim_exc_splitter})
stim_inh_splitter = SplitterPoissonDelegate()
stim_inh = p.Population(
n_inh, p.SpikeSourcePoisson(rate=1000.0), label="Stim_Inh",
- additional_parameters={"seed": 2, "splitter": stim_inh_splitter})
+ additional_parameters={"seed": 4, "splitter": stim_inh_splitter})
delays_exc = RandomDistribution(
- "normal_clipped", mu=1.5, sigma=0.75, low=1.0, high=1.6, rng=rng)
+ "normal_clipped", mu=1.5, sigma=0.75, low=1.0, high=1.6)
weights_exc = RandomDistribution(
- "normal_clipped", mu=weight_exc, sigma=0.1, low=0, high=numpy.inf, rng=rng)
-conn_exc = p.FixedProbabilityConnector(0.1, rng=rng)
+ "normal_clipped", mu=weight_exc, sigma=0.1, low=0, high=numpy.inf)
+conn_exc = p.FixedProbabilityConnector(0.1)
synapse_exc = p.StaticSynapse(weight=weights_exc, delay=delays_exc)
delays_inh = RandomDistribution(
- "normal_clipped", mu=0.75, sigma=0.375, low=1.0, high=1.6, rng=rng)
+ "normal_clipped", mu=0.75, sigma=0.375, low=1.0, high=1.6)
weights_inh = RandomDistribution(
- "normal_clipped", mu=weight_inh, sigma=0.1, low=-numpy.inf, high=0,
- rng=rng)
-conn_inh = p.FixedProbabilityConnector(0.1, rng=rng)
+ "normal_clipped", mu=weight_inh, sigma=0.1, low=-numpy.inf, high=0)
+conn_inh = p.FixedProbabilityConnector(0.1)
synapse_inh = p.StaticSynapse(weight=weights_inh, delay=delays_inh)
p.Projection(
pop_exc, pop_exc, conn_exc, synapse_exc, receptor_type="excitatory",
@@ -78,18 +78,17 @@
label="stim_inh_inh")
delays_input = RandomDistribution(
- "normal_clipped", mu=1.5, sigma=0.75, low=1.0, high=1.6, rng=rng)
+ "normal_clipped", mu=1.5, sigma=0.75, low=1.0, high=1.6)
weights_input = RandomDistribution(
- "normal_clipped", mu=weight_input, sigma=0.01, low=0, high=numpy.inf,
- rng=rng)
+ "normal_clipped", mu=weight_input, sigma=0.01, low=0, high=numpy.inf)
p.Projection(pop_input, pop_exc, p.AllToAllConnector(), p.StaticSynapse(
weight=weights_input, delay=delays_input),
label="input_exc")
pop_exc.initialize(
- v=RandomDistribution("uniform", low=-65.0, high=-55.0, rng=rng))
+ v=RandomDistribution("uniform", low=-65.0, high=-55.0))
pop_inh.initialize(
- v=RandomDistribution("uniform", low=-65.0, high=-55.0, rng=rng))
+ v=RandomDistribution("uniform", low=-65.0, high=-55.0))
pop_exc.record("spikes")
diff --git a/integration_tests/__init__.py b/integration_tests/__init__.py
index 70661c8..6725518 100644
--- a/integration_tests/__init__.py
+++ b/integration_tests/__init__.py
@@ -1,14 +1,13 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/integration_tests/script_builder.py b/integration_tests/script_builder.py
index d7cea63..4921f0a 100644
--- a/integration_tests/script_builder.py
+++ b/integration_tests/script_builder.py
@@ -1,17 +1,16 @@
-# Copyright (c) 2017-2019 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
from spinnaker_testbase import RootScriptBuilder
diff --git a/integration_tests/test_scripts.py b/integration_tests/test_scripts.py
index 5e0bdea..0a8fc84 100644
--- a/integration_tests/test_scripts.py
+++ b/integration_tests/test_scripts.py
@@ -1,17 +1,16 @@
-# Copyright (c) 2019-2021 The University of Manchester
+# Copyright (c) 2019 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
from spinnaker_testbase import ScriptChecker
from unittest import SkipTest # pylint: disable=unused-import
diff --git a/learning/__init__.py b/learning/__init__.py
index 70661c8..6725518 100644
--- a/learning/__init__.py
+++ b/learning/__init__.py
@@ -1,14 +1,13 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/learning/random_dist.py b/learning/random_dist.py
index 3d1a77f..5a70254 100644
--- a/learning/random_dist.py
+++ b/learning/random_dist.py
@@ -1,17 +1,16 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
import matplotlib.pyplot as plt
from pyNN.random import RandomDistribution
diff --git a/learning/simple.py b/learning/simple.py
index 83717f2..4ba9ef1 100644
--- a/learning/simple.py
+++ b/learning/simple.py
@@ -1,17 +1,16 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
import pyNN.utility.plotting as plot
import matplotlib.pyplot as plt
@@ -21,8 +20,9 @@
sim.set_number_of_neurons_per_core(sim.IF_curr_exp, 100)
pop_1 = sim.Population(1, sim.IF_curr_exp(), label="pop_1")
-input = sim.Population(1, sim.SpikeSourceArray(spike_times=[0]), label="input")
-input_proj = sim.Projection(input, pop_1, sim.OneToOneConnector(),
+input_pop = sim.Population(
+ 1, sim.SpikeSourceArray(spike_times=[0]), label="input")
+input_proj = sim.Projection(input_pop, pop_1, sim.OneToOneConnector(),
synapse_type=sim.StaticSynapse(weight=5, delay=1))
pop_1.record(["spikes", "v"])
simtime = 10
diff --git a/learning/split/stdp_split.py b/learning/split/stdp_split.py
index 720a6f7..fc9e531 100755
--- a/learning/split/stdp_split.py
+++ b/learning/split/stdp_split.py
@@ -64,7 +64,7 @@
post_neo = post_pop.get_data(variables=["spikes"])
post_spikes = post_neo.segments[0].spiketrains
-print(stdp_projection.getWeights())
+print(stdp_projection.get('weight', format="list"))
sim.end()
diff --git a/learning/split/struct_pl_split.py b/learning/split/struct_pl_split.py
index 7b7d04a..0ea0301 100755
--- a/learning/split/struct_pl_split.py
+++ b/learning/split/struct_pl_split.py
@@ -85,7 +85,7 @@
post_neo = post_pop.get_data(variables=["spikes"])
post_spikes = post_neo.segments[0].spiketrains
-print(plastic_projection.getWeights())
+print(plastic_projection.get('weight', format="list"))
sim.end()
diff --git a/learning/split/struct_pl_stdp_split.py b/learning/split/struct_pl_stdp_split.py
index 123cc76..2c05567 100755
--- a/learning/split/struct_pl_stdp_split.py
+++ b/learning/split/struct_pl_stdp_split.py
@@ -95,7 +95,7 @@
post_neo = post_pop.get_data(variables=["spikes"])
post_spikes = post_neo.segments[0].spiketrains
-print(plastic_projection.getWeights())
+print(plastic_projection.get('weight', format="list"))
sim.end()
diff --git a/learning/stdp.py b/learning/stdp.py
index bb15c33..9bde57e 100644
--- a/learning/stdp.py
+++ b/learning/stdp.py
@@ -1,17 +1,16 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
import pyNN.utility.plotting as plot
import matplotlib.pyplot as plt
@@ -66,7 +65,7 @@
post_neo = post_pop.get_data(variables=["spikes"])
post_spikes = post_neo.segments[0].spiketrains
-print(stdp_projection.getWeights())
+print(stdp_projection.get('weight', format="list"))
sim.end()
diff --git a/learning/struct_pl.py b/learning/struct_pl.py
index 6618f6b..d2f09af 100755
--- a/learning/struct_pl.py
+++ b/learning/struct_pl.py
@@ -78,7 +78,7 @@
post_neo = post_pop.get_data(variables=["spikes"])
post_spikes = post_neo.segments[0].spiketrains
-print(plastic_projection.getWeights())
+print(plastic_projection.get('weight', format="list"))
sim.end()
diff --git a/learning/struct_pl_stdp.py b/learning/struct_pl_stdp.py
index 53fd378..df6194e 100755
--- a/learning/struct_pl_stdp.py
+++ b/learning/struct_pl_stdp.py
@@ -83,7 +83,7 @@
post_neo = post_pop.get_data(variables=["spikes"])
post_spikes = post_neo.segments[0].spiketrains
-print(plastic_projection.getWeights())
+print(plastic_projection.get('weight', format="list"))
sim.end()
diff --git a/sudoku/__init__.py b/sudoku/__init__.py
index 70661c8..6725518 100644
--- a/sudoku/__init__.py
+++ b/sudoku/__init__.py
@@ -1,14 +1,13 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/sudoku/sudoku.py b/sudoku/sudoku.py
index 40b2d47..fbc3795 100644
--- a/sudoku/sudoku.py
+++ b/sudoku/sudoku.py
@@ -1,17 +1,16 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2016 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#############################################################
#
@@ -47,6 +46,9 @@ def read_output(visualiser, out):
print(line)
result = visualiser.poll()
print("Visualiser exited: {} - quitting".format(result))
+ if running and not ended:
+ p.end()
+ os._exit(0) # pylint: disable=protected-access
def activate_visualiser(old_vis):
@@ -59,7 +61,7 @@ def activate_visualiser(old_vis):
elif sys.platform.startswith("linux"):
vis_exe = "sudoku_linux"
else:
- raise Exception("Unknown platform: {}".format(sys.platform))
+ raise NotImplementedError(f"Unknown platform: {sys.platform}")
vis_exe = [os.path.abspath(os.path.join(
os.path.dirname(__file__), vis_exe))]
neur_per_num_opt = "-neurons_per_number"
@@ -82,7 +84,7 @@ def activate_visualiser(old_vis):
Thread(target=read_output, args=[vis_proc, vis_proc.stderr]).start()
return vis_proc, port
- except Exception:
+ except Exception: # pylint: disable=broad-except
if not old_vis:
print("This example depends on https://github.com/"
"SpiNNakerManchester/sPyNNakerVisualisers")
@@ -200,7 +202,7 @@ def activate_visualiser(old_vis):
#
# set up the inter-cell inhibitory connections
#
-def interCell(x, y, r, c, connections):
+def interCell():
""" Inhibit same number: connections are n_N squares on diagonal of
weight_cell() from cell[x][y] to cell[r][c]
"""
@@ -223,14 +225,14 @@ def interCell(x, y, r, c, connections):
for y in range(9):
for r in range(9):
if r != x:
- interCell(x, y, r, y, connections) # by row...
+ interCell() # by row...
for c in range(9):
if c != y:
- interCell(x, y, x, c, connections) # by column...
+ interCell() # by column...
for r in range(3 * (x // 3), 3 * (x // 3 + 1)):
for c in range(3 * (y // 3), 3 * (y // 3 + 1)):
if r != x and c != y:
- interCell(x, y, r, c, connections) # & by square
+ interCell() # & by square
conn_intC = p.FromListConnector(connections)
p.Projection(cells, cells, conn_intC, receptor_type="inhibitory")
diff --git a/synfire/__init__.py b/synfire/__init__.py
index 70661c8..6725518 100644
--- a/synfire/__init__.py
+++ b/synfire/__init__.py
@@ -1,14 +1,13 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/synfire/synfire.py b/synfire/synfire.py
index 48c4369..56a9643 100644
--- a/synfire/synfire.py
+++ b/synfire/synfire.py
@@ -1,17 +1,16 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2016 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""
Synfire chain example
diff --git a/synfire/synfire_collab.py b/synfire/synfire_collab.py
index 7871753..1f53aa4 100644
--- a/synfire/synfire_collab.py
+++ b/synfire/synfire_collab.py
@@ -1,17 +1,16 @@
-# Copyright (c) 2017-2020 The University of Manchester
+# Copyright (c) 2017 The University of Manchester
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# https://www.apache.org/licenses/LICENSE-2.0
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""
Synfire chain example