Skip to content

Commit 8e6a1bb

Browse files
authored
Merge pull request #323 from SpiNNakerManchester/clean
Clean
2 parents bb7bea6 + e71f9f5 commit 8e6a1bb

18 files changed

Lines changed: 118 additions & 59 deletions

File tree

.github/workflows/c_actions.yml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,12 @@ jobs:
4545
echo "SPINN_INSTALL_DIR=${GITHUB_WORKSPACE}/spinnaker_tools_install" >> $GITHUB_ENV
4646
echo "SPINN_COMMON_INSTALL_DIR=${GITHUB_WORKSPACE}/spinn_common_install" >> $GITHUB_ENV
4747
echo "FEC_INSTALL_DIR=${GITHUB_WORKSPACE}/fec_install" >> $GITHUB_ENV
48-
echo "C_LOGS_DICT=$PWD/logs.sqlite3" >> $GITHUB_ENV
4948
5049
- name: Build C dependencies
5150
run: |
5251
make -C spinnaker_tools install
5352
make -C spinn_common install
54-
make -C SpiNNFrontEndCommon/c_common
53+
make -C SpiNNFrontEndCommon/c_common install
5554
5655
- name: Build Example code
5756
run: make
@@ -71,21 +70,18 @@ jobs:
7170
uses: actions/upload-artifact@v4
7271
with:
7372
name: fec_binaries
74-
path: SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries/*.aplx
73+
path: |
74+
SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries/*.aplx
75+
SpiNNFrontEndCommon/spinn_front_end_common/common_model_binaries/logs*.sqlite3
7576
retention-days: 5
7677

7778
- name: Upload test_extra_monitor binaries
7879
uses: actions/upload-artifact@v4
7980
with:
8081
name: test_extra_monitor_binary
81-
path: gfe_integration_tests/test_extra_monitor/*.aplx
82-
retention-days: 5
83-
84-
- name: Upload log.sqlite3s
85-
uses: actions/upload-artifact@v4
86-
with:
87-
name: logs.sqlite3
88-
path: logs.sqlite3
82+
path: |
83+
gfe_integration_tests/test_extra_monitor/*.aplx
84+
gfe_integration_tests/test_extra_monitor/logs*.aplx
8985
retention-days: 5
9086

9187
test:
@@ -122,12 +118,6 @@ jobs:
122118
name: test_extra_monitor_binary
123119
path: external_binaries
124120

125-
- name: Download logs.sqlite3
126-
uses: actions/download-artifact@v5
127-
with:
128-
name: logs.sqlite3
129-
path: external_binaries
130-
131121
- name: Append cfg
132122
# Doing this in the prepare action ended with a different path
133123
run: |

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ __pycache__
1818
**/Debug/
1919
*.dict
2020
/.mypy_cache/
21+
*/logs*.sqlite3

gfe_examples/Conways/partitioned_example_a_no_vis_no_buffer/Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# If FEC_INSTALL_DIR is not defined, this is an error!
16-
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/fec_install, $(error FEC_INSTALL_DIR or SPINN_DIRS is not set. Please define FEC_INSTALL_DIR or SPINN_DIRS))))
15+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
16+
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../../SpiNNFrontEndCommon/c_common/front_end_common_lib)))
1717

1818
APP = conways_cell
1919
SOURCES = conways_cell.c
2020

21-
APP_OUTPUT_DIR := $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))/
21+
APP_OUTPUT_DIR := $(CUR_DIR)/
22+
# key for the database in this APP_OUTPUT_DIR
23+
DATABASE_KEY = W
2224

2325
include $(FEC_INSTALL_DIR)/make/fec.mk
26+
27+
clean:
28+
${RM} $(APP_OUTPUT_DIR)logs*.sqlite3 $(APP_OUTPUT_DIR)*.aplx
29+
$(RM) -r $(CUR_DIR)/build

gfe_examples/Conways/partitioned_example_b_no_vis_buffer/Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# If FEC_INSTALL_DIR is not defined, this is an error!
16-
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/fec_install, $(error FEC_INSTALL_DIR or SPINN_DIRS is not set. Please define FEC_INSTALL_DIR or SPINN_DIRS))))
15+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
16+
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../../SpiNNFrontEndCommon/c_common/front_end_common_lib)))
1717

1818
APP = conways_cell
1919
SOURCES = conways_cell.c
2020

21-
APP_OUTPUT_DIR := $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))/
21+
APP_OUTPUT_DIR := $(CUR_DIR)/
22+
# key for the database in this APP_OUTPUT_DIR
23+
DATABASE_KEY = V
2224

2325
include $(FEC_INSTALL_DIR)/make/fec.mk
26+
27+
clean:
28+
${RM} $(APP_OUTPUT_DIR)logs*.sqlite3 $(APP_OUTPUT_DIR)*.aplx
29+
$(RM) -r $(CUR_DIR)/build

gfe_examples/hello_world/Makefile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,20 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# If FEC_INSTALL_DIR is not defined, this is an error!
16-
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/fec_install, $(error FEC_INSTALL_DIR or SPINN_DIRS is not set. Please define FEC_INSTALL_DIR or SPINN_DIRS))))
15+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
16+
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../SpiNNFrontEndCommon/c_common/front_end_common_lib)))
1717

1818
APP = hello_world
1919
SOURCES = hello_world.c
2020

21-
APP_OUTPUT_DIR := $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))/
21+
APP_OUTPUT_DIR := $(CUR_DIR)/
22+
# key for the database in this APP_OUTPUT_DIR
23+
DATABASE_KEY = H
2224

