move code into examples

SpiNNakerManchester · May 9, 2024 · 12e9b2a · 12e9b2a
1 parent 98aed42
commit 12e9b2a
Show file tree

Hide file tree

Showing 43 changed files with 57 additions and 42 deletions.
diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml
@@ -53,12 +53,12 @@ jobs:
       uses: ./support/actions/install-matplotlib
 
     - name: Lint with flake8
-      run: flake8 examples balanced_random learning sudoku synfire
+      run: flake8 examples
 
     - name: Lint with pylint
       uses: ./support/actions/pylint
       with:
-        package: examples balanced_random learning sudoku synfire
+        package: examples
         exitcheck: 39
 
   validate:

diff --git a/balanced_random/__init__.py → examples/balanced_random/__init__.py b/balanced_random/__init__.py → examples/balanced_random/__init__.py
diff --git a/balanced_random/balanced_random.py → examples/balanced_random/balanced_random.py b/balanced_random/balanced_random.py → examples/balanced_random/balanced_random.py
diff --git a/examples/balanced_random/split/__init__.py b/examples/balanced_random/split/__init__.py
diff --git a/...ced_random/split/balanced_random_split.py → ...ced_random/split/balanced_random_split.py b/...ced_random/split/balanced_random_split.py → ...ced_random/split/balanced_random_split.py
diff --git a/balanced_random/split/spynnaker.cfg → examples/balanced_random/split/spynnaker.cfg b/balanced_random/split/spynnaker.cfg → examples/balanced_random/split/spynnaker.cfg
diff --git a/learning/__init__.py → examples/learning/__init__.py b/learning/__init__.py → examples/learning/__init__.py
diff --git a/learning/random_dist.py → examples/learning/random_dist.py b/learning/random_dist.py → examples/learning/random_dist.py
diff --git a/learning/simple.py → examples/learning/simple.py b/learning/simple.py → examples/learning/simple.py
diff --git a/examples/learning/split/__init__.py b/examples/learning/split/__init__.py
diff --git a/learning/split/spynnaker.cfg → examples/learning/split/spynnaker.cfg b/learning/split/spynnaker.cfg → examples/learning/split/spynnaker.cfg
diff --git a/learning/split/stdp_split.py → examples/learning/split/stdp_split.py b/learning/split/stdp_split.py → examples/learning/split/stdp_split.py
diff --git a/learning/split/struct_pl_split.py → examples/learning/split/struct_pl_split.py b/learning/split/struct_pl_split.py → examples/learning/split/struct_pl_split.py
diff --git a/learning/split/struct_pl_stdp_split.py → ...es/learning/split/struct_pl_stdp_split.py b/learning/split/struct_pl_stdp_split.py → ...es/learning/split/struct_pl_stdp_split.py
diff --git a/learning/stdp.py → examples/learning/stdp.py b/learning/stdp.py → examples/learning/stdp.py
diff --git a/learning/struct_pl.py → examples/learning/struct_pl.py b/learning/struct_pl.py → examples/learning/struct_pl.py
diff --git a/learning/struct_pl_stdp.py → examples/learning/struct_pl_stdp.py b/learning/struct_pl_stdp.py → examples/learning/struct_pl_stdp.py
diff --git a/examples/pendulum/__init__.py b/examples/pendulum/__init__.py
diff --git a/pendulum/pendulum → examples/pendulum/pendulum b/pendulum/pendulum → examples/pendulum/pendulum
diff --git a/pendulum/pendulum_follow_c_vis.py → examples/pendulum/pendulum_follow_c_vis.py b/pendulum/pendulum_follow_c_vis.py → examples/pendulum/pendulum_follow_c_vis.py
diff --git a/pendulum/pendulum_follow_python_vis.py → ...es/pendulum/pendulum_follow_python_vis.py b/pendulum/pendulum_follow_python_vis.py → ...es/pendulum/pendulum_follow_python_vis.py
diff --git a/pendulum/spike_filter.py → examples/pendulum/spike_filter.py b/pendulum/spike_filter.py → examples/pendulum/spike_filter.py
diff --git a/pendulum/spynnaker.cfg → examples/pendulum/spynnaker.cfg b/pendulum/spynnaker.cfg → examples/pendulum/spynnaker.cfg
diff --git a/sudoku/__init__.py → examples/sudoku/__init__.py b/sudoku/__init__.py → examples/sudoku/__init__.py
diff --git a/sudoku/libgcc_s_dw2-1.dll → examples/sudoku/libgcc_s_dw2-1.dll b/sudoku/libgcc_s_dw2-1.dll → examples/sudoku/libgcc_s_dw2-1.dll
diff --git a/sudoku/libsqlite3-0.dll → examples/sudoku/libsqlite3-0.dll b/sudoku/libsqlite3-0.dll → examples/sudoku/libsqlite3-0.dll
diff --git a/sudoku/pthreadGC2.dll → examples/sudoku/pthreadGC2.dll b/sudoku/pthreadGC2.dll → examples/sudoku/pthreadGC2.dll
diff --git a/sudoku/set_numbers.py → examples/sudoku/set_numbers.py b/sudoku/set_numbers.py → examples/sudoku/set_numbers.py
@@ -3,7 +3,7 @@
 import sys
 import functools
 import pyNN.spiNNaker as p
