From 27b5b47fa438e7118b04c4ce9eedc67b4261eb6e Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Mon, 8 Dec 2025 16:07:12 +0000 Subject: [PATCH 01/17] DATABASE_KEY --- c_models/makefiles/extra.mk | 3 +++ c_models/makefiles/extra_neuron.mk | 3 +++ c_models/makefiles/extra_synapse.mk | 3 +++ 3 files changed, 9 insertions(+) diff --git a/c_models/makefiles/extra.mk b/c_models/makefiles/extra.mk index 78e57f8..126c9a0 100644 --- a/c_models/makefiles/extra.mk +++ b/c_models/makefiles/extra.mk @@ -9,6 +9,9 @@ BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/ # This is where the output .aplx files will go APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/ +# key for the database in this APP_OUTPUT_DIR +# If you change APP_OUTPUT_DIR please use a lower case letter +DATABASE_KEY = N # This is where the extra source files are located EXTRA_SRC_DIR := $(EXTRA_MODELS_DIR)c_models/src diff --git a/c_models/makefiles/extra_neuron.mk b/c_models/makefiles/extra_neuron.mk index f5de65c..2ff789e 100644 --- a/c_models/makefiles/extra_neuron.mk +++ b/c_models/makefiles/extra_neuron.mk @@ -9,6 +9,9 @@ BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/ # This is where the output .aplx files will go APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/ +# key for the database in this APP_OUTPUT_DIR +# If you change APP_OUTPUT_DIR please use a lower case letter +DATABASE_KEY = N # This is where the extra source files are located EXTRA_SRC_DIR := $(EXTRA_MODELS_DIR)c_models/src diff --git a/c_models/makefiles/extra_synapse.mk b/c_models/makefiles/extra_synapse.mk index c6e5773..ed9297b 100644 --- a/c_models/makefiles/extra_synapse.mk +++ b/c_models/makefiles/extra_synapse.mk @@ -9,6 +9,9 @@ BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/ # This is where the output .aplx files will go APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/ +# key for the database in this APP_OUTPUT_DIR +# If you change APP_OUTPUT_DIR please use a lower case letter +DATABASE_KEY = N # This is where the extra source files are located EXTRA_SRC_DIR := $(EXTRA_MODELS_DIR)c_models/src From 7e3318c707e918b3bcdef51d2cc71fc994cc2a5b Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 9 Dec 2025 10:00:19 +0000 Subject: [PATCH 02/17] clean logs.sqlite3 and aplx files --- c_models/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/c_models/Makefile b/c_models/Makefile index 3431bd6..0018b18 100644 --- a/c_models/Makefile +++ b/c_models/Makefile @@ -1,7 +1,13 @@ +MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) +CURRENT_DIR := $(abspath $(dir $(MAKEFILE_PATH))) +APP_OUTPUT_DIR := $(abspath $(CURRENT_DIR)/../python_models8/model_binaries) + DIRS = makefiles all: $(DIRS) for d in $(DIRS); do $(MAKE) -C $$d || exit $$?; done clean: $(DIRS) + $(RM) $(APP_OUTPUT_DIR)/logs.sqlite3 + $(RM) $(APP_OUTPUT_DIR)/*.aplx for d in $(DIRS); do $(MAKE) -C $$d clean || exit $$?; done From bebe7989c0b2cc608c85aa039e2aea5df3669d2b Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 10 Dec 2025 09:17:18 +0000 Subject: [PATCH 03/17] clean logs.sqlite3 --- c_models/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/c_models/Makefile b/c_models/Makefile index 0018b18..268c16d 100644 --- a/c_models/Makefile +++ b/c_models/Makefile @@ -1,6 +1,6 @@ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) CURRENT_DIR := $(abspath $(dir $(MAKEFILE_PATH))) -APP_OUTPUT_DIR := $(abspath $(CURRENT_DIR)/../python_models8/model_binaries) +APP_OUTPUT_DIR := $(CURRENT_DIR)/../python_models8/model_binaries/ DIRS = makefiles @@ -8,6 +8,6 @@ all: $(DIRS) for d in $(DIRS); do $(MAKE) -C $$d || exit $$?; done clean: $(DIRS) - $(RM) $(APP_OUTPUT_DIR)/logs.sqlite3 - $(RM) $(APP_OUTPUT_DIR)/*.aplx + $(RM) $(APP_OUTPUT_DIR)logs.sqlite3 + $(RM) $(APP_OUTPUT_DIR)*.aplx for d in $(DIRS); do $(MAKE) -C $$d clean || exit $$?; done From 7beb3fa92b94a690039922b0202c553c5cba9b1d Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 10 Dec 2025 12:22:56 +0000 Subject: [PATCH 04/17] remove C_LOG_DICT --- .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 4cc3d5f..ca85e5d 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -65,7 +65,6 @@ jobs: SPINN_COMMON_INSTALL_DIR: ${{ github.workspace }}/spinn_common_install FEC_INSTALL_DIR: ${{ github.workspace }}/fec_install SPYNNAKER_INSTALL_DIR: ${{ github.workspace }}/spynnaker_install - C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3 CFLAGS: -fdiagnostics-color=always run: | make -C spinnaker_tools install @@ -78,7 +77,6 @@ jobs: - name: Build SpiNNaker C code globally env: SPINN_DIRS: ${{ github.workspace }}/spinn_dirs - C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3 CFLAGS: -fdiagnostics-color=always run: | make -C spinnaker_tools install @@ -93,7 +91,6 @@ jobs: working-directory: c_models env: SPINN_DIRS: ${{ github.workspace }}/spinn_dirs - C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3 CFLAGS: -fdiagnostics-color=always # To be added: Documentation building From 6e0b88f7f70c732b70524c96e0b132b35e273e1c Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 17 Dec 2025 09:12:19 +0000 Subject: [PATCH 05/17] set SPYNNAKER_INSTALL_DIR by location --- c_models/makefiles/extra.mk | 7 ++++++- c_models/makefiles/extra_neuron.mk | 6 +++++- c_models/makefiles/extra_synapse.mk | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/c_models/makefiles/extra.mk b/c_models/makefiles/extra.mk index 78e57f8..38ee0ec 100644 --- a/c_models/makefiles/extra.mk +++ b/c_models/makefiles/extra.mk @@ -1,4 +1,9 @@ -SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/spynnaker_install, $(error SPYNNAKER_INSTALL_DIR or SPINN_DIRS is not set. Please define SPYNNAKER_INSTALL_DIR or SPINN_DIRS)))) +ifndef SPYNNAKER_INSTALL_DIR: + CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) + # assume parallel clone + SPYNNAKER_INSTALL_DIR := $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling) +endif + # Work out the top-level project folder MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) diff --git a/c_models/makefiles/extra_neuron.mk b/c_models/makefiles/extra_neuron.mk index f5de65c..271a017 100644 --- a/c_models/makefiles/extra_neuron.mk +++ b/c_models/makefiles/extra_neuron.mk @@ -1,4 +1,8 @@ -SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/spynnaker_install, $(error SPYNNAKER_INSTALL_DIR or SPINN_DIRS is not set. Please define SPYNNAKER_INSTALL_DIR or SPINN_DIRS)))) +ifndef SPYNNAKER_INSTALL_DIR: + CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) + # assume parallel clone + SPYNNAKER_INSTALL_DIR := $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling) +endif # Work out the top-level project folder MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) diff --git a/c_models/makefiles/extra_synapse.mk b/c_models/makefiles/extra_synapse.mk index c6e5773..43f49f5 100644 --- a/c_models/makefiles/extra_synapse.mk +++ b/c_models/makefiles/extra_synapse.mk @@ -1,4 +1,8 @@ -SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/spynnaker_install, $(error SPYNNAKER_INSTALL_DIR or SPINN_DIRS is not set. Please define SPYNNAKER_INSTALL_DIR or SPINN_DIRS)))) +ifndef SPYNNAKER_INSTALL_DIR: + CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) + # assume parallel clone + SPYNNAKER_INSTALL_DIR := $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling) +endif # Work out the top-level project folder MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) From dd8e50eaba9ec3fb904c6b2bb841589b9fd892ad Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 17 Dec 2025 11:06:50 +0000 Subject: [PATCH 06/17] remove environment variable SPINN_DIRS --- .github/workflows/c_actions.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 4cc3d5f..f45ce73 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -77,7 +77,6 @@ jobs: - name: Build SpiNNaker C code globally env: - SPINN_DIRS: ${{ github.workspace }}/spinn_dirs C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3 CFLAGS: -fdiagnostics-color=always run: | @@ -92,7 +91,6 @@ jobs: run: make clean; make SPYNNAKER_DEBUG=DEBUG working-directory: c_models env: - SPINN_DIRS: ${{ github.workspace }}/spinn_dirs C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3 CFLAGS: -fdiagnostics-color=always From 6455ba6086577f59f43ef1165969bad640710b85 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 18 Dec 2025 12:09:12 +0000 Subject: [PATCH 07/17] SpiNNFrontEndCommon/c_common install --- .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 f45ce73..826e4e3 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -70,8 +70,7 @@ jobs: run: | make -C spinnaker_tools install make -C spinn_common install - make -C SpiNNFrontEndCommon/c_common - make -C sPyNNaker/neural_modelling + make -C SpiNNFrontEndCommon/c_common install make -C sPyNNaker/neural_modelling install make -C c_models From 961a7e0f5efdb89a576f66a72bf924dc2d29534d Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 18 Dec 2025 12:09:54 +0000 Subject: [PATCH 08/17] (if $(FEC_INSTALL_DIR) --- c_models/makefiles/extra.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/c_models/makefiles/extra.mk b/c_models/makefiles/extra.mk index 38ee0ec..df546f9 100644 --- a/c_models/makefiles/extra.mk +++ b/c_models/makefiles/extra.mk @@ -4,7 +4,6 @@ ifndef SPYNNAKER_INSTALL_DIR: SPYNNAKER_INSTALL_DIR := $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling) endif - # Work out the top-level project folder MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) EXTRA_MODELS_DIR := $(abspath $(dir $(MAKEFILE_PATH))/../../)/ From c88e7a614bd7dec6323368f86e67b7009ec4e403 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 18 Dec 2025 12:27:03 +0000 Subject: [PATCH 09/17] if $(SPYNNAKER_INSTALL_DIR) --- c_models/makefiles/extra.mk | 7 ++----- c_models/makefiles/extra_neuron.mk | 7 ++----- c_models/makefiles/extra_synapse.mk | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/c_models/makefiles/extra.mk b/c_models/makefiles/extra.mk index df546f9..5af4af7 100644 --- a/c_models/makefiles/extra.mk +++ b/c_models/makefiles/extra.mk @@ -1,8 +1,5 @@ -ifndef SPYNNAKER_INSTALL_DIR: - CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) - # assume parallel clone - SPYNNAKER_INSTALL_DIR := $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling) -endif +CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) +SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), (abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) # Work out the top-level project folder MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) diff --git a/c_models/makefiles/extra_neuron.mk b/c_models/makefiles/extra_neuron.mk index 271a017..318180f 100644 --- a/c_models/makefiles/extra_neuron.mk +++ b/c_models/makefiles/extra_neuron.mk @@ -1,8 +1,5 @@ -ifndef SPYNNAKER_INSTALL_DIR: - CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) - # assume parallel clone - SPYNNAKER_INSTALL_DIR := $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling) -endif +CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) +SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), (abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) # Work out the top-level project folder MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) diff --git a/c_models/makefiles/extra_synapse.mk b/c_models/makefiles/extra_synapse.mk index 43f49f5..9fbbf55 100644 --- a/c_models/makefiles/extra_synapse.mk +++ b/c_models/makefiles/extra_synapse.mk @@ -1,8 +1,5 @@ -ifndef SPYNNAKER_INSTALL_DIR: - CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) - # assume parallel clone - SPYNNAKER_INSTALL_DIR := $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling) -endif +CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) +SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), (abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) # Work out the top-level project folder MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) From c54280511b421e706f2cd1fdb47d6fd05b091848 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 19 Dec 2025 10:38:04 +0000 Subject: [PATCH 10/17] no local/global build --- .github/workflows/c_actions.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 826e4e3..76576da 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -74,22 +74,11 @@ jobs: make -C sPyNNaker/neural_modelling install make -C c_models - - name: Build SpiNNaker C code globally - env: - C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3 - CFLAGS: -fdiagnostics-color=always - run: | - make -C spinnaker_tools install - make -C spinn_common install - make -C SpiNNFrontEndCommon/c_common - make -C sPyNNaker/neural_modelling - make -C sPyNNaker/neural_modelling install - make -C c_models - - name: Build C code in DEBUG mode run: make clean; make SPYNNAKER_DEBUG=DEBUG working-directory: c_models env: + SPYNNAKER_INSTALL_DIR: ${{ github.workspace }}/spynnaker_install C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3 CFLAGS: -fdiagnostics-color=always From 5250b6417f69d1717952d518662f54a4422b8e2e Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 19 Dec 2025 10:40:24 +0000 Subject: [PATCH 11/17] more environment variables --- .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 76576da..40fe8ae 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -78,6 +78,9 @@ jobs: run: make clean; make SPYNNAKER_DEBUG=DEBUG working-directory: c_models env: + SPINN_INSTALL_DIR: ${{ github.workspace }}/spinnaker_tools_install + SPINN_COMMON_INSTALL_DIR: ${{ github.workspace }}/spinn_common_install + FEC_INSTALL_DIR: ${{ github.workspace }}/fec_install SPYNNAKER_INSTALL_DIR: ${{ github.workspace }}/spynnaker_install C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3 CFLAGS: -fdiagnostics-color=always From baf17c025a4100e0af170b3472d7daee30338e69 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 19 Dec 2025 13:26:19 +0000 Subject: [PATCH 12/17] $(abspath --- c_models/makefiles/extra.mk | 2 +- c_models/makefiles/extra_neuron.mk | 2 +- c_models/makefiles/extra_synapse.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/c_models/makefiles/extra.mk b/c_models/makefiles/extra.mk index 5af4af7..200f91a 100644 --- a/c_models/makefiles/extra.mk +++ b/c_models/makefiles/extra.mk @@ -1,5 +1,5 @@ CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) -SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), (abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) +SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) # Work out the top-level project folder MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) diff --git a/c_models/makefiles/extra_neuron.mk b/c_models/makefiles/extra_neuron.mk index 318180f..cda546d 100644 --- a/c_models/makefiles/extra_neuron.mk +++ b/c_models/makefiles/extra_neuron.mk @@ -1,5 +1,5 @@ CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) -SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), (abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) +SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) # Work out the top-level project folder MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) diff --git a/c_models/makefiles/extra_synapse.mk b/c_models/makefiles/extra_synapse.mk index 9fbbf55..35a5101 100644 --- a/c_models/makefiles/extra_synapse.mk +++ b/c_models/makefiles/extra_synapse.mk @@ -1,5 +1,5 @@ CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) -SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), (abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) +SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) # Work out the top-level project folder MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) From 4ab936503dd82c2ee7e270fca941f9c09ac1c5e5 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Mon, 29 Dec 2025 09:07:56 +0000 Subject: [PATCH 13/17] clean modified_src --- c_models/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/c_models/Makefile b/c_models/Makefile index 268c16d..a3f97dd 100644 --- a/c_models/Makefile +++ b/c_models/Makefile @@ -10,4 +10,5 @@ all: $(DIRS) clean: $(DIRS) $(RM) $(APP_OUTPUT_DIR)logs.sqlite3 $(RM) $(APP_OUTPUT_DIR)*.aplx + $(RM) -r $(CURRENT_DIR)/modified_src for d in $(DIRS); do $(MAKE) -C $$d clean || exit $$?; done From 651bbd71d03f2faaacb4d7d18e59b70b8bcd619d Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Mon, 29 Dec 2025 09:08:16 +0000 Subject: [PATCH 14/17] ignore aplx and logs.sqlite3 --- python_models8/model_binaries/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 python_models8/model_binaries/.gitignore diff --git a/python_models8/model_binaries/.gitignore b/python_models8/model_binaries/.gitignore new file mode 100644 index 0000000..4e14d8b --- /dev/null +++ b/python_models8/model_binaries/.gitignore @@ -0,0 +1,2 @@ +*.aplx +logs.sqlite3 \ No newline at end of file From a9d888f979a4958bfc526a4bb032c7e17bd542a5 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 30 Dec 2025 06:45:06 +0000 Subject: [PATCH 15/17] remove confusing slash --- c_models/makefiles/extra.mk | 2 +- c_models/makefiles/extra_neuron.mk | 2 +- c_models/makefiles/extra_synapse.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/c_models/makefiles/extra.mk b/c_models/makefiles/extra.mk index 847e992..da2d051 100644 --- a/c_models/makefiles/extra.mk +++ b/c_models/makefiles/extra.mk @@ -1,4 +1,4 @@ -CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) +CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) # Work out the top-level project folder diff --git a/c_models/makefiles/extra_neuron.mk b/c_models/makefiles/extra_neuron.mk index 2149df3..52494a5 100644 --- a/c_models/makefiles/extra_neuron.mk +++ b/c_models/makefiles/extra_neuron.mk @@ -1,4 +1,4 @@ -CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) +CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) # Work out the top-level project folder diff --git a/c_models/makefiles/extra_synapse.mk b/c_models/makefiles/extra_synapse.mk index 85d2b24..fd8817c 100644 --- a/c_models/makefiles/extra_synapse.mk +++ b/c_models/makefiles/extra_synapse.mk @@ -1,4 +1,4 @@ -CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/) +CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling))) # Work out the top-level project folder From 0ed001cbe1b57a55ddaf3d711bae03162755ed96 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 7 Jan 2026 16:27:52 +0000 Subject: [PATCH 16/17] [options.package_data] logs*.sqlite3 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 4018f34..7a5b5e9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,7 +54,7 @@ include = [options.package_data] * = *.aplx - *.dict + logs*.sqlite3 [options.extras_require] From ebf57811e7dc2ec75b6c88cf286acf158747f9a7 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 8 Jan 2026 10:34:39 +0000 Subject: [PATCH 17/17] logs*.sqlite3 --- c_models/Makefile | 2 +- python_models8/model_binaries/.gitignore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/c_models/Makefile b/c_models/Makefile index a3f97dd..1a9b5ba 100644 --- a/c_models/Makefile +++ b/c_models/Makefile @@ -8,7 +8,7 @@ all: $(DIRS) for d in $(DIRS); do $(MAKE) -C $$d || exit $$?; done clean: $(DIRS) - $(RM) $(APP_OUTPUT_DIR)logs.sqlite3 + $(RM) $(APP_OUTPUT_DIR)logs*.sqlite3 $(RM) $(APP_OUTPUT_DIR)*.aplx $(RM) -r $(CURRENT_DIR)/modified_src for d in $(DIRS); do $(MAKE) -C $$d clean || exit $$?; done diff --git a/python_models8/model_binaries/.gitignore b/python_models8/model_binaries/.gitignore index 4e14d8b..06d3c95 100644 --- a/python_models8/model_binaries/.gitignore +++ b/python_models8/model_binaries/.gitignore @@ -1,2 +1,2 @@ *.aplx -logs.sqlite3 \ No newline at end of file +logs*.sqlite3 \ No newline at end of file