2325
include $(FEC_INSTALL_DIR)/make/fec.mk
26+
27+
clean:
28+
${RM} $(APP_OUTPUT_DIR)logs*.sqlite3 $(APP_OUTPUT_DIR)*.aplx
29+
$(RM) -r $(CUR_DIR)/build
30+
31+

gfe_examples/hello_world_untimed/Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# If FEC_INSTALL_DIR is not defined, this is an error!
16-
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/fec_install, $(error FEC_INSTALL_DIR or SPINN_DIRS is not set. Please define FEC_INSTALL_DIR or SPINN_DIRS))))
15+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
16+
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../SpiNNFrontEndCommon/c_common/front_end_common_lib)))
1717

1818
APP = hello_world
1919
SOURCES = hello_world.c
2020

21-
APP_OUTPUT_DIR := $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))/
21+
APP_OUTPUT_DIR := $(CUR_DIR)/
22+
# key for the database in this APP_OUTPUT_DIR
23+
DATABASE_KEY = U
2224

2325
include $(FEC_INSTALL_DIR)/make/fec.mk
26+
27+
clean:
28+
${RM} $(APP_OUTPUT_DIR)logs*.sqlite3 $(APP_OUTPUT_DIR)*.aplx
29+
$(RM) -r $(CUR_DIR)/build

gfe_examples/live_io/Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# If FEC_INSTALL_DIR is not defined, this is an error!
16-
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/fec_install, $(error FEC_INSTALL_DIR or SPINN_DIRS is not set. Please define FEC_INSTALL_DIR or SPINN_DIRS))))
15+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
16+
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../SpiNNFrontEndCommon/c_common/front_end_common_lib)))
1717

1818
APP = live_io
1919
SOURCES = live_io.c
2020

21-
APP_OUTPUT_DIR := $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))/
21+
APP_OUTPUT_DIR := $(CUR_DIR)/
22+
# key for the database in this APP_OUTPUT_DIR
23+
DATABASE_KEY = L
2224

2325
include $(FEC_INSTALL_DIR)/make/fec.mk
26+
27+
clean:
28+
${RM} $(APP_OUTPUT_DIR)logs*.sqlite3 $(APP_OUTPUT_DIR)*.aplx
29+
$(RM) -r $(CUR_DIR)/build

gfe_examples/sync_test/Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# If FEC_INSTALL_DIR is not defined, this is an error!
16-
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/fec_install, $(error FEC_INSTALL_DIR or SPINN_DIRS is not set. Please define FEC_INSTALL_DIR or SPINN_DIRS))))
15+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
16+
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../SpiNNFrontEndCommon/c_common/front_end_common_lib)))
1717

1818
APP = sync_test
1919
SOURCES = sync_test.c
2020

21-
APP_OUTPUT_DIR := $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))/
21+
APP_OUTPUT_DIR := $(CUR_DIR)/
22+
# key for the database in this APP_OUTPUT_DIR
23+
DATABASE_KEY = Y
2224

2325
include $(FEC_INSTALL_DIR)/make/fec.mk
26+
27+
clean:
28+
${RM} $(APP_OUTPUT_DIR)logs*.sqlite3 $(APP_OUTPUT_DIR)*.aplx
29+
$(RM) -r $(CUR_DIR)/build

gfe_examples/template/Makefile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,22 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# If FEC_INSTALL_DIR is not defined, this is an error!
16-
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/fec_install, $(error FEC_INSTALL_DIR or SPINN_DIRS is not set. Please define FEC_INSTALL_DIR or SPINN_DIRS))))
15+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
16+
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../SpiNNFrontEndCommon/c_common/front_end_common_lib)))
1717

1818
# TODO: Rename to suit your application
1919
APP = c_template_vertex
2020

2121
# TODO: Replace with your source code files
2222
SOURCES = c_template_vertex.c
2323

24-
APP_OUTPUT_DIR := $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))/
24+
APP_OUTPUT_DIR := $(CUR_DIR)/
25+
# key for the database in this APP_OUTPUT_DIR
26+
# Users copying this should change the Q to a lower case character
27+
DATABASE_KEY = Q
2528

2629
include $(FEC_INSTALL_DIR)/make/fec.mk
30+
31+
clean:
32+
${RM} $(APP_OUTPUT_DIR)logs*.sqlite3 $(APP_OUTPUT_DIR)*.aplx
33+
$(RM) -r $(CUR_DIR)/build

gfe_integration_tests/sdram_edge_tests/common/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# If FEC_INSTALL_DIR is not defined, this is an error!
16-
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(if $(SPINN_DIRS), $(SPINN_DIRS)/fec_install, $(error FEC_INSTALL_DIR or SPINN_DIRS is not set. Please define FEC_INSTALL_DIR or SPINN_DIRS))))
15+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
16+
FEC_INSTALL_DIR := $(strip $(if $(FEC_INSTALL_DIR), $(FEC_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../../SpiNNFrontEndCommon/c_common/front_end_common_lib)))
1717

1818
APP = sdram
1919
SOURCES = sdram.c
2020

2121
APP_OUTPUT_DIR := $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))/
22+
# key for the database in this APP_OUTPUT_DIR
23+
DATABASE_KEY = E
2224

2325
include $(FEC_INSTALL_DIR)/make/fec.mk
26+
27+
clean:
28+
${RM} $(APP_OUTPUT_DIR)logs*.sqlite3 $(APP_OUTPUT_DIR)*.aplx
29+
$(RM) -r $(APP_OUTPUT_DIR)/build

0 commit comments

Comments
 (0)