-from sudoku.utils import puzzles, get_rates
+from examples.sudoku.utils import puzzles, get_rates
 
 
 class GUI(object):

diff --git a/sudoku/spynnaker.cfg → examples/sudoku/spynnaker.cfg b/sudoku/spynnaker.cfg → examples/sudoku/spynnaker.cfg
diff --git a/sudoku/sudoku.exe → examples/sudoku/sudoku.exe b/sudoku/sudoku.exe → examples/sudoku/sudoku.exe
diff --git a/sudoku/sudoku.png → examples/sudoku/sudoku.png b/sudoku/sudoku.png → examples/sudoku/sudoku.png
diff --git a/sudoku/sudoku_linux → examples/sudoku/sudoku_linux b/sudoku/sudoku_linux → examples/sudoku/sudoku_linux
diff --git a/sudoku/sudoku_main.py → examples/sudoku/sudoku_main.py b/sudoku/sudoku_main.py → examples/sudoku/sudoku_main.py
@@ -27,7 +27,7 @@
 from pyNN.random import RandomDistribution
 import pyNN.spiNNaker as p
 import spynnaker.pyNN.external_devices as ext
-from sudoku.utils import puzzles, get_rates
+from examples.sudoku.utils import puzzles, get_rates
 
 run_time = 20000                        # run time in milliseconds
 neurons_per_digit = 5                   # number of neurons per digit

diff --git a/sudoku/sudoku_osx → examples/sudoku/sudoku_osx b/sudoku/sudoku_osx → examples/sudoku/sudoku_osx
diff --git a/sudoku/utils.py → examples/sudoku/utils.py b/sudoku/utils.py → examples/sudoku/utils.py
diff --git a/synfire/__init__.py → examples/synfire/__init__.py b/synfire/__init__.py → examples/synfire/__init__.py
diff --git a/synfire/synfire.py → examples/synfire/synfire.py b/synfire/synfire.py → examples/synfire/synfire.py
diff --git a/synfire/synfire_collab.py → examples/synfire/synfire_collab.py b/synfire/synfire_collab.py → examples/synfire/synfire_collab.py
diff --git a/integration_tests/script_builder.py b/integration_tests/script_builder.py
@@ -27,15 +27,18 @@ def build_scripts(self):
         exceptions = {}
         exceptions["pushbot_ethernet_example.py"] = "Needs a physical pushbot"
         exceptions["pushbot_light_follower.py"] = "Runs forever"
+        exceptions["pendulum_follow_c_vis.py"] = "Visualiser"
+        exceptions["spike_filter.py"] = "Uses pyplot"
+        exceptions["pendulum_follow_python_vis.py"] = "Uses pyplot"
+        exceptions["sudoku_main.py"] = "Visualiser"
 
         # For branches these raise a SkipTest quoting the time given
         # For cron and manual runs these just and a warning
         too_long = {}
         too_long["stdp_triplet.py"] = "10 minutes"
 
         self.create_test_scripts(
-            ["examples","balanced_random", "learning", "synfire"],
-            too_long, exceptions)
+            ["examples"], too_long, exceptions)
 
 
 if __name__ == '__main__':

diff --git a/spiNNaker_start/.gitignore → integration_tests/spiNNaker_start/.gitignore b/spiNNaker_start/.gitignore → integration_tests/spiNNaker_start/.gitignore
diff --git a/integration_tests/spiNNaker_start/__init__.py b/integration_tests/spiNNaker_start/__init__.py
diff --git a/spiNNaker_start/spinnaker_start.py → ..._tests/spiNNaker_start/spinnaker_start.py b/spiNNaker_start/spinnaker_start.py → ..._tests/spiNNaker_start/spinnaker_start.py
diff --git a/integration_tests/test_scripts.py b/integration_tests/test_scripts.py
@@ -102,6 +102,15 @@ def test_examples_external_devices_examples_live_examples_balanced_random_live_r
     def test_examples_external_devices_examples_pushbot_spinnaker_link_example(self):
         self.check_script("examples/external_devices_examples/pushbot_spinnaker_link_example.py")
 
