From 6e0b88f7f70c732b70524c96e0b132b35e273e1c Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 17 Dec 2025 09:12:19 +0000 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] (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 5/7] 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 6/7] 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 7/7] 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