Skip to content

Commit aecadc0

Browse files
Christian-BChristian-B
authored
Merge pull request #127 from SpiNNakerManchester/clean
Clean
2 parents e716e5f + ebf5781 commit aecadc0

7 files changed

Lines changed: 30 additions & 22 deletions

File tree

‎.github/workflows/c_actions.yml‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,35 +65,22 @@ jobs:
6565
SPINN_COMMON_INSTALL_DIR: ${{ github.workspace }}/spinn_common_install
6666
FEC_INSTALL_DIR: ${{ github.workspace }}/fec_install
6767
SPYNNAKER_INSTALL_DIR: ${{ github.workspace }}/spynnaker_install
68-
C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3
6968
CFLAGS: -fdiagnostics-color=always
7069
run: |
7170
make -C spinnaker_tools install
7271
make -C spinn_common install
73-
make -C SpiNNFrontEndCommon/c_common
74-
make -C sPyNNaker/neural_modelling
75-
make -C sPyNNaker/neural_modelling install
76-
make -C c_models
77-
78-
- name: Build SpiNNaker C code globally
79-
env:
80-
SPINN_DIRS: ${{ github.workspace }}/spinn_dirs
81-
C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3
82-
CFLAGS: -fdiagnostics-color=always
83-
run: |
84-
make -C spinnaker_tools install
85-
make -C spinn_common install
86-
make -C SpiNNFrontEndCommon/c_common
87-
make -C sPyNNaker/neural_modelling
72+
make -C SpiNNFrontEndCommon/c_common install
8873
make -C sPyNNaker/neural_modelling install
8974
make -C c_models
9075
9176
- name: Build C code in DEBUG mode
9277
run: make clean; make SPYNNAKER_DEBUG=DEBUG
9378
working-directory: c_models
9479
env:
95-
SPINN_DIRS: ${{ github.workspace }}/spinn_dirs
96-
C_LOGS_DICT: ${{ github.workspace }}/python_models8/model_binaries/logs.sqlite3
80+
SPINN_INSTALL_DIR: ${{ github.workspace }}/spinnaker_tools_install
81+
SPINN_COMMON_INSTALL_DIR: ${{ github.workspace }}/spinn_common_install
82+
FEC_INSTALL_DIR: ${{ github.workspace }}/fec_install
83+
SPYNNAKER_INSTALL_DIR: ${{ github.workspace }}/spynnaker_install
9784
CFLAGS: -fdiagnostics-color=always
9885

9986
# To be added: Documentation building

‎c_models/Makefile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1+
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
2+
CURRENT_DIR := $(abspath $(dir $(MAKEFILE_PATH)))
3+
APP_OUTPUT_DIR := $(CURRENT_DIR)/../python_models8/model_binaries/
4+
15
DIRS = makefiles
26

37
all: $(DIRS)
48
for d in $(DIRS); do $(MAKE) -C $$d || exit $$?; done
59

610
clean: $(DIRS)
11+
$(RM) $(APP_OUTPUT_DIR)logs*.sqlite3
12+
$(RM) $(APP_OUTPUT_DIR)*.aplx
13+
$(RM) -r $(CURRENT_DIR)/modified_src
714
for d in $(DIRS); do $(MAKE) -C $$d clean || exit $$?; done

‎c_models/makefiles/extra.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
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))))
1+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
2+
SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling)))
23

34
# Work out the top-level project folder
45
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
@@ -9,6 +10,9 @@ BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/
910

1011
# This is where the output .aplx files will go
1112
APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/
13+
# key for the database in this APP_OUTPUT_DIR
14+
# If you change APP_OUTPUT_DIR please use a lower case letter
15+
DATABASE_KEY = N
1216

1317
# This is where the extra source files are located
1418
EXTRA_SRC_DIR := $(EXTRA_MODELS_DIR)c_models/src

‎c_models/makefiles/extra_neuron.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
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))))
1+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
2+
SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling)))
23

34
# Work out the top-level project folder
45
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
@@ -9,6 +10,9 @@ BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/
910

1011
# This is where the output .aplx files will go
1112
APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/
13+
# key for the database in this APP_OUTPUT_DIR
14+
# If you change APP_OUTPUT_DIR please use a lower case letter
15+
DATABASE_KEY = N
1216

1317
# This is where the extra source files are located
1418
EXTRA_SRC_DIR := $(EXTRA_MODELS_DIR)c_models/src

‎c_models/makefiles/extra_synapse.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
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))))
1+
CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
2+
SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling)))
23

34
# Work out the top-level project folder
45
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
@@ -9,6 +10,9 @@ BUILD_DIR := $(EXTRA_MODELS_DIR)c_models/build/$(APP)/
910

1011
# This is where the output .aplx files will go
1112
APP_OUTPUT_DIR := $(EXTRA_MODELS_DIR)python_models8/model_binaries/
13+
# key for the database in this APP_OUTPUT_DIR
14+
# If you change APP_OUTPUT_DIR please use a lower case letter
15+
DATABASE_KEY = N
1216

1317
# This is where the extra source files are located
1418
EXTRA_SRC_DIR := $(EXTRA_MODELS_DIR)c_models/src

‎python_models8/model_binaries/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.aplx
2+
logs*.sqlite3

‎setup.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ include =
5454
[options.package_data]
5555
* =
5656
*.aplx
57-
*.dict
57+
logs*.sqlite3
5858

5959

6060
[options.extras_require]

0 commit comments

Comments
 (0)