From be1e24d0e73c5eca1add727cb331d17c5ca05c66 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 21 May 2024 12:24:58 +0100 Subject: [PATCH 01/55] upload binaries --- .github/workflows/c_actions.yml | 35 ++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index d7cb776bfc8..6161cabfd72 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -24,27 +24,18 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Checkout SupportScripts uses: actions/checkout@v4 with: repository: SpiNNakerManchester/SupportScripts path: support + - name: Set up Python 3.12 # Note: Python is needed for spinn_utilities.make_tools when building uses: actions/setup-python@v5 with: python-version: 3.12 - - name: Install Ubuntu dependencies - uses: ./support/actions/apt-get-install - with: - packages: doxygen gcc-arm-none-eabi - - - name: Checkout SpiNNaker C Dependencies - uses: ./support/actions/install-spinn-deps - with: - # Note: SpiNNUtils needed for spinn_utilities.make_tools - repositories: spinnaker_tools spinn_common SpiNNFrontEndCommon - install: false - name: "Prepare: Install SpiNNUtils" uses: ./support/actions/install-spinn-deps @@ -53,10 +44,23 @@ jobs: repositories: SpiNNUtils install: true + - name: Install Ubuntu dependencies + uses: ./support/actions/apt-get-install + with: + packages: doxygen gcc-arm-none-eabi + - name: Set environment variables run: | echo "SPINN_DIRS=$PWD/spinnaker_tools" >> $GITHUB_ENV echo "NEURAL_MODELLING_DIRS=$PWD/neural_modelling" >> $GITHUB_ENV + echo "C_LOGS_DICT=$PWD/spynnaker/pyNN/model_binaries/logs.sqlite3" >> $GITHUB_ENV + + - name: Checkout SpiNNaker C Dependencies + uses: ./support/actions/install-spinn-deps + with: + # Note: SpiNNUtils needed for spinn_utilities.make_tools + repositories: spinnaker_tools spinn_common SpiNNFrontEndCommon + install: false - name: Lint C code using Vera++ uses: ./support/actions/vera @@ -84,3 +88,12 @@ jobs: - name: Build documentation using doxygen run: make doxysetup doxygen working-directory: neural_modelling + + - name: Upload binaries + uses: actions/upload-artifact@v4 + with: + name: binaries + path: | + SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries/*.aplx + spynnaker/pyNN/model_binaries/*.aplx + spynnaker/pyNN/model_binaries/logs.sqlite3 From 7675e476bae6cf63baab07ae2a2698079acf2aa3 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 21 May 2024 13:04:10 +0100 Subject: [PATCH 02/55] split binaries --- .github/workflows/c_actions.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 6161cabfd72..cc85e74d875 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -89,11 +89,16 @@ jobs: run: make doxysetup doxygen working-directory: neural_modelling - - name: Upload binaries + - name: Upload Fec binaries uses: actions/upload-artifact@v4 with: - name: binaries + name: fec_binaries + path: SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries/*.aplx + + - name: Upload PyNN binaries + uses: actions/upload-artifact@v4 + with: + name: pynn_binaries path: | - SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries/*.aplx spynnaker/pyNN/model_binaries/*.aplx spynnaker/pyNN/model_binaries/logs.sqlite3 From a5c5c841c654ffafeda3af76804388e27ba6a5cf Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 21 May 2024 14:06:55 +0100 Subject: [PATCH 03/55] build fec --- .github/workflows/c_actions.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index cc85e74d875..49c2ae1a91a 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -71,9 +71,14 @@ jobs: run: | make -C $SPINN_DIRS make -C spinn_common install - make -C SpiNNFrontEndCommon/c_common install - - name: Build C code + - name: "Check: Build FEC C code" + run: make + working-directory: SpiNNFrontEndCommon/c_common + env: + CFLAGS: -fdiagnostics-color=always + + - name: Build PYNN C code run: make working-directory: neural_modelling env: From df0f5290564eb3f3eb7691d271dee090ea0953c5 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 11:50:33 +0100 Subject: [PATCH 04/55] proxy integration tests --- proxy_integration_tests/__init__.py | 13 ++ .../test_python_debug/__init__.py | 13 ++ .../test_python_debug/check_debug.py | 139 ++++++++++++++++++ .../test_python_debug/spynnaker.cfg | 12 ++ .../test_python_debug/test_debug.py | 21 +++ 5 files changed, 198 insertions(+) create mode 100644 proxy_integration_tests/__init__.py create mode 100644 proxy_integration_tests/test_python_debug/__init__.py create mode 100644 proxy_integration_tests/test_python_debug/check_debug.py create mode 100644 proxy_integration_tests/test_python_debug/spynnaker.cfg create mode 100644 proxy_integration_tests/test_python_debug/test_debug.py diff --git a/proxy_integration_tests/__init__.py b/proxy_integration_tests/__init__.py new file mode 100644 index 00000000000..89860f15f15 --- /dev/null +++ b/proxy_integration_tests/__init__.py @@ -0,0 +1,13 @@ +# Copyright (c) 2024 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. diff --git a/proxy_integration_tests/test_python_debug/__init__.py b/proxy_integration_tests/test_python_debug/__init__.py new file mode 100644 index 00000000000..89860f15f15 --- /dev/null +++ b/proxy_integration_tests/test_python_debug/__init__.py @@ -0,0 +1,13 @@ +# Copyright (c) 2024 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. diff --git a/proxy_integration_tests/test_python_debug/check_debug.py b/proxy_integration_tests/test_python_debug/check_debug.py new file mode 100644 index 00000000000..6c9ac487988 --- /dev/null +++ b/proxy_integration_tests/test_python_debug/check_debug.py @@ -0,0 +1,139 @@ +# 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. + +import os +from spinn_utilities.config_holder import get_config_bool +import spinn_front_end_common.utilities.report_functions.reports as \ + reports_names +from spinn_front_end_common.utilities.report_functions.network_specification \ + import _FILENAME as network_specification_file_name +from spinn_front_end_common.utilities.report_functions.drift_report import ( + CLOCK_DRIFT_REPORT) +from spinn_front_end_common.utilities.report_functions.\ + memory_map_on_host_report import _FOLDER_NAME as \ + memory_map_on_host_report +# from spinn_front_end_common.utilities.report_functions.energy_report \ +# import EnergyReport +from spinn_front_end_common.utilities.report_functions.board_chip_report \ + import AREA_CODE_REPORT_NAME +from spinn_front_end_common.utility_models import \ + DataSpeedUpPacketGatherMachineVertex +from spinnaker_testbase import BaseTestCase +from spynnaker.pyNN.data import SpynnakerDataView +from spynnaker.pyNN.extra_algorithms.\ + spynnaker_neuron_network_specification_report import ( + _GRAPH_NAME, _GRAPH_FORMAT) +import pyNN.spiNNaker as sim + + +class CheckDebug(BaseTestCase): + """ + that it does not crash in debug mode. All reports on. + """ + def debug(self): + # pylint: disable=protected-access + reports = [ + # write_energy_report + # EnergyReport._DETAILED_FILENAME, + # EnergyReport._SUMMARY_FILENAME, + # write_text_specs = False + "data_spec_text_files", + # write_router_reports + reports_names._ROUTING_FILENAME, + # write_partitioner_reports + reports_names._PARTITIONING_FILENAME, + # write_application_graph_placer_report + reports_names._PLACEMENT_VTX_GRAPH_FILENAME, + reports_names._PLACEMENT_CORE_GRAPH_FILENAME, + reports_names._SDRAM_FILENAME, + # repeats reports_names._SDRAM_FILENAME, + # write_router_info_report + reports_names._VIRTKEY_FILENAME, + # write_routing_table_reports + reports_names._ROUTING_TABLE_DIR, + reports_names._C_ROUTING_TABLE_DIR, + reports_names._COMPARED_FILENAME, + # write_memory_map_report + memory_map_on_host_report, + # write_network_specification_report + network_specification_file_name, + "provenance_data", + # write_tag_allocation_reports + reports_names._TAGS_FILENAME, + # write_drift_report_end or start + CLOCK_DRIFT_REPORT, + # write_board_chip_report + AREA_CODE_REPORT_NAME, + _GRAPH_NAME, + _GRAPH_NAME + "." + + _GRAPH_FORMAT, + ] + + sim.setup(1.0) + if (get_config_bool("Machine", "enable_advanced_monitor_support") + and not get_config_bool("Java", "use_java")): + # write_data_speed_up_report + reports.append( + DataSpeedUpPacketGatherMachineVertex.OUT_REPORT_NAME) + reports.append(DataSpeedUpPacketGatherMachineVertex.IN_REPORT_NAME) + pop = sim.Population(100, sim.IF_curr_exp, {}, label="pop") + pop.record("v") + inp = sim.Population(1, sim.SpikeSourceArray( + spike_times=[0]), label="input") + sim.Projection(inp, pop, sim.AllToAllConnector(), + synapse_type=sim.StaticSynapse(weight=5)) + sim.run(0) + pop.get_data("v") + run0 = SpynnakerDataView.get_run_dir_path() + found = os.listdir(run0) + for report in reports: + self.assertIn(report, found) + self.assertIn("data.sqlite3", found) + self.assertIn("ds.sqlite3", found) + + sim.run(10) # second run + pop.get_data("v") + self.assertEqual(run0, SpynnakerDataView.get_run_dir_path()) + # No point in checking files they are already there + + sim.reset() # Soft + # check get works directly after a reset + pop.get_data("v") + sim.run(10) + found = os.listdir(SpynnakerDataView.get_run_dir_path()) + self.assertIn("data1.sqlite3", found) + self.assertNotIn("ds1.sqlite3", found) + + sim.reset() # soft with dsg + SpynnakerDataView.set_requires_data_generation() + sim.run(10) + pop.get_data("v") + self.assertEqual(run0, SpynnakerDataView.get_run_dir_path()) + found = os.listdir(run0) + self.assertIn("data2.sqlite3", found) + self.assertIn("ds2.sqlite3", found) + # No point in checking files they are already there + + sim.reset() # hard + SpynnakerDataView.set_requires_mapping() + sim.run(10) + pop.get_data("v") + self.assertNotEqual(run0, SpynnakerDataView.get_run_dir_path()) + found = os.listdir(SpynnakerDataView.get_run_dir_path()) + for report in reports: + self.assertIn(report, found) + self.assertIn("data3.sqlite3", found) + self.assertIn("ds3.sqlite3", found) + + sim.end() diff --git a/proxy_integration_tests/test_python_debug/spynnaker.cfg b/proxy_integration_tests/test_python_debug/spynnaker.cfg new file mode 100644 index 00000000000..e6b0518ff66 --- /dev/null +++ b/proxy_integration_tests/test_python_debug/spynnaker.cfg @@ -0,0 +1,12 @@ +[Machine] +enable_advanced_monitor_support = True +spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/ +spalloc_port = 22244 + +[Mode] +# mode = Production or Debug +# In Debug mode all report Boolean config values are automatically overwritten to True +mode = Debug + +[Java] +use_java = False \ No newline at end of file diff --git a/proxy_integration_tests/test_python_debug/test_debug.py b/proxy_integration_tests/test_python_debug/test_debug.py new file mode 100644 index 00000000000..47076d3ed44 --- /dev/null +++ b/proxy_integration_tests/test_python_debug/test_debug.py @@ -0,0 +1,21 @@ +# 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. + +from .check_debug import CheckDebug + + +class TestDebug(CheckDebug): + + def test_debug(self): + self.runsafe(self.debug) From 61b92a3550ad650a8d588afa17dafd24d65f8f17 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 12:42:34 +0100 Subject: [PATCH 05/55] add build step --- .github/workflows/c_actions.yml | 59 +++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 49c2ae1a91a..0a48f9a7e17 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -107,3 +107,62 @@ jobs: path: | spynnaker/pyNN/model_binaries/*.aplx spynnaker/pyNN/model_binaries/logs.sqlite3 + + test: + needs: build + runs-on: ubuntu-latest + timeout-minutes: 10 + strategy: + matrix: + python-version: ["3.12"] + env: + C_LOGS_DICT: $PWD/spynnaker/pyNN/model_binaries/logs.sqlite3 + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Checkout SupportScripts + uses: actions/checkout@v4 + with: + repository: SpiNNakerManchester/SupportScripts + path: support + + - name: Download PyNN Binaries + uses: actions/download-artifact@v4 + with: + name: pynn_binaries + path: spynnaker/pyNN/model_binaries + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + + - name: Install pip, etc + uses: ./support/actions/python-tools + + - name: Install Spinnaker Dependencies + uses: ./support/actions/install-spinn-deps + with: + repositories: > + SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc + SpiNNFrontEndCommon TestBase + install: true + + - name: Setup + uses: ./support/actions/run-install + + - name: Setup PyNN + uses: ./support/actions/pynn-setup + + - name: Install Ubuntu dependencies + uses: ./support/actions/apt-get-install + with: + packages: graphviz + + - name: Install matplotlib + uses: ./support/actions/install-matplotlib + + - name: Test with pytest and proxy + run: pytest proxy_integration_tests From dd23b8086eac197b2a443250287aafcae95a82d5 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 13:01:20 +0100 Subject: [PATCH 06/55] Create cfg in actions --- .github/workflows/c_actions.yml | 9 +++++++++ proxy_integration_tests/test_python_debug/spynnaker.cfg | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 0a48f9a7e17..547db5ed7d5 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -156,6 +156,12 @@ jobs: - name: Setup PyNN uses: ./support/actions/pynn-setup + - name: Create cfg + run: | + echo '[Machine]' >> ~/.spynnaker.cfg + echo 'spalloc_server = 22244' >> ~/.spynnaker.cfg + echo 'spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/' >> ~/.spynnaker.cfg + - name: Install Ubuntu dependencies uses: ./support/actions/apt-get-install with: @@ -165,4 +171,7 @@ jobs: uses: ./support/actions/install-matplotlib - name: Test with pytest and proxy + env: + SPALLOC_USER: ${{ secrets.SPALLOC_USER }} + SPALLOC_PASSWORD: ${{ secrets.SPALLOC_PASSWORD }} run: pytest proxy_integration_tests diff --git a/proxy_integration_tests/test_python_debug/spynnaker.cfg b/proxy_integration_tests/test_python_debug/spynnaker.cfg index e6b0518ff66..c94ba252c44 100644 --- a/proxy_integration_tests/test_python_debug/spynnaker.cfg +++ b/proxy_integration_tests/test_python_debug/spynnaker.cfg @@ -1,7 +1,5 @@ [Machine] enable_advanced_monitor_support = True -spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/ -spalloc_port = 22244 [Mode] # mode = Production or Debug From c1562d832f9ae45622d6e6a7ebb5a71c93d24839 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 13:09:55 +0100 Subject: [PATCH 07/55] spalloc_port --- .github/workflows/c_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 547db5ed7d5..6f1b8151b2a 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -159,8 +159,8 @@ jobs: - name: Create cfg run: | echo '[Machine]' >> ~/.spynnaker.cfg - echo 'spalloc_server = 22244' >> ~/.spynnaker.cfg echo 'spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/' >> ~/.spynnaker.cfg + echo 'spalloc_port = 22244' >> ~/.spynnaker.cfg - name: Install Ubuntu dependencies uses: ./support/actions/apt-get-install From 097d15e6fee01012812ceb41ed28b443f7e5026a Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 17:30:59 +0100 Subject: [PATCH 08/55] Fec binaries --- .github/workflows/c_actions.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 6f1b8151b2a..9079bf6d405 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -128,6 +128,12 @@ jobs: repository: SpiNNakerManchester/SupportScripts path: support + - name: Download Fec binaries + uses: actions/download-artifact@v4 + with: + name: fec_binaries + path: SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries + - name: Download PyNN Binaries uses: actions/download-artifact@v4 with: From 3842373e5b4b95de54c666c741226b59e7cad776 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 18:56:26 +0100 Subject: [PATCH 09/55] change order --- .github/workflows/c_actions.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 9079bf6d405..47b11aced01 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -128,6 +128,13 @@ jobs: repository: SpiNNakerManchester/SupportScripts path: support + - name: Install Spinnaker Dependencies + uses: ./support/actions/install-spinn-deps + with: + repositories: > + SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc + SpiNNFrontEndCommon TestBase + install: true - name: Download Fec binaries uses: actions/download-artifact@v4 with: @@ -148,14 +155,6 @@ jobs: - name: Install pip, etc uses: ./support/actions/python-tools - - name: Install Spinnaker Dependencies - uses: ./support/actions/install-spinn-deps - with: - repositories: > - SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc - SpiNNFrontEndCommon TestBase - install: true - - name: Setup uses: ./support/actions/run-install From c6bc54a04392662f18e60fe74e97d077e8ae0d12 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 20:16:36 +0100 Subject: [PATCH 10/55] python before install --- .github/workflows/c_actions.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 47b11aced01..f2f6aaafa05 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -128,6 +128,11 @@ jobs: repository: SpiNNakerManchester/SupportScripts path: support + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + - name: Install Spinnaker Dependencies uses: ./support/actions/install-spinn-deps with: @@ -135,6 +140,7 @@ jobs: SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc SpiNNFrontEndCommon TestBase install: true + - name: Download Fec binaries uses: actions/download-artifact@v4 with: @@ -147,14 +153,6 @@ jobs: name: pynn_binaries path: spynnaker/pyNN/model_binaries - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - - name: Install pip, etc - uses: ./support/actions/python-tools - - name: Setup uses: ./support/actions/run-install @@ -167,6 +165,9 @@ jobs: echo 'spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/' >> ~/.spynnaker.cfg echo 'spalloc_port = 22244' >> ~/.spynnaker.cfg + - name: Install pip, etc + uses: ./support/actions/python-tools + - name: Install Ubuntu dependencies uses: ./support/actions/apt-get-install with: From 3532aa617c2f00fffe85b483bcbb218cf4818f9c Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 20:27:48 +0100 Subject: [PATCH 11/55] ls --- .github/workflows/c_actions.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index f2f6aaafa05..4db349cff69 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -153,6 +153,11 @@ jobs: name: pynn_binaries path: spynnaker/pyNN/model_binaries + - name: ls + run: | + ls SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries + ls spynnaker/pyNN/model_binaries + - name: Setup uses: ./support/actions/run-install From 8222e9bd17f8ba178ecdc25c43ddd910a2f008b4 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 05:17:01 +0100 Subject: [PATCH 12/55] all into spynnaner binaries --- .github/workflows/c_actions.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 4db349cff69..4adb45aaada 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -145,7 +145,7 @@ jobs: uses: actions/download-artifact@v4 with: name: fec_binaries - path: SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries + path: spynnaker/pyNN/model_binaries - name: Download PyNN Binaries uses: actions/download-artifact@v4 @@ -155,7 +155,6 @@ jobs: - name: ls run: | - ls SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries ls spynnaker/pyNN/model_binaries - name: Setup From a3c29bcc10ffa9c570d012121df64f36083a34f2 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 05:43:46 +0100 Subject: [PATCH 13/55] debug --- .github/workflows/c_actions.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 4adb45aaada..5909f46c1f1 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -116,7 +116,7 @@ jobs: matrix: python-version: ["3.12"] env: - C_LOGS_DICT: $PWD/spynnaker/pyNN/model_binaries/logs.sqlite3 + C_LOGS_DICT: ~/spynnaker/pyNN/model_binaries/logs.sqlite3 steps: - name: Checkout @@ -180,6 +180,12 @@ jobs: - name: Install matplotlib uses: ./support/actions/install-matplotlib + - name: ls C_LOGS_DICT + run: ls $C_LOGS_DICT + - name: ls ~/spynnaker/pyNN/model_binaries/logs.sqlite3 + run: ls ~/spynnaker/pyNN/model_binaries/logs.sqlite3 + + - name: Test with pytest and proxy env: SPALLOC_USER: ${{ secrets.SPALLOC_USER }} From 507d01e740c930c4d03ead35dfd99967892d1f26 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 06:05:32 +0100 Subject: [PATCH 14/55] C_LOGS_DICT --- .github/workflows/c_actions.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 5909f46c1f1..d82855c3b77 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -53,7 +53,7 @@ jobs: run: | echo "SPINN_DIRS=$PWD/spinnaker_tools" >> $GITHUB_ENV echo "NEURAL_MODELLING_DIRS=$PWD/neural_modelling" >> $GITHUB_ENV - echo "C_LOGS_DICT=$PWD/spynnaker/pyNN/model_binaries/logs.sqlite3" >> $GITHUB_ENV + echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV - name: Checkout SpiNNaker C Dependencies uses: ./support/actions/install-spinn-deps @@ -104,9 +104,13 @@ jobs: uses: actions/upload-artifact@v4 with: name: pynn_binaries - path: | - spynnaker/pyNN/model_binaries/*.aplx - spynnaker/pyNN/model_binaries/logs.sqlite3 + path: spynnaker/pyNN/model_binaries/*.aplx + + - name: Upload log.sqlite3s + uses: actions/upload-artifact@v4 + with: + name: logs.sqlite3 + path: $C_LOGS_DICT test: needs: build @@ -116,7 +120,7 @@ jobs: matrix: python-version: ["3.12"] env: - C_LOGS_DICT: ~/spynnaker/pyNN/model_binaries/logs.sqlite3 + C_LOGS_DICT: ~/logs.sqlite3 steps: - name: Checkout @@ -145,6 +149,7 @@ jobs: uses: actions/download-artifact@v4 with: name: fec_binaries + # Need to go into spynnaker as FEC will have been moved by install path: spynnaker/pyNN/model_binaries - name: Download PyNN Binaries @@ -153,9 +158,16 @@ jobs: name: pynn_binaries path: spynnaker/pyNN/model_binaries + - name: Download logs.sqlite3 + uses: actions/download-artifact@v4 + with: + name: logs.sqlite3 + path: $C_LOGS_DICT + - name: ls run: | ls spynnaker/pyNN/model_binaries + ls $C_LOGS_DICT - name: Setup uses: ./support/actions/run-install @@ -182,9 +194,8 @@ jobs: - name: ls C_LOGS_DICT run: ls $C_LOGS_DICT - - name: ls ~/spynnaker/pyNN/model_binaries/logs.sqlite3 - run: ls ~/spynnaker/pyNN/model_binaries/logs.sqlite3 - + - name: ls ~/spynnaker/pyNN/model_binaries + run: ls ~/spynnaker/pyNN/model_binaries - name: Test with pytest and proxy env: From 2d9c785820c1e909a71cf34b36b59460b5a7ce47 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 06:13:19 +0100 Subject: [PATCH 15/55] full path --- .github/workflows/c_actions.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index d82855c3b77..7aebbfb84ca 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -53,7 +53,7 @@ jobs: run: | echo "SPINN_DIRS=$PWD/spinnaker_tools" >> $GITHUB_ENV echo "NEURAL_MODELLING_DIRS=$PWD/neural_modelling" >> $GITHUB_ENV - echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV + echo "C_LOGS_DICT=~/logs.sqlite3" >> $GITHUB_ENV - name: Checkout SpiNNaker C Dependencies uses: ./support/actions/install-spinn-deps @@ -110,7 +110,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: logs.sqlite3 - path: $C_LOGS_DICT + path: ~/logs.sqlite3 test: needs: build @@ -162,12 +162,12 @@ jobs: uses: actions/download-artifact@v4 with: name: logs.sqlite3 - path: $C_LOGS_DICT + path: ~/logs.sqlite3 - name: ls run: | ls spynnaker/pyNN/model_binaries - ls $C_LOGS_DICT + ls ~/logs.sqlite3 - name: Setup uses: ./support/actions/run-install @@ -192,8 +192,8 @@ jobs: - name: Install matplotlib uses: ./support/actions/install-matplotlib - - name: ls C_LOGS_DICT - run: ls $C_LOGS_DICT + - name: ls ~/logs.sqlite3 + run: ls ~/logs.sqlite3 - name: ls ~/spynnaker/pyNN/model_binaries run: ls ~/spynnaker/pyNN/model_binaries From 734430ad3d0af586935818615bb7c11d48cd78c1 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 06:20:09 +0100 Subject: [PATCH 16/55] more path tries --- .github/workflows/c_actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 7aebbfb84ca..dcfac540594 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -53,7 +53,7 @@ jobs: run: | echo "SPINN_DIRS=$PWD/spinnaker_tools" >> $GITHUB_ENV echo "NEURAL_MODELLING_DIRS=$PWD/neural_modelling" >> $GITHUB_ENV - echo "C_LOGS_DICT=~/logs.sqlite3" >> $GITHUB_ENV + echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV - name: Checkout SpiNNaker C Dependencies uses: ./support/actions/install-spinn-deps @@ -110,7 +110,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: logs.sqlite3 - path: ~/logs.sqlite3 + path: logs.sqlite3 test: needs: build From 55289ff2704b0b671548ee9b9d8cb4902b079ba7 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 06:32:39 +0100 Subject: [PATCH 17/55] EXTERNAL_BINARIES --- .github/workflows/c_actions.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index dcfac540594..7e7b3332577 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -121,6 +121,7 @@ jobs: python-version: ["3.12"] env: C_LOGS_DICT: ~/logs.sqlite3 + EXTERNAL_BINARIES: ~/external_binaries steps: - name: Checkout @@ -150,13 +151,13 @@ jobs: with: name: fec_binaries # Need to go into spynnaker as FEC will have been moved by install - path: spynnaker/pyNN/model_binaries + path: ~/external_binaries - name: Download PyNN Binaries uses: actions/download-artifact@v4 with: name: pynn_binaries - path: spynnaker/pyNN/model_binaries + path: ~/external_binaries - name: Download logs.sqlite3 uses: actions/download-artifact@v4 @@ -166,7 +167,7 @@ jobs: - name: ls run: | - ls spynnaker/pyNN/model_binaries + ls ~/external_binaries ls ~/logs.sqlite3 - name: Setup @@ -194,8 +195,8 @@ jobs: - name: ls ~/logs.sqlite3 run: ls ~/logs.sqlite3 - - name: ls ~/spynnaker/pyNN/model_binaries - run: ls ~/spynnaker/pyNN/model_binaries + - name: ls ~/external_binaries + run: ls ~/external_binaries - name: Test with pytest and proxy env: From 66f75abdf167ff20399364388aa244f92bf2eda0 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 06:42:35 +0100 Subject: [PATCH 18/55] Set environment variables --- .github/workflows/c_actions.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 7e7b3332577..460e25f699f 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -119,11 +119,13 @@ jobs: strategy: matrix: python-version: ["3.12"] - env: - C_LOGS_DICT: ~/logs.sqlite3 - EXTERNAL_BINARIES: ~/external_binaries steps: + - name: Set environment variables + run: | + echo "EXTERNAL_BINARIES=$PWD/external_binaries" >> $GITHUB_ENV + echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV + - name: Checkout uses: actions/checkout@v4 From 0a18e9d8866bc405a2fc3edfce000dae7badd96f Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 06:54:04 +0100 Subject: [PATCH 19/55] debug --- .github/workflows/c_actions.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 460e25f699f..0f76aa1a1e6 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -171,6 +171,10 @@ jobs: run: | ls ~/external_binaries ls ~/logs.sqlite3 + echo EXTERNAL_BINARIES + ls $EXTERNAL_BINARIES + echo /home/runner/work/sPyNNaker/sPyNNaker/external_binaries + ls /home/runner/work/sPyNNaker/sPyNNaker/external_binaries - name: Setup uses: ./support/actions/run-install From 7a41f3fde539c5e2743f9d99eee98e7b5a75df01 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 07:13:46 +0100 Subject: [PATCH 20/55] more debug --- .github/workflows/c_actions.yml | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 0f76aa1a1e6..3b177c41f52 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -153,13 +153,13 @@ jobs: with: name: fec_binaries # Need to go into spynnaker as FEC will have been moved by install - path: ~/external_binaries + path: $PWD/external_binaries" - name: Download PyNN Binaries uses: actions/download-artifact@v4 with: name: pynn_binaries - path: ~/external_binaries + path: $PWD/external_binaries" - name: Download logs.sqlite3 uses: actions/download-artifact@v4 @@ -167,14 +167,15 @@ jobs: name: logs.sqlite3 path: ~/logs.sqlite3 - - name: ls + - name: EXTERNAL_BINARIES run: | - ls ~/external_binaries - ls ~/logs.sqlite3 - echo EXTERNAL_BINARIES - ls $EXTERNAL_BINARIES - echo /home/runner/work/sPyNNaker/sPyNNaker/external_binaries - ls /home/runner/work/sPyNNaker/sPyNNaker/external_binaries + echo $EXTERNAL_BINARIES + ls -al $EXTERNAL_BINARIES + + - name: C_LOGS_DICT + run: | + echo $C_LOGS_DICT + ls -al $C_LOGS_DICT - name: Setup uses: ./support/actions/run-install @@ -199,10 +200,15 @@ jobs: - name: Install matplotlib uses: ./support/actions/install-matplotlib - - name: ls ~/logs.sqlite3 - run: ls ~/logs.sqlite3 - - name: ls ~/external_binaries - run: ls ~/external_binaries + - name: EXTERNAL_BINARIES + run: | + echo $EXTERNAL_BINARIES + ls -al $EXTERNAL_BINARIES + + - name: C_LOGS_DICT + run: | + echo $C_LOGS_DICT + ls -al $C_LOGS_DICT - name: Test with pytest and proxy env: From 5228ad534cd33631271ac00695834bc95aaff790 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 07:26:50 +0100 Subject: [PATCH 21/55] local paths --- .github/workflows/c_actions.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 3b177c41f52..7a0fb58ed8a 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -153,19 +153,19 @@ jobs: with: name: fec_binaries # Need to go into spynnaker as FEC will have been moved by install - path: $PWD/external_binaries" + path: external_binaries" - name: Download PyNN Binaries uses: actions/download-artifact@v4 with: name: pynn_binaries - path: $PWD/external_binaries" + path: external_binaries" - name: Download logs.sqlite3 uses: actions/download-artifact@v4 with: name: logs.sqlite3 - path: ~/logs.sqlite3 + path: logs.sqlite3 - name: EXTERNAL_BINARIES run: | From ee735346b71b423c32a144e367b03eaee7adb901 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 07:37:05 +0100 Subject: [PATCH 22/55] no quote in path --- .github/workflows/c_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 7a0fb58ed8a..64150d359de 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -159,7 +159,7 @@ jobs: uses: actions/download-artifact@v4 with: name: pynn_binaries - path: external_binaries" + path: external_binaries - name: Download logs.sqlite3 uses: actions/download-artifact@v4 From 40c69b92f554af959039282fe03af41683867c2f Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 07:45:16 +0100 Subject: [PATCH 23/55] no quote in path 2 --- .github/workflows/c_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 64150d359de..185623d9fd8 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -153,7 +153,7 @@ jobs: with: name: fec_binaries # Need to go into spynnaker as FEC will have been moved by install - path: external_binaries" + path: external_binaries - name: Download PyNN Binaries uses: actions/download-artifact@v4 From f8bda8e27fbf8760c69002f8289d53c43d281e1a Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 08:03:17 +0100 Subject: [PATCH 24/55] chmod --- .github/workflows/c_actions.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 185623d9fd8..c9a28671836 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -205,6 +205,9 @@ jobs: echo $EXTERNAL_BINARIES ls -al $EXTERNAL_BINARIES + - name: chmod C_LOGS_DICT + run: chmod 777 $C_LOGS_DICT + - name: C_LOGS_DICT run: | echo $C_LOGS_DICT From 93f58870231136ae10cf5ef2c1753bc6069f7646 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 08:28:25 +0100 Subject: [PATCH 25/55] no chmod --- .github/workflows/c_actions.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index c9a28671836..185623d9fd8 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -205,9 +205,6 @@ jobs: echo $EXTERNAL_BINARIES ls -al $EXTERNAL_BINARIES - - name: chmod C_LOGS_DICT - run: chmod 777 $C_LOGS_DICT - - name: C_LOGS_DICT run: | echo $C_LOGS_DICT From b4e1b63704a3be2cf9d7a4381f1ed9f18500dd61 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 09:59:31 +0100 Subject: [PATCH 26/55] log.sqlite3 to external binaries --- .github/workflows/c_actions.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 185623d9fd8..eed2f58e792 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -124,7 +124,7 @@ jobs: - name: Set environment variables run: | echo "EXTERNAL_BINARIES=$PWD/external_binaries" >> $GITHUB_ENV - echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV + # echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v4 @@ -165,18 +165,13 @@ jobs: uses: actions/download-artifact@v4 with: name: logs.sqlite3 - path: logs.sqlite3 + path: external_binaries/logs.sqlite3 - name: EXTERNAL_BINARIES run: | echo $EXTERNAL_BINARIES ls -al $EXTERNAL_BINARIES - - name: C_LOGS_DICT - run: | - echo $C_LOGS_DICT - ls -al $C_LOGS_DICT - - name: Setup uses: ./support/actions/run-install @@ -205,11 +200,6 @@ jobs: echo $EXTERNAL_BINARIES ls -al $EXTERNAL_BINARIES - - name: C_LOGS_DICT - run: | - echo $C_LOGS_DICT - ls -al $C_LOGS_DICT - - name: Test with pytest and proxy env: SPALLOC_USER: ${{ secrets.SPALLOC_USER }} From 88d5e9f4c8296441efee33a03d126367695a3f3a Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 10:38:06 +0100 Subject: [PATCH 27/55] path is a directory --- .github/workflows/c_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index eed2f58e792..25dd660dbf3 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -165,7 +165,7 @@ jobs: uses: actions/download-artifact@v4 with: name: logs.sqlite3 - path: external_binaries/logs.sqlite3 + path: external_binaries - name: EXTERNAL_BINARIES run: | From a529f0d529b59c50b44879038eb8353bec723e61 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 10:53:07 +0100 Subject: [PATCH 28/55] increase timeout --- .github/workflows/c_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 25dd660dbf3..138ebf1bf7a 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -115,7 +115,7 @@ jobs: test: needs: build runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 20 strategy: matrix: python-version: ["3.12"] From f73154fe7bf07c00816aef0c334e038b475c537c Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 11:18:33 +0100 Subject: [PATCH 29/55] only test 1 run --- .../test_python_debug/check_debug.py | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/proxy_integration_tests/test_python_debug/check_debug.py b/proxy_integration_tests/test_python_debug/check_debug.py index 6c9ac487988..d56bf978d28 100644 --- a/proxy_integration_tests/test_python_debug/check_debug.py +++ b/proxy_integration_tests/test_python_debug/check_debug.py @@ -102,38 +102,4 @@ def debug(self): self.assertIn("data.sqlite3", found) self.assertIn("ds.sqlite3", found) - sim.run(10) # second run - pop.get_data("v") - self.assertEqual(run0, SpynnakerDataView.get_run_dir_path()) - # No point in checking files they are already there - - sim.reset() # Soft - # check get works directly after a reset - pop.get_data("v") - sim.run(10) - found = os.listdir(SpynnakerDataView.get_run_dir_path()) - self.assertIn("data1.sqlite3", found) - self.assertNotIn("ds1.sqlite3", found) - - sim.reset() # soft with dsg - SpynnakerDataView.set_requires_data_generation() - sim.run(10) - pop.get_data("v") - self.assertEqual(run0, SpynnakerDataView.get_run_dir_path()) - found = os.listdir(run0) - self.assertIn("data2.sqlite3", found) - self.assertIn("ds2.sqlite3", found) - # No point in checking files they are already there - - sim.reset() # hard - SpynnakerDataView.set_requires_mapping() - sim.run(10) - pop.get_data("v") - self.assertNotEqual(run0, SpynnakerDataView.get_run_dir_path()) - found = os.listdir(SpynnakerDataView.get_run_dir_path()) - for report in reports: - self.assertIn(report, found) - self.assertIn("data3.sqlite3", found) - self.assertIn("ds3.sqlite3", found) - sim.end() From 160ea84177b001c3203e30ffd36fc74750dddfbe Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 11:37:40 +0100 Subject: [PATCH 30/55] three operating systems --- .github/workflows/c_actions.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 138ebf1bf7a..1ee5a4d24bf 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -114,11 +114,11 @@ jobs: test: needs: build - runs-on: ubuntu-latest + rruns-on: ${{ matrix.runner }} timeout-minutes: 20 strategy: matrix: - python-version: ["3.12"] + runner: [ubuntu-latest, windows-latest, macos-latest] steps: - name: Set environment variables @@ -135,10 +135,10 @@ jobs: repository: SpiNNakerManchester/SupportScripts path: support - - name: Set up Python ${{ matrix.python-version }} + - name: Set up Python uses: actions/setup-python@v5 with: - python-version: ${{ matrix.python-version }} + python-version: "3.12" - name: Install Spinnaker Dependencies uses: ./support/actions/install-spinn-deps From 5febd6f7295eae65c26087dc9173651850b73e7d Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 11:42:27 +0100 Subject: [PATCH 31/55] run as 1 r --- .github/workflows/c_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 1ee5a4d24bf..fbb64452a97 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -114,7 +114,7 @@ jobs: test: needs: build - rruns-on: ${{ matrix.runner }} + runs-on: ${{ matrix.runner }} timeout-minutes: 20 strategy: matrix: From 6d824f08675f6739b0bcd0b6b04c8f871b3389bb Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 12:03:09 +0100 Subject: [PATCH 32/55] check_tools false --- .github/workflows/c_actions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index fbb64452a97..7a3eea1c93c 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -186,6 +186,8 @@ jobs: - name: Install pip, etc uses: ./support/actions/python-tools + with: + check_tools: false - name: Install Ubuntu dependencies uses: ./support/actions/apt-get-install From f7a01e1ca8a9de8e3ddfb2fa9b90cfe92ff6287b Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 12:14:23 +0100 Subject: [PATCH 33/55] check_tools ignore --- .github/workflows/c_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 7a3eea1c93c..044cc83f6fc 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -187,7 +187,7 @@ jobs: - name: Install pip, etc uses: ./support/actions/python-tools with: - check_tools: false + check_tools: ignore - name: Install Ubuntu dependencies uses: ./support/actions/apt-get-install From ef2d8c9f8dd5f1387a0feb50345c53eace438e4d Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 12:22:01 +0100 Subject: [PATCH 34/55] no graphviz --- .github/workflows/c_actions.yml | 8 ++++---- .github/workflows/python_actions.yml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 044cc83f6fc..8ea29741689 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -189,10 +189,10 @@ jobs: with: check_tools: ignore - - name: Install Ubuntu dependencies - uses: ./support/actions/apt-get-install - with: - packages: graphviz + #- name: Install Ubuntu dependencies + # uses: ./support/actions/apt-get-install + # with: + # packages: graphviz - name: Install matplotlib uses: ./support/actions/install-matplotlib diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 250b80e3c80..b82f10f8f56 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -41,10 +41,10 @@ jobs: repository: SpiNNakerManchester/SupportScripts path: support - - name: Install Ubuntu dependencies - uses: ./support/actions/apt-get-install - with: - packages: graphviz + #- name: Install Ubuntu dependencies + # uses: ./support/actions/apt-get-install + # with: + # packages: graphviz - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -110,10 +110,10 @@ jobs: repository: SpiNNakerManchester/SupportScripts path: support - - name: Install Ubuntu dependencies - uses: ./support/actions/apt-get-install - with: - packages: graphviz + #- name: Install Ubuntu dependencies + # uses: ./support/actions/apt-get-install + # with: + # packages: graphviz - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: From f74e3d2daac66f784a892ea000637eb50891042b Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 12:29:00 +0100 Subject: [PATCH 35/55] no graphviz --- .github/workflows/c_actions.yml | 10 ---------- .github/workflows/python_actions.yml | 4 ---- 2 files changed, 14 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 8ea29741689..3e71616d2a3 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -167,11 +167,6 @@ jobs: name: logs.sqlite3 path: external_binaries - - name: EXTERNAL_BINARIES - run: | - echo $EXTERNAL_BINARIES - ls -al $EXTERNAL_BINARIES - - name: Setup uses: ./support/actions/run-install @@ -197,11 +192,6 @@ jobs: - name: Install matplotlib uses: ./support/actions/install-matplotlib - - name: EXTERNAL_BINARIES - run: | - echo $EXTERNAL_BINARIES - ls -al $EXTERNAL_BINARIES - - name: Test with pytest and proxy env: SPALLOC_USER: ${{ secrets.SPALLOC_USER }} diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index b82f10f8f56..b1635523845 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -110,10 +110,6 @@ jobs: repository: SpiNNakerManchester/SupportScripts path: support - #- name: Install Ubuntu dependencies - # uses: ./support/actions/apt-get-install - # with: - # packages: graphviz - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: From bc09e655629e6adf27786e564a5c0f43d9b19b37 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 13:19:30 +0100 Subject: [PATCH 36/55] EXTERNAL_BINARIES is relative to home --- .github/workflows/c_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 3e71616d2a3..9f318476e44 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -123,7 +123,7 @@ jobs: steps: - name: Set environment variables run: | - echo "EXTERNAL_BINARIES=$PWD/external_binaries" >> $GITHUB_ENV + echo "EXTERNAL_BINARIES=external_binaries" >> $GITHUB_ENV # echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV - name: Checkout From ea19345944d906a299c2e500d3552fd2092719bc Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 14:23:04 +0100 Subject: [PATCH 37/55] use current dir --- .github/workflows/c_actions.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 9f318476e44..b78952f5b98 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -121,11 +121,17 @@ jobs: runner: [ubuntu-latest, windows-latest, macos-latest] steps: - - name: Set environment variables + - name: Set environment variables ubuntu + if: { { matrix.runner != 'windows-latest' } } run: | - echo "EXTERNAL_BINARIES=external_binaries" >> $GITHUB_ENV + echo "EXTERNAL_BINARIES=$PWD/external_binaries" >> $GITHUB_ENV # echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV + - name: Set environment variables windos + if: { { matrix.runner == 'windows-latest' } } + run: | + echo "EXTERNAL_BINARIES=%cd%/external_binaries" >> $GITHUB_ENV + - name: Checkout uses: actions/checkout@v4 From a95b8ad2d60448935a064a595bdc37c491cad5d3 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 14:24:58 +0100 Subject: [PATCH 38/55] syntax --- .github/workflows/c_actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index b78952f5b98..cd7248f4a32 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -122,13 +122,13 @@ jobs: steps: - name: Set environment variables ubuntu - if: { { matrix.runner != 'windows-latest' } } + if: { { matrix.runner != 'windows-latest' }} run: | echo "EXTERNAL_BINARIES=$PWD/external_binaries" >> $GITHUB_ENV # echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV - name: Set environment variables windos - if: { { matrix.runner == 'windows-latest' } } + if: { { matrix.runner == 'windows-latest' }} run: | echo "EXTERNAL_BINARIES=%cd%/external_binaries" >> $GITHUB_ENV From 1ac30afc3c6a78550f2a4cd851c96cc6015c0e9d Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 14:26:43 +0100 Subject: [PATCH 39/55] windows slash --- .github/workflows/c_actions.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index cd7248f4a32..bf276c9e591 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -122,15 +122,15 @@ jobs: steps: - name: Set environment variables ubuntu - if: { { matrix.runner != 'windows-latest' }} + if: {{ matrix.runner != 'windows-latest' }} run: | echo "EXTERNAL_BINARIES=$PWD/external_binaries" >> $GITHUB_ENV # echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV - name: Set environment variables windos - if: { { matrix.runner == 'windows-latest' }} + if: {{ matrix.runner == 'windows-latest' }} run: | - echo "EXTERNAL_BINARIES=%cd%/external_binaries" >> $GITHUB_ENV + echo "EXTERNAL_BINARIES=%cd%\external_binaries" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v4 From 55aaebc058e189607e222beb3f66c7286af6e643 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 14:32:06 +0100 Subject: [PATCH 40/55] fix if (I hope) --- .github/workflows/c_actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index bf276c9e591..25e2b84d1b4 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -122,13 +122,13 @@ jobs: steps: - name: Set environment variables ubuntu - if: {{ matrix.runner != 'windows-latest' }} + if: ${{ matrix.runner != 'windows-latest' }} run: | echo "EXTERNAL_BINARIES=$PWD/external_binaries" >> $GITHUB_ENV # echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV - name: Set environment variables windos - if: {{ matrix.runner == 'windows-latest' }} + if: ${{ matrix.runner == 'windows-latest' }} run: | echo "EXTERNAL_BINARIES=%cd%\external_binaries" >> $GITHUB_ENV From 2f2a1866b4fd0fc9572c4aebb4b49b6ad4bd765f Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 14:43:34 +0100 Subject: [PATCH 41/55] echo --- .github/workflows/c_actions.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 25e2b84d1b4..3e7321edac0 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -132,6 +132,11 @@ jobs: run: | echo "EXTERNAL_BINARIES=%cd%\external_binaries" >> $GITHUB_ENV + - name: EXTERNAL_BINARIES + run: | + echo $EXTERNAL_BINARIES + echo %EXTERNAL_BINARIES% + - name: Checkout uses: actions/checkout@v4 From e54490378ae3184fcb9f747be7bd4ca966718b0d Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 14:50:56 +0100 Subject: [PATCH 42/55] set --- .github/workflows/c_actions.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 3e7321edac0..cfd568d4221 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -121,6 +121,11 @@ jobs: runner: [ubuntu-latest, windows-latest, macos-latest] steps: + - name: EXTERNAL_BINARIES1 + run: | + echo $EXTERNAL_BINARIES + echo %EXTERNAL_BINARIES% + - name: Set environment variables ubuntu if: ${{ matrix.runner != 'windows-latest' }} run: | @@ -130,9 +135,9 @@ jobs: - name: Set environment variables windos if: ${{ matrix.runner == 'windows-latest' }} run: | - echo "EXTERNAL_BINARIES=%cd%\external_binaries" >> $GITHUB_ENV + echo "set EXTERNAL_BINARIES=%cd%\external_binaries" >> $GITHUB_ENV - - name: EXTERNAL_BINARIES + - name: EXTERNAL_BINARIES2 run: | echo $EXTERNAL_BINARIES echo %EXTERNAL_BINARIES% From 3f6d763b013685043c8223937b773af01113904a Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 14:58:48 +0100 Subject: [PATCH 43/55] SPINNAKER_EXTERNAL_BINARIES --- .github/workflows/c_actions.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index cfd568d4221..6e56208a8c0 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -121,26 +121,22 @@ jobs: runner: [ubuntu-latest, windows-latest, macos-latest] steps: - - name: EXTERNAL_BINARIES1 + - name: SPINNAKER_EXTERNAL_BINARIES1 run: | - echo $EXTERNAL_BINARIES - echo %EXTERNAL_BINARIES% + echo $SPINNAKER_EXTERNAL_BINARIES + echo %SPINNAKER_EXTERNAL_BINARIES% - - name: Set environment variables ubuntu - if: ${{ matrix.runner != 'windows-latest' }} - run: | - echo "EXTERNAL_BINARIES=$PWD/external_binaries" >> $GITHUB_ENV - # echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV - - - name: Set environment variables windos - if: ${{ matrix.runner == 'windows-latest' }} - run: | - echo "set EXTERNAL_BINARIES=%cd%\external_binaries" >> $GITHUB_ENV + - name: Set environment variable + if: runner.os != 'Windows' + run: echo "SPINNAKER_EXTERNAL_BINARIES=$PWD/external_binaries" >> "$GITHUB_ENV" + - name: Set environment variable on Windows + if: runner.os == 'Windows' + run: echo "SPINNAKER_EXTERNAL_BINARIES=$PWD/external_binaries" | Out-File -FilePath $env:GITHUB_ENV -Append - - name: EXTERNAL_BINARIES2 + - name: SPINNAKER_EXTERNAL_BINARIES2 run: | - echo $EXTERNAL_BINARIES - echo %EXTERNAL_BINARIES% + echo $SPINNAKER_EXTERNAL_BINARIES + echo %SPINNAKER_EXTERNAL_BINARIES% - name: Checkout uses: actions/checkout@v4 From 28779078defa171929607d8ff83de73957b02b57 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 15:18:14 +0100 Subject: [PATCH 44/55] os based echo --- .github/workflows/c_actions.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 6e56208a8c0..62ef98ec7ae 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -121,10 +121,13 @@ jobs: runner: [ubuntu-latest, windows-latest, macos-latest] steps: - - name: SPINNAKER_EXTERNAL_BINARIES1 - run: | - echo $SPINNAKER_EXTERNAL_BINARIES - echo %SPINNAKER_EXTERNAL_BINARIES% + - name: see environment variable + if: runner.os != 'Windows' + run: echo $SPINNAKER_EXTERNAL_BINARIES + - name: see environment variable on Windows + if: runner.os == 'Windows' + run: echo %SPINNAKER_EXTERNAL_BINARIES% + - name: Set environment variable if: runner.os != 'Windows' @@ -133,10 +136,12 @@ jobs: if: runner.os == 'Windows' run: echo "SPINNAKER_EXTERNAL_BINARIES=$PWD/external_binaries" | Out-File -FilePath $env:GITHUB_ENV -Append - - name: SPINNAKER_EXTERNAL_BINARIES2 - run: | - echo $SPINNAKER_EXTERNAL_BINARIES - echo %SPINNAKER_EXTERNAL_BINARIES% + - name: see environment variable + if: runner.os != 'Windows' + run: echo $SPINNAKER_EXTERNAL_BINARIES + - name: see environment variable on Windows + if: runner.os == 'Windows' + run: echo %SPINNAKER_EXTERNAL_BINARIES% - name: Checkout uses: actions/checkout@v4 From 99243c9ffa728d89273ab34e939df495fc50aa51 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 15:42:29 +0100 Subject: [PATCH 45/55] dont look for graphviz output. --- proxy_integration_tests/test_python_debug/check_debug.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy_integration_tests/test_python_debug/check_debug.py b/proxy_integration_tests/test_python_debug/check_debug.py index d56bf978d28..9ebb08c4eae 100644 --- a/proxy_integration_tests/test_python_debug/check_debug.py +++ b/proxy_integration_tests/test_python_debug/check_debug.py @@ -33,7 +33,7 @@ from spynnaker.pyNN.data import SpynnakerDataView from spynnaker.pyNN.extra_algorithms.\ spynnaker_neuron_network_specification_report import ( - _GRAPH_NAME, _GRAPH_FORMAT) + _GRAPH_NAME) #, _GRAPH_FORMAT) import pyNN.spiNNaker as sim @@ -75,9 +75,9 @@ def debug(self): CLOCK_DRIFT_REPORT, # write_board_chip_report AREA_CODE_REPORT_NAME, + # spynnaker_neuron_graph_network_specification_report _GRAPH_NAME, - _GRAPH_NAME + "." + - _GRAPH_FORMAT, + # _GRAPH_NAME + "." + _GRAPH_FORMAT, ] sim.setup(1.0) From 343a57d59f175b86f50a1ea0a56a8f18b4815a32 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 24 May 2024 07:44:40 +0100 Subject: [PATCH 46/55] external_binaries is a cfg setting --- .github/workflows/c_actions.yml | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 62ef98ec7ae..5ce22313343 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -121,28 +121,6 @@ jobs: runner: [ubuntu-latest, windows-latest, macos-latest] steps: - - name: see environment variable - if: runner.os != 'Windows' - run: echo $SPINNAKER_EXTERNAL_BINARIES - - name: see environment variable on Windows - if: runner.os == 'Windows' - run: echo %SPINNAKER_EXTERNAL_BINARIES% - - - - name: Set environment variable - if: runner.os != 'Windows' - run: echo "SPINNAKER_EXTERNAL_BINARIES=$PWD/external_binaries" >> "$GITHUB_ENV" - - name: Set environment variable on Windows - if: runner.os == 'Windows' - run: echo "SPINNAKER_EXTERNAL_BINARIES=$PWD/external_binaries" | Out-File -FilePath $env:GITHUB_ENV -Append - - - name: see environment variable - if: runner.os != 'Windows' - run: echo $SPINNAKER_EXTERNAL_BINARIES - - name: see environment variable on Windows - if: runner.os == 'Windows' - run: echo %SPINNAKER_EXTERNAL_BINARIES% - - name: Checkout uses: actions/checkout@v4 @@ -195,16 +173,19 @@ jobs: echo '[Machine]' >> ~/.spynnaker.cfg echo 'spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/' >> ~/.spynnaker.cfg echo 'spalloc_port = 22244' >> ~/.spynnaker.cfg + echo '[Mapping]' >> ~/.spynnaker.cfg + echo "external_binaries=$PWD/external_binaries" >> ~/.spynnaker.cfg - name: Install pip, etc uses: ./support/actions/python-tools with: check_tools: ignore - #- name: Install Ubuntu dependencies - # uses: ./support/actions/apt-get-install - # with: - # packages: graphviz + - name: Install Graphviz + if: runner.os != 'Windows' + uses: ./support/actions/apt-get-install + with: + packages: graphviz - name: Install matplotlib uses: ./support/actions/install-matplotlib From 4503badba97df1718ed9d4a006926ace4c64d8ce Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 24 May 2024 11:05:43 +0100 Subject: [PATCH 47/55] graphvix Linux only --- .github/workflows/c_actions.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 5ce22313343..1e766bbf906 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -99,18 +99,21 @@ jobs: with: name: fec_binaries path: SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries/*.aplx + retention-days: 5 - name: Upload PyNN binaries uses: actions/upload-artifact@v4 with: name: pynn_binaries path: spynnaker/pyNN/model_binaries/*.aplx + retention-days: 5 - name: Upload log.sqlite3s uses: actions/upload-artifact@v4 with: name: logs.sqlite3 path: logs.sqlite3 + retention-days: 5 test: needs: build @@ -182,7 +185,7 @@ jobs: check_tools: ignore - name: Install Graphviz - if: runner.os != 'Windows' + if: runner.os == 'Linux' uses: ./support/actions/apt-get-install with: packages: graphviz From 2ca93c0bf3a41f43e53433f4eadc4a1d4b9cc112 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 24 May 2024 14:29:49 +0100 Subject: [PATCH 48/55] install graphviz again --- .github/workflows/python_actions.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index b1635523845..f62bb0ebede 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -41,10 +41,6 @@ jobs: repository: SpiNNakerManchester/SupportScripts path: support - #- name: Install Ubuntu dependencies - # uses: ./support/actions/apt-get-install - # with: - # packages: graphviz - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -68,6 +64,12 @@ jobs: - name: Setup uses: ./support/actions/run-install + - name: Install Ubuntu dependencies + uses: ./support/actions/apt-get-install + if: runner.os == 'Linux + with: + packages: graphviz + - name: Setup PyNN uses: ./support/actions/pynn-setup - name: Create a spynnaker.cfg From 60fffd5cf0921fe12529e3359ee195abcd94a204 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 31 May 2024 06:41:38 +0100 Subject: [PATCH 49/55] SpiNNakerManchester/SupportScripts/actions --- .github/workflows/c_actions.yml | 94 +++++----------------------- .github/workflows/python_actions.yml | 1 + 2 files changed, 17 insertions(+), 78 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 1e766bbf906..4ec48ebd7cb 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -22,32 +22,15 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Checkout SupportScripts - uses: actions/checkout@v4 - with: - repository: SpiNNakerManchester/SupportScripts - path: support - - - name: Set up Python 3.12 - # Note: Python is needed for spinn_utilities.make_tools when building - uses: actions/setup-python@v5 - with: - python-version: 3.12 - - - name: "Prepare: Install SpiNNUtils" - uses: ./support/actions/install-spinn-deps - with: - # Note: SpiNNUtils needed for spinn_utilities.make_tools - repositories: SpiNNUtils - install: true - - - name: Install Ubuntu dependencies - uses: ./support/actions/apt-get-install + - name: Prepare + uses: SpiNNakerManchester/SupportScripts/actions/prepare@main with: - packages: doxygen gcc-arm-none-eabi + python-version: "3.12" + checkout_dependencies: spinnaker_tools spinn_common SpiNNFrontEndCommon + install_dependencies: SpiNNUtils + install_module: false + install_check_tools: false + ubuntu_packages: doxygen gcc-arm-none-eabi - name: Set environment variables run: | @@ -55,13 +38,6 @@ jobs: echo "NEURAL_MODELLING_DIRS=$PWD/neural_modelling" >> $GITHUB_ENV echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV - - name: Checkout SpiNNaker C Dependencies - uses: ./support/actions/install-spinn-deps - with: - # Note: SpiNNUtils needed for spinn_utilities.make_tools - repositories: spinnaker_tools spinn_common SpiNNFrontEndCommon - install: false - - name: Lint C code using Vera++ uses: ./support/actions/vera with: @@ -72,7 +48,7 @@ jobs: make -C $SPINN_DIRS make -C spinn_common install - - name: "Check: Build FEC C code" + - name: Build FEC C code run: make working-directory: SpiNNFrontEndCommon/c_common env: @@ -124,27 +100,17 @@ jobs: runner: [ubuntu-latest, windows-latest, macos-latest] steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Checkout SupportScripts - uses: actions/checkout@v4 - with: - repository: SpiNNakerManchester/SupportScripts - path: support - - - name: Set up Python - uses: actions/setup-python@v5 + - name: Prepare + uses: SpiNNakerManchester/SupportScripts/actions/prepare@main with: python-version: "3.12" - - - name: Install Spinnaker Dependencies - uses: ./support/actions/install-spinn-deps - with: - repositories: > + install_dependencies: > SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc SpiNNFrontEndCommon TestBase - install: true + install_module: false + install_check_tools: false + ubuntu_packages: graphviz + cfg_file: spynnaker - name: Download Fec binaries uses: actions/download-artifact@v4 @@ -165,34 +131,6 @@ jobs: name: logs.sqlite3 path: external_binaries - - name: Setup - uses: ./support/actions/run-install - - - name: Setup PyNN - uses: ./support/actions/pynn-setup - - - name: Create cfg - run: | - echo '[Machine]' >> ~/.spynnaker.cfg - echo 'spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/' >> ~/.spynnaker.cfg - echo 'spalloc_port = 22244' >> ~/.spynnaker.cfg - echo '[Mapping]' >> ~/.spynnaker.cfg - echo "external_binaries=$PWD/external_binaries" >> ~/.spynnaker.cfg - - - name: Install pip, etc - uses: ./support/actions/python-tools - with: - check_tools: ignore - - - name: Install Graphviz - if: runner.os == 'Linux' - uses: ./support/actions/apt-get-install - with: - packages: graphviz - - - name: Install matplotlib - uses: ./support/actions/install-matplotlib - - name: Test with pytest and proxy env: SPALLOC_USER: ${{ secrets.SPALLOC_USER }} diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 65bfda026c3..9487ea4c752 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -28,6 +28,7 @@ jobs: with: base-package: spynnaker dependencies: SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc SpiNNFrontEndCommon TestBase + ubuntu_packages: graphviz test_directories: unittests flake8-packages: spynnaker unittests check_prereleases: false From bcf313489c007b72c62cb4065cf5846c82e70303 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 31 May 2024 07:01:39 +0100 Subject: [PATCH 50/55] SpiNNakerManchester/SupportScripts/actions/vera@main --- .github/workflows/c_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 4ec48ebd7cb..2f7949e58ca 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -39,7 +39,7 @@ jobs: echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV - name: Lint C code using Vera++ - uses: ./support/actions/vera + uses: SpiNNakerManchester/SupportScripts/actions/vera@main with: base-dir: neural_modelling/src From 3bfa25b4d3d6408ffafa7f97518f12378a86f567 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 31 May 2024 10:39:21 +0100 Subject: [PATCH 51/55] install_modul needed --- .github/workflows/c_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 2f7949e58ca..b6a0eb6d7c0 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -107,7 +107,7 @@ jobs: install_dependencies: > SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc SpiNNFrontEndCommon TestBase - install_module: false + install_module: true install_check_tools: false ubuntu_packages: graphviz cfg_file: spynnaker From 40ce2dafa320d43fa6dff4f4b731280577803dcf Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 31 May 2024 10:57:07 +0100 Subject: [PATCH 52/55] cfg outside of prepare --- .github/workflows/c_actions.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index b6a0eb6d7c0..748b2e28dd6 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -131,6 +131,14 @@ jobs: name: logs.sqlite3 path: external_binaries + - name: Create cfg + run: | + echo '[Machine]' >> ~/.spynnaker.cfg + echo 'spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/' >> ~/.spynnaker.cfg + echo 'spalloc_port = 22244' >> ~/.spynnaker.cfg + echo '[Mapping]' >> ~/.spynnaker.cfg + echo "external_binaries=$PWD/external_binaries" >> ~/.spynnaker.cfg + - name: Test with pytest and proxy env: SPALLOC_USER: ${{ secrets.SPALLOC_USER }} From d7b940357c5e9a70c8db905c25efd00d258b518d Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 31 May 2024 11:07:55 +0100 Subject: [PATCH 53/55] one cfg --- .github/workflows/c_actions.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 748b2e28dd6..944cdae5bd9 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -110,7 +110,7 @@ jobs: install_module: true install_check_tools: false ubuntu_packages: graphviz - cfg_file: spynnaker + #cfg_file: spynnaker - name: Download Fec binaries uses: actions/download-artifact@v4 @@ -133,12 +133,15 @@ jobs: - name: Create cfg run: | - echo '[Machine]' >> ~/.spynnaker.cfg + echo '[Machine]' > ~/.spynnaker.cfg echo 'spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/' >> ~/.spynnaker.cfg echo 'spalloc_port = 22244' >> ~/.spynnaker.cfg echo '[Mapping]' >> ~/.spynnaker.cfg echo "external_binaries=$PWD/external_binaries" >> ~/.spynnaker.cfg + - name: cat cfg + run: cat ~/.spynnaker.cfg + - name: Test with pytest and proxy env: SPALLOC_USER: ${{ secrets.SPALLOC_USER }} From 0168b3330c57458aa0f61b7b0749af59e70cfae7 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 31 May 2024 11:25:44 +0100 Subject: [PATCH 54/55] external_binaries must be set in main yml --- .github/workflows/c_actions.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 944cdae5bd9..dddcc77d7d9 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -110,7 +110,7 @@ jobs: install_module: true install_check_tools: false ubuntu_packages: graphviz - #cfg_file: spynnaker + cfg_file: spynnaker - name: Download Fec binaries uses: actions/download-artifact@v4 @@ -131,16 +131,12 @@ jobs: name: logs.sqlite3 path: external_binaries - - name: Create cfg + - name: Append cfg + # Doing this in the prepare action ended with a different path run: | - echo '[Machine]' > ~/.spynnaker.cfg - echo 'spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/' >> ~/.spynnaker.cfg - echo 'spalloc_port = 22244' >> ~/.spynnaker.cfg echo '[Mapping]' >> ~/.spynnaker.cfg echo "external_binaries=$PWD/external_binaries" >> ~/.spynnaker.cfg - - - name: cat cfg - run: cat ~/.spynnaker.cfg + cat ~/.spynnaker.cfg - name: Test with pytest and proxy env: From de3834f19bce4f0d5cb54182ac215d9c0ecdc6f6 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Mon, 3 Jun 2024 15:48:46 +0100 Subject: [PATCH 55/55] coverage-package pylint-packages mypy-packages --- .github/workflows/python_actions.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 9487ea4c752..0b32f5a9162 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -26,10 +26,12 @@ jobs: call: uses: SpiNNakerManchester/SupportScripts/.github/workflows/python_checks.yml@main with: - base-package: spynnaker dependencies: SpiNNUtils SpiNNMachine SpiNNMan PACMAN spalloc SpiNNFrontEndCommon TestBase ubuntu_packages: graphviz test_directories: unittests + coverage-package: spynnaker flake8-packages: spynnaker unittests + pylint-packages: spynnaker + mypy-packages: spynnaker check_prereleases: false cfg_file: spynnaker