Skip to content

Commit 722e0c0

Browse files
authored
Hotfix github workflow for neureka and neureka-v2 (#22)
Fixes: - wrong cache keys and paths - missing install of python packages - missing python dependencies
1 parent fab5942 commit 722e0c0

File tree

5 files changed

+32
-14
lines changed

5 files changed

+32
-14
lines changed

.github/workflows/cache-gvsoc.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
repository: lukamac/gvsoc
1313
ref: siracusa-mac
1414
submodules: recursive
15+
path: gvsoc
1516

1617
- name: Install Apt Packages
1718
run: |
@@ -31,13 +32,15 @@ jobs:
3132
python-version: '3.10'
3233

3334
- name: Install Python Packages
34-
run: pip install -r requirements.txt -r gapy/requirements.txt -r core/requirements.txt
35+
run: pip install -r gvsoc/requirements.txt -r gvsoc/gapy/requirements.txt -r gvsoc/core/requirements.txt
3536

3637
- name: Build
37-
run: make all TARGETS=siracusa
38+
run: |
39+
cd gvsoc
40+
make all TARGETS=siracusa
3841
3942
- name: Cache
4043
uses: actions/cache/save@v4
4144
with:
42-
path: install
45+
path: gvsoc/install
4346
key: gvsoc

.github/workflows/cache-pulp-sdk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/cache/restore@v4
3838
with:
3939
path: toolchain/gnu
40-
key: gnu-toolchain
40+
key: toolchain-gnu
4141
fail-on-cache-miss: true
4242

4343
- name: Build

.github/workflows/test-neureka.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,21 @@ jobs:
1414
with:
1515
python-version: '3.10'
1616
cache: 'pip'
17-
cache-dependency-path:
18-
- pulp-nnx/test/requirements.txt
19-
- pulp-nnx/test/workflow-requirements/requirements-run-pulp-sdk.txt
17+
cache-dependency-path: |
18+
pulp-nnx/test/requirements.txt
19+
pulp-nnx/test/workflow-requirements/requirements-run-pulp-sdk.txt
20+
21+
- name: Install Python Packages
22+
run: |
23+
pip install \
24+
-r pulp-nnx/test/requirements.txt \
25+
-r pulp-nnx/test/workflow-requirements/requirements-run-pulp-sdk.txt
2026
2127
- name: Restore Cached Gnu Toolchain
2228
uses: actions/cache/restore@v4
2329
with:
2430
path: toolchain/gnu
25-
key: gnu-toolchain
31+
key: toolchain-gnu
2632
fail-on-cache-miss: true
2733

2834
- name: Restore Cached PULP-SDK

.github/workflows/test-neureka_v2.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,15 @@ jobs:
1414
with:
1515
python-version: '3.10'
1616
cache: 'pip'
17-
cache-dependency-path:
18-
- pulp-nnx/test/requirements.txt
19-
- pulp-nnx/test/workflow-requirements/requirements-run-gvsoc.txt
17+
cache-dependency-path: |
18+
pulp-nnx/test/requirements.txt
19+
pulp-nnx/test/workflow-requirements/requirements-run-gvsoc.txt
20+
21+
- name: Install Python Packages
22+
run: |
23+
pip install \
24+
-r pulp-nnx/test/requirements.txt \
25+
-r pulp-nnx/test/workflow-requirements/requirements-run-gvsoc.txt
2026
2127
- name: Restore Cached Gnu Toolchain
2228
uses: actions/cache/restore@v4
@@ -35,14 +41,14 @@ jobs:
3541
- name: Restore Cached GVSoC
3642
uses: actions/cache/restore@v4
3743
with:
38-
path: install
44+
path: gvsoc/install
3945
key: gvsoc
4046
fail-on-cache-miss: true
4147

4248
- name: Run test
4349
run: |
4450
export PULP_SDK_HOME=$GITHUB_WORKSPACE/pulp-sdk
4551
export TOOLCHAIN_GNU_INSTALL_DIR=$GITHUB_WORKSPACE/toolchain/gnu
46-
export GVSOC=$GITHUB_WORKSPACE/gvsoc/bin/gvsoc
52+
export GVSOC=$GITHUB_WORKSPACE/gvsoc/install/bin/gvsoc
4753
cd pulp-nnx/test
4854
pytest test.py -T tests -R -A neureka_v2 --build-flow=cmake --wmem=mram

test/workflow-requirements/requirements-run-gvsoc.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
argcomplete
2+
six
3+
pexpect
4+
pyelftools
15
prettytable
26
rich
3-
pexpect

0 commit comments

Comments
 (0)