Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removal of spynnaker8 #1169

Merged
merged 61 commits into from
Apr 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
7bb823b
move external_devices
Christian-B Mar 31, 2022
0959dd6
replace spynnaker8 import
Christian-B Mar 31, 2022
0b73679
move code to spynnaker.pyNN
Christian-B Mar 31, 2022
9e5c54f
move SpiNNaker to spynnaker.pyNN
Christian-B Mar 31, 2022
cee015f
flake8
Christian-B Mar 31, 2022
7fe9d80
removed inrect im,port via external_devices
Christian-B Mar 31, 2022
a218356
removed indirect import via external_devices
Christian-B Mar 31, 2022
21fa146
Merge remote-tracking branch 'origin/remove_8' into remove_8
Christian-B Mar 31, 2022
9a5400b
use py:class
Christian-B Mar 31, 2022
caf3641
doc fix
Christian-B Mar 31, 2022
04ad798
no longer indirect import via external_devices
Christian-B Apr 1, 2022
41ba75c
move full external devices to pyNN
Christian-B Apr 1, 2022
e15101b
flake8
Christian-B Apr 1, 2022
8276949
combine abstract_spinnake_common and spinkker
Christian-B Apr 1, 2022
32974a9
test remove spynakker8 external devices
Christian-B Apr 1, 2022
0734174
merge run calls
Christian-B Apr 1, 2022
355d9ea
flake8
Christian-B Apr 1, 2022
3d775db
exclude spynnaker8 from docs
Christian-B Apr 1, 2022
fb23b2d
fix syntax
Christian-B Apr 1, 2022
05879f9
Revert "test remove spynakker8 external devices"
Christian-B Apr 1, 2022
bbc2c32
move extra_models to spynnaker.pynn
Christian-B Apr 1, 2022
328faef
flake8
Christian-B Apr 1, 2022
f7bd300
more moved out of spynnaker8
Christian-B Apr 1, 2022
2d5c5bc
import pyNN.spiNNaker
Christian-B Apr 1, 2022
19b19bc
setup pynn
Christian-B Apr 1, 2022
bfd59e9
setup pynn does not work here
Christian-B Apr 11, 2022
3c4d1f3
setup_pynn
Christian-B Apr 11, 2022
99a98af
move setup_pynn
Christian-B Apr 11, 2022
ebf4a6b
temporarily point new setuip at spynnaker8
Christian-B Apr 11, 2022
308d890
fix import to pyNN.spiNNaker
Christian-B Apr 11, 2022
db815da
setup pynn as seperate action
Christian-B Apr 11, 2022
112fb08
merged in master
Christian-B Apr 11, 2022
980d5cd
merged in master
Christian-B Apr 11, 2022
40d26e9
expose get_machine
Christian-B Apr 11, 2022
c4fbbd1
flake8
Christian-B Apr 11, 2022
42111b7
moved_in_v7
Christian-B Apr 12, 2022
c86e8c3
move code out of spynnaker8
Christian-B Apr 12, 2022
a0d0953
moved_in_v6 now errors
Christian-B Apr 12, 2022
aa060c3
flake8
Christian-B Apr 12, 2022
18e4f67
add a depreciation redirect hook
Christian-B Apr 12, 2022
9aa7ca8
remove spynnaker8 import
Christian-B Apr 12, 2022
d4870d6
add get_machine to all
Christian-B Apr 12, 2022
d50cdd6
flake8
Christian-B Apr 12, 2022
f29a67d
dont go via pyNN.spiNNaker
Christian-B Apr 12, 2022
3500763
merged in master
Christian-B Apr 14, 2022
1e14bc0
merged in master
Christian-B Apr 14, 2022
f533828
merged in master
Christian-B Apr 14, 2022
2fcd937
merged in master
Christian-B Apr 14, 2022
5324b02
Merge branch 'master' into remove_8
Christian-B Apr 19, 2022
71cc57a
merged in remote/remove_8
Christian-B Apr 19, 2022
80ca34e
merged in master
Christian-B Apr 19, 2022
2812c7a
merged in master
Christian-B Apr 19, 2022
aaa7faa
merged in master
Christian-B Apr 19, 2022
35e5c9d
merge
Christian-B Apr 19, 2022
5fb0fde
merge in remove8
Christian-B Apr 20, 2022
f2f8a48
file missing from merge
Christian-B Apr 20, 2022
f89c4b7
file missing from merge
Christian-B Apr 20, 2022
fdd92fc
report how pynn setup
Christian-B Apr 20, 2022
320cebc
removed spynnaker8 setup pynn
Christian-B Apr 20, 2022
7066b62
spelling
Christian-B Apr 20, 2022
70697af
fix test
Christian-B Apr 20, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/python_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ jobs:
uses: ./support/actions/install-matplotlib
- name: Setup
uses: ./support/actions/run-setup

- name: Setup PyNN
uses: ./support/actions/pynn-setup
- name: Create a spynnaker.cfg
uses: ./support/actions/configure-spynnaker
with:
Expand Down
7 changes: 3 additions & 4 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
# Automatically called by sphinx at startup
def setup(app):
# NB: extra dot at end is deliberate!
trim = ("spynnaker.", "spynnaker8.", "spinn_front_end_common.", "pacman.",
trim = ("spynnaker.", "spinn_front_end_common.", "pacman.",
"spinnman.", "spinn_machine.", "data_specification.",
"spinn_utilities.")

Expand Down Expand Up @@ -438,6 +438,5 @@ def filtered_files(base, unfiltered_files_filename):
apidoc.main([
'-o', _output_dir, ".",
# Exclude test and setup code
"spynnaker_integration_tests/*", "unittests/*", "setup.py",
*filtered_files("spynnaker", _unfiltered_files),
*filtered_files("spynnaker8", _unfiltered_files)])
"spynnaker_integration_tests/*", "unittests/*", "setup.py", "spynnaker8/*",
*filtered_files("spynnaker", _unfiltered_files)])
8 changes: 0 additions & 8 deletions doc/source/modules.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,3 @@ spynnaker
:maxdepth: 4

spynnaker

spynnaker8
==========

.. toctree::
:maxdepth: 4

spynnaker8
4 changes: 1 addition & 3 deletions doc/unfiltered-files.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,4 @@ spynnaker/pyNN/utilities/spynnaker_failed_state.py
spynnaker/pyNN/utilities/struct.py
spynnaker/pyNN/utilities/utility_calls.py
spynnaker/pyNN/utilities/variable_cache.py
spynnaker8/spynnaker_plotting.py
spynnaker8/spynnaker8_simulator_interface.py
spynnaker8/utilities/neo_convertor.py
spynnaker/pyNN/spynnaker_plotting.py
Loading