+    # Not testing file due to: Visualiser
+    # examples/pendulum/pendulum_follow_c_vis.py
+
+    # Not testing file due to: Uses pyplot
+    # examples/pendulum/spike_filter.py
+
+    # Not testing file due to: Uses pyplot
+    # examples/pendulum/pendulum_follow_python_vis.py
+
     def test_examples_if_curr_alpha(self):
         self.check_script("examples/if_curr_alpha.py")
 
@@ -117,6 +126,15 @@ def test_examples_spike_time_compare(self):
     def test_examples_stdp_example_cond(self):
         self.check_script("examples/stdp_example_cond.py")
 
+    def test_examples_sudoku_set_numbers(self):
+        self.check_script("examples/sudoku/set_numbers.py")
+
+    def test_examples_sudoku_utils(self):
+        self.check_script("examples/sudoku/utils.py")
+
+    # Not testing file due to: Visualiser
+    # examples/sudoku/sudoku_main.py
+
     def test_examples_stdp_pairing(self):
         self.check_script("examples/stdp_pairing.py")
 
@@ -150,6 +168,36 @@ def test_examples_current_injection_example(self):
     def test_examples_stdp_example(self):
         self.check_script("examples/stdp_example.py")
 
+    def test_examples_synfire_synfire(self):
+        self.check_script("examples/synfire/synfire.py")
+
+    def test_examples_synfire_synfire_collab(self):
+        self.check_script("examples/synfire/synfire_collab.py")
+
+    def test_examples_learning_random_dist(self):
+        self.check_script("examples/learning/random_dist.py")
+
+    def test_examples_learning_stdp(self):
+        self.check_script("examples/learning/stdp.py")
+
+    def test_examples_learning_struct_pl(self):
+        self.check_script("examples/learning/struct_pl.py")
+
+    def test_examples_learning_split_struct_pl_stdp_split(self):
+        self.check_script("examples/learning/split/struct_pl_stdp_split.py")
+
+    def test_examples_learning_split_struct_pl_split(self):
+        self.check_script("examples/learning/split/struct_pl_split.py")
+
+    def test_examples_learning_split_stdp_split(self):
+        self.check_script("examples/learning/split/stdp_split.py")
+
+    def test_examples_learning_simple(self):
+        self.check_script("examples/learning/simple.py")
+
+    def test_examples_learning_struct_pl_stdp(self):
+        self.check_script("examples/learning/struct_pl_stdp.py")
+
     def test_examples_stdp_example_get_plastic_params(self):
         self.check_script("examples/stdp_example_get_plastic_params.py")
 
@@ -185,39 +233,3 @@ def test_examples_extra_models_examples_IF_curr_exp_ca2_adaptive(self):
 
     def test_examples_extra_models_examples_IF_cond_exp_stoc(self):
         self.check_script("examples/extra_models_examples/IF_cond_exp_stoc.py")
-
-    def test_balanced_random_balanced_random(self):
-        self.check_script("balanced_random/balanced_random.py")
-
-    def test_balanced_random_split_balanced_random_split(self):
-        self.check_script("balanced_random/split/balanced_random_split.py")
-
-    def test_learning_random_dist(self):
-        self.check_script("learning/random_dist.py")
-
-    def test_learning_stdp(self):
-        self.check_script("learning/stdp.py")
-
-    def test_learning_struct_pl(self):
-        self.check_script("learning/struct_pl.py")
-
-    def test_learning_split_struct_pl_stdp_split(self):
-        self.check_script("learning/split/struct_pl_stdp_split.py")
-
-    def test_learning_split_struct_pl_split(self):
-        self.check_script("learning/split/struct_pl_split.py")
-
-    def test_learning_split_stdp_split(self):
-        self.check_script("learning/split/stdp_split.py")
-
-    def test_learning_simple(self):
-        self.check_script("learning/simple.py")
-
-    def test_learning_struct_pl_stdp(self):
-        self.check_script("learning/struct_pl_stdp.py")
-
-    def test_synfire_synfire(self):
-        self.check_script("synfire/synfire.py")
-
-    def test_synfire_synfire_collab(self):
-        self.check_script("synfire/synfire_collab.py")