Skip to content

Commit 8dfe5d8

Browse files
committed
Merge branch 'main' into user-guide-ToC
2 parents 653b914 + 03e2e77 commit 8dfe5d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+554
-1848
lines changed

.github/workflows/rpe_test.yml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ on:
66
- '*'
77
branches:
88
- '*'
9+
- '*/**'
910
pull_request:
1011

1112
concurrency:
1213
group: ${{ github.workflow }}-${{ github.ref }}
1314
cancel-in-progress: true
1415

1516
jobs:
16-
build:
17+
test:
1718
strategy:
1819
fail-fast: false
1920
matrix:
@@ -22,6 +23,7 @@ jobs:
2223
- ubuntu-22.04 # This is CentOS 7 under the hood
2324
- macos-12
2425
- windows-latest
26+
2527
runs-on: ${{ matrix.os }}
2628
env:
2729
MODE: ${{ matrix.os }}
@@ -70,16 +72,28 @@ jobs:
7072
node --version
7173
python3 -V
7274
73-
- name: Install packages ${{ matrix.os }}
75+
- name: Install Dep. packages Linux latest & windows & MacOS
7476
if: ${{ matrix.os != 'ubuntu-22.04' }}
7577
run: |
76-
npm install
77-
python3 -m pip install -r requirements.txt
78+
npm install
79+
python3 -m pip install -r requirements.txt
80+
npx playwright install --with-deps
81+
82+
- name: Unit Pytest Linux latest & windows & MacOS
83+
if: ${{ matrix.os != 'ubuntu-22.04' }}
84+
run: python3 -m pytest
85+
86+
- name: Unit Jtest Linux latest & windows & MacOS
87+
if: ${{ matrix.os != 'ubuntu-22.04' }}
88+
run: npm test
89+
90+
# - name: E2E Playwright tests on Linux latest & MacOS
91+
# if: ${{ matrix.os == 'ubuntu-latest' }}
92+
# run: npm run compile && xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npx playwright test
7893

7994
- name: Run ESLint only on ubuntu-latest
8095
if: ${{ matrix.os == 'ubuntu-latest' }}
81-
run: |
82-
npx eslint src/
96+
run: npx eslint src/
8397

8498
- name: Install packages CentOS 7 & Run pytest & frontend test
8599
if: ${{ matrix.os == 'ubuntu-22.04' }}
@@ -95,24 +109,16 @@ jobs:
95109
python3 -m pytest
96110
npm test
97111
98-
- name: Run pytest on ${{ matrix.os }}
99-
if: ${{ matrix.os != 'ubuntu-22.04' }}
100-
run: python3 -m pytest
101-
102-
- name: Run frontend unit test on ${{ matrix.os }}
103-
if: ${{ matrix.os != 'ubuntu-22.04' }}
104-
run: |
105-
npm test
106-
107112
publish:
108-
needs: build
113+
needs: test
109114
strategy:
110115
fail-fast: false
111116
matrix:
112117
os:
113118
- ubuntu-22.04 # This is CentOS 7 under the hood
114119
- macos-12
115120
- windows-latest
121+
116122
runs-on: ${{ matrix.os }}
117123
permissions:
118124
contents: write

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,7 @@ coverage/
5656
venv/
5757
ENV/
5858
env/
59+
/test-results/
60+
/playwright-report/
61+
/blob-report/
62+
/playwright/.cache/

backend/api/peripherals.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,19 @@ def get_schema(cls, peripheral_type) -> Type:
118118
elif peripheral_type == PeripheralType.FPGA_COMPLEX:
119119
return FpgaComplexSchema
120120
else:
121-
return PeripheralSchema
121+
return DefaultPeripheralSchema
122122

123123
@classmethod
124124
def create_schema(cls, peripheral_type):
125125
schema_ctor = cls.get_schema(peripheral_type)
126126
return schema_ctor()
127127

128+
class DummyOutputSchema(Schema):
129+
pass
130+
131+
class DefaultPeripheralSchema(PeripheralSchema):
132+
output = fields.Nested(DummyOutputSchema, data_key="consumption")
133+
128134
class SpiSchema(PeripheralSchema):
129135
enable = fields.Bool()
130136
usage = fields.Enum(Peripherals_Usage, by_value=True)
@@ -190,9 +196,6 @@ class MemorySchema(PeripheralSchema):
190196
width = fields.Int()
191197
output = fields.Nested(MemoryOutputSchema, data_key="consumption")
192198

193-
class DummyOutputSchema(Schema):
194-
pass
195-
196199
class ChannelOutputSchema(Schema):
197200
calculated_bandwidth = fields.Number()
198201
noc_power = fields.Number()

backend/etc/device.xml

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

backend/etc/devices/mpw1/acpu.json

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

backend/etc/devices/mpw1/bcpu.json

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

backend/etc/devices/mpw1/bram.json

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

backend/etc/devices/mpw1/clocking.json

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

backend/etc/devices/mpw1/ddr.json

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

backend/etc/devices/mpw1/dsp.json

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

0 commit comments

Comments
 (0)