[tvm] branch main updated: rename aot_demo to aot_standalone_demo for clarity vs. host-driven aot (#11723)

[me...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mehrdadh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git


The following commit(s) were added to refs/heads/main by this push:
     new d0cbde0c99 rename aot_demo to aot_standalone_demo for clarity vs. host-driven aot (#11723)
d0cbde0c99 is described below

commit d0cbde0c9930e2be1c860fab7af4b415ff793022
Author: Alan MacDonald <al...@users.noreply.github.com>
AuthorDate: Wed Jun 15 13:14:42 2022 -0700

    rename aot_demo to aot_standalone_demo for clarity vs. host-driven aot (#11723)
---
 apps/microtvm/zephyr/template_project/microtvm_api_server.py        | 2 +-
 .../template_project/src/{aot_demo => aot_standalone_demo}/main.c   | 0
 .../src/{aot_demo => aot_standalone_demo}/zephyr_uart.c             | 0
 .../src/{aot_demo => aot_standalone_demo}/zephyr_uart.h             | 6 +++---
 cmake/modules/Zephyr.cmake                                          | 4 ++--
 tests/micro/zephyr/test_utils.py                                    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/microtvm/zephyr/template_project/microtvm_api_server.py b/apps/microtvm/zephyr/template_project/microtvm_api_server.py
index dad4cdf9d6..4ed3614e7a 100644
--- a/apps/microtvm/zephyr/template_project/microtvm_api_server.py
+++ b/apps/microtvm/zephyr/template_project/microtvm_api_server.py
@@ -421,7 +421,7 @@ class Handler(server.ProjectAPIHandler):
 
     CRT_LIBS_BY_PROJECT_TYPE = {
         "host_driven": "microtvm_rpc_server microtvm_rpc_common aot_executor_module aot_executor common",
-        "aot_demo": "memory microtvm_rpc_common common",
+        "aot_standalone_demo": "memory microtvm_rpc_common common",
     }
 
     def _get_platform_version(self, zephyr_base: str) -> float:
diff --git a/apps/microtvm/zephyr/template_project/src/aot_demo/main.c b/apps/microtvm/zephyr/template_project/src/aot_standalone_demo/main.c
similarity index 100%
rename from apps/microtvm/zephyr/template_project/src/aot_demo/main.c
rename to apps/microtvm/zephyr/template_project/src/aot_standalone_demo/main.c
diff --git a/apps/microtvm/zephyr/template_project/src/aot_demo/zephyr_uart.c b/apps/microtvm/zephyr/template_project/src/aot_standalone_demo/zephyr_uart.c
similarity index 100%
rename from apps/microtvm/zephyr/template_project/src/aot_demo/zephyr_uart.c
rename to apps/microtvm/zephyr/template_project/src/aot_standalone_demo/zephyr_uart.c
diff --git a/apps/microtvm/zephyr/template_project/src/aot_demo/zephyr_uart.h b/apps/microtvm/zephyr/template_project/src/aot_standalone_demo/zephyr_uart.h
similarity index 87%
rename from apps/microtvm/zephyr/template_project/src/aot_demo/zephyr_uart.h
rename to apps/microtvm/zephyr/template_project/src/aot_standalone_demo/zephyr_uart.h
index f24ade734c..771cb490d0 100644
--- a/apps/microtvm/zephyr/template_project/src/aot_demo/zephyr_uart.h
+++ b/apps/microtvm/zephyr/template_project/src/aot_standalone_demo/zephyr_uart.h
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef TVM_APPS_MICROTVM_ZEPHYR_AOT_DEMO_INCLUDE_ZEPHYR_UART_H_
-#define TVM_APPS_MICROTVM_ZEPHYR_AOT_DEMO_INCLUDE_ZEPHYR_UART_H_
+#ifndef TVM_APPS_MICROTVM_ZEPHYR_AOT_STANDALONE_DEMO_ZEPHYR_UART_H_
+#define TVM_APPS_MICROTVM_ZEPHYR_AOT_STANDALONE_DEMO_ZEPHYR_UART_H_
 
 #include <stdint.h>
 
@@ -47,4 +47,4 @@ uint32_t TVMPlatformWriteSerial(const char* data, uint32_t size);
  */
 void TVMPlatformUARTInit();
 
-#endif /* TVM_APPS_MICROTVM_ZEPHYR_AOT_DEMO_INCLUDE_ZEPHYR_UART_H_ */
+#endif /* TVM_APPS_MICROTVM_ZEPHYR_AOT_STANDALONE_DEMO_ZEPHYR_UART_H_ */
diff --git a/cmake/modules/Zephyr.cmake b/cmake/modules/Zephyr.cmake
index a1cafce29d..b88d6c63bd 100644
--- a/cmake/modules/Zephyr.cmake
+++ b/cmake/modules/Zephyr.cmake
@@ -23,8 +23,8 @@ if(USE_MICRO)
       "apps/microtvm/zephyr/template_project microtvm_api_server.py -> zephyr"
       "apps/microtvm/zephyr/template_project boards.json -> zephyr"
       "apps/microtvm/zephyr/template_project CMakeLists.txt.template -> zephyr"
-      "apps/microtvm/zephyr/template_project/src/aot_demo *.c -> zephyr/src/aot_demo"
-      "apps/microtvm/zephyr/template_project/src/aot_demo *.h -> zephyr/src/aot_demo"
+      "apps/microtvm/zephyr/template_project/src/aot_standalone_demo *.c -> zephyr/src/aot_standalone_demo"
+      "apps/microtvm/zephyr/template_project/src/aot_standalone_demo *.h -> zephyr/src/aot_standalone_demo"
       "apps/microtvm/zephyr/template_project/src/host_driven *.c -> zephyr/src/host_driven"
       "apps/microtvm/zephyr/template_project/qemu-hack * -> zephyr/qemu-hack"
       "apps/microtvm/zephyr/template_project/crt_config *.h -> zephyr/crt_config"
diff --git a/tests/micro/zephyr/test_utils.py b/tests/micro/zephyr/test_utils.py
index 4fd3e39fd1..52f0eef363 100644
--- a/tests/micro/zephyr/test_utils.py
+++ b/tests/micro/zephyr/test_utils.py
@@ -87,7 +87,7 @@ def build_project(
         workspace_size = mlf_extract_workspace_size_bytes(model_tar_path)
         project_options = {
             "extra_files_tar": extra_files_tar,
-            "project_type": "aot_demo",
+            "project_type": "aot_standalone_demo",
             "west_cmd": west_cmd,
             "verbose": bool(build_config.get("debug")),
             "zephyr_board": zephyr_board,