Skip to content

[microTVM][Zephyr] Fix board names #8998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
areusch merged 3 commits into from
Sep 14, 2021
Merged

[microTVM][Zephyr] Fix board names #8998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc2dc98
fix board names
mehrdadh Sep 13, 2021
c7768f0
fix base_box test
mehrdadh Sep 14, 2021
dbeb030
fix tutorial
mehrdadh Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/microtvm/reference-vm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ $ ./base-box-tool.py --provider virtualbox build zephyr

For example:
```base
$ ./base-box-tool.py --provider virtualbox test --microtvm-board=stm32f746xx_disco zephyr
$ ./base-box-tool.py --provider virtualbox test --microtvm-board=stm32f746g_disco zephyr
```

This command does the following for the specified provider:
Expand Down
2 changes: 1 addition & 1 deletion apps/microtvm/reference-vm/base-box-tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
),
"zephyr": (
"nucleo_f746zg",
"stm32f746xx_disco",
"stm32f746g_disco",
"nrf5340dk_nrf5340_cpuapp",
"mps2_an521",
),
Expand Down
2 changes: 1 addition & 1 deletion apps/microtvm/reference-vm/zephyr/base-box/base_box_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ board=$1

pytest tests/micro/zephyr/test_zephyr.py --zephyr-board=${board}

if [ $board == "stm32f746xx" ]; then
if [ $board == "stm32f746g_disco" ] || [ $board == "nucleo_f746zg" ]; then
echo "NOTE: skipped test_zephyr_aot.py on $board -- known failure"
else
pytest tests/micro/zephyr/test_zephyr_aot.py --zephyr-board=${board}
Expand Down
6 changes: 3 additions & 3 deletions apps/microtvm/reference-vm/zephyr/base-box/test-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"stm32f746xx_nucleo": {
"nucleo_f746zg": {
"vid_hex": "0483",
"pid_hex": "374b"
},
"stm32f746xx_disco": {
"stm32f746g_disco": {
"vid_hex": "0483",
"pid_hex": "374b"
},
"nrf5340dk": {
"nrf5340dk_nrf5340_cpuapp": {
"vid_hex": "1366",
"pid_hex": "1055"
},
Expand Down
4 changes: 2 additions & 2 deletions apps/microtvm/zephyr/template_project/microtvm_api_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
"board": "nrf5340dk_nrf5340_cpuapp",
"model": "nrf5340dk",
},
"stm32f746xx_disco": {
"board": "stm32f746xx_disco",
"stm32f746g_disco": {
"board": "stm32f746g_disco",
"model": "stm32f746xx",
},
"nucleo_f746zg": {
Expand Down
4 changes: 2 additions & 2 deletions tests/micro/zephyr/test_zephyr_aot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ def test_tflite(temp_dir, board, west_cmd, tvm_debug):
"qemu_x86",
"mps2_an521",
"nrf5340dk_nrf5340_cpuapp",
"stm32l4r5zi_nucleo",
"zynq_mp_r5",
"nucleo_l4r5zi",
"qemu_cortex_r5",
]:
pytest.skip(msg="Model does not fit.")

Expand Down
2 changes: 1 addition & 1 deletion tutorials/micro/micro_reference_vm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
.. code-block:: bash

$ cd apps/microtvm/reference-vm/zephyr
$ poetry run python3 ../../../../tests/micro/qemu/test_zephyr.py --zephyr-board=stm32f746xx
$ poetry run python3 ../../../../tests/micro/qemu/test_zephyr.py --zephyr-board=stm32f746g_disco

If you do not have physical hardware attached, but wish to run the tests using the
local QEMU emulator running within the VM, run the following commands instead:
Expand Down