Skip to content

Commit d139d5f

Browse files
committed
Try global install here too
1 parent 201299f commit d139d5f

5 files changed

Lines changed: 22 additions & 26 deletions

File tree

.github/workflows/c_actions.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,6 @@ jobs:
3939
with:
4040
python-version: 3.12
4141

42-
- name: Set environment variables
43-
run: |
44-
echo "SPINN_INSTALL_DIR=$PWD/spinnaker_tools_install" >> $GITHUB_ENV
45-
echo "SPINN_COMMON_INSTALL_DIR=$PWD/spinn_common_install" >> $GITHUB_ENV
46-
echo "FEC_INSTALL_DIR=$PWD/fec_install" >> $GITHUB_ENV
47-
echo "SPYNNAKER_INSTALL_DIR=$PWD/spynnaker_install" >> $GITHUB_ENV
48-
echo "C_LOGS_DICT=$PWD/spynnaker/pyNN/model_binaries/logs.sqlite3" >> $GITHUB_ENV
49-
50-
5142
- name: Checkout SpiNNaker C Dependencies
5243
uses: SpiNNakerManchester/SupportScripts/actions/install-spinn-deps@main
5344
with:
@@ -68,24 +59,39 @@ jobs:
6859
with:
6960
base-dir: c_models/src
7061

71-
- name: Build SpiNNaker C dependencies
62+
- name: Build SpiNNaker C code
63+
env:
64+
SPINN_INSTALL_DIR: ${{ github.workspace }}/spinnaker_tools_install
65+
SPINN_COMMON_INSTALL_DIR: ${{ github.workspace }}/spinn_common_install
66+
FEC_INSTALL_DIR: ${{ github.workspace }}/fec_install
67+
SPYNNAKER_INSTALL_DIR: ${{ github.workspace }}/spynnaker_install
68+
C_LOGS_DICT: ${{ github.workspace }}/spynnaker/pyNN/model_binaries/logs.sqlite3
69+
CFLAGS: -fdiagnostics-color=always
7270
run: |
7371
make -C spinnaker_tools install
7472
make -C spinn_common install
7573
make -C SpiNNFrontEndCommon/c_common
7674
make -C sPyNNaker/neural_modelling
7775
make -C sPyNNaker/neural_modelling install
7876
79-
- name: Build C code
80-
run: make
81-
working-directory: c_models
77+
- name: Build SpiNNaker C code globally
8278
env:
79+
SPINN_DIRS: ${{ github.workspace }}/spinn_dirs
80+
C_LOGS_DICT: ${{ github.workspace }}/spynnaker/pyNN/model_binaries/logs.sqlite3
8381
CFLAGS: -fdiagnostics-color=always
82+
run: |
83+
make -C spinnaker_tools install
84+
make -C spinn_common install
85+
make -C SpiNNFrontEndCommon/c_common
86+
make -C sPyNNaker/neural_modelling
87+
make -C sPyNNaker/neural_modelling install
8488
8589
- name: Build C code in DEBUG mode
8690
run: make clean; make SPYNNAKER_DEBUG=DEBUG
8791
working-directory: c_models
8892
env:
93+
SPINN_DIRS: ${{ github.workspace }}/spinn_dirs
94+
C_LOGS_DICT: ${{ github.workspace }}/spynnaker/pyNN/model_binaries/logs.sqlite3
8995
CFLAGS: -fdiagnostics-color=always
9096

9197
# To be added: Documentation building

c_models/makefiles/Makefile.common

Lines changed: 0 additions & 4 deletions
This file was deleted.

c_models/makefiles/extra.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
ifndef SPYNNAKER_INSTALL_DIR
2-
$(error SPYNNAKER_INSTALL_DIR is not set. Please define SPYNNAKER_INSTALL_DIR (possibly by running "source setup" in the neural_modelling folder within the sPyNNaker source folder))
3-
endif
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))))
42

53
# Work out the top-level project folder
64
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))

c_models/makefiles/extra_neuron.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
ifndef SPYNNAKER_INSTALL_DIR
2-
$(error SPYNNAKER_INSTALL_DIR is not set. Please define SPYNNAKER_INSTALL_DIR (possibly by running "source setup" in the neural_modelling folder within the sPyNNaker source folder))
3-
endif
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))))
42

53
# Work out the top-level project folder
64
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))

c_models/makefiles/extra_synapse.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
ifndef SPYNNAKER_INSTALL_DIR
2-
$(error SPYNNAKER_INSTALL_DIR is not set. Please define SPYNNAKER_INSTALL_DIR (possibly by running "source setup" in the neural_modelling folder within the sPyNNaker source folder))
3-
endif
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))))
42

53
# Work out the top-level project folder
64
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))

0 commit comments

Comments
 (0)