From e8d3b36eb98d708720a77c0ed94bf5b328b4d7cf Mon Sep 17 00:00:00 2001
From: dianjixz <18637716021@163.com>
Date: Tue, 7 Jan 2025 11:57:54 +0800
Subject: [PATCH] [update] ax-samples && [update] version

---
 .gitignore                                                 | 3 ++-
 ext_components/ax-samples/SConstruct                       | 5 ++---
 .../main_depth_anything/src/EngineWrapper.cpp              | 2 +-
 projects/llm_framework/main_depth_anything/src/main.cpp    | 2 +-
 projects/llm_framework/main_yolo/src/EngineWrapper.cpp     | 2 +-
 projects/llm_framework/main_yolo/src/main.cpp              | 2 +-
 projects/llm_framework/tools/llm_pack.py                   | 7 ++-----
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb65ec9..ccff5c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .vscode/settings.json
 projects/core135_llm_product_test_ui
-projects/imx678_test
\ No newline at end of file
+projects/imx678_test
+projects/test_*
\ No newline at end of file
diff --git a/ext_components/ax-samples/SConstruct b/ext_components/ax-samples/SConstruct
index 1408b20..efc85c9 100644
--- a/ext_components/ax-samples/SConstruct
+++ b/ext_components/ax-samples/SConstruct
@@ -29,14 +29,13 @@ if "CONFIG_AX_SAMPLES_ENABLED" in os.environ:
     LINK_SEARCH_PATH = []
 
     INCLUDE += [
-        os.path.join(env["GIT_REPO_LISTS"]["ax-samples"]["path"], "examples/base"),
-        os.path.join(env["GIT_REPO_LISTS"]["ax-samples"]["path"], "examples/utilities"),
+        os.path.join(env["GIT_REPO_LISTS"]["ax-samples"]["path"], "examples"),
     ]
     if "CONFIG_AX_620E_MSP_ENABLED" in os.environ:
         INCLUDE += [
             os.path.join(
                 env["GIT_REPO_LISTS"]["ax-samples"]["path"],
-                "examples/ax620e/middleware",
+                "examples/ax620e",
             )
         ]
 
diff --git a/projects/llm_framework/main_depth_anything/src/EngineWrapper.cpp b/projects/llm_framework/main_depth_anything/src/EngineWrapper.cpp
index 0be1c9f..09d7067 100644
--- a/projects/llm_framework/main_depth_anything/src/EngineWrapper.cpp
+++ b/projects/llm_framework/main_depth_anything/src/EngineWrapper.cpp
@@ -7,7 +7,7 @@
  * written consent of Axera Semiconductor (Ningbo) Co., Ltd.
  *
  **************************************************************************************************/
-#include "detection.hpp"
+#include "base/detection.hpp"
 #define UNUSE_STRUCT_OBJECT
 #include "EngineWrapper.hpp"
 #include "utils/io.hpp"
diff --git a/projects/llm_framework/main_depth_anything/src/main.cpp b/projects/llm_framework/main_depth_anything/src/main.cpp
index 98e88f8..4e9369c 100644
--- a/projects/llm_framework/main_depth_anything/src/main.cpp
+++ b/projects/llm_framework/main_depth_anything/src/main.cpp
@@ -5,7 +5,7 @@
  */
 #include "StackFlow.h"
 #include "EngineWrapper.hpp"
-#include "common.hpp"
+#include "base/common.hpp"
 #include <ax_sys_api.h>
 #include <sys/stat.h>
 #include <fstream>
diff --git a/projects/llm_framework/main_yolo/src/EngineWrapper.cpp b/projects/llm_framework/main_yolo/src/EngineWrapper.cpp
index eb13513..035e259 100644
--- a/projects/llm_framework/main_yolo/src/EngineWrapper.cpp
+++ b/projects/llm_framework/main_yolo/src/EngineWrapper.cpp
@@ -7,7 +7,7 @@
  * written consent of Axera Semiconductor (Ningbo) Co., Ltd.
  *
  **************************************************************************************************/
-#include "detection.hpp"
+#include "base/detection.hpp"
 #define UNUSE_STRUCT_OBJECT
 #include "EngineWrapper.hpp"
 #include "utils/io.hpp"
diff --git a/projects/llm_framework/main_yolo/src/main.cpp b/projects/llm_framework/main_yolo/src/main.cpp
index 7a5dbdc..50cbaa6 100644
--- a/projects/llm_framework/main_yolo/src/main.cpp
+++ b/projects/llm_framework/main_yolo/src/main.cpp
@@ -5,7 +5,7 @@
  */
 #include "StackFlow.h"
 #include "EngineWrapper.hpp"
-#include "common.hpp"
+#include "base/common.hpp"
 #include <ax_sys_api.h>
 #include <sys/stat.h>
 #include <fstream>
diff --git a/projects/llm_framework/tools/llm_pack.py b/projects/llm_framework/tools/llm_pack.py
index 6fd510c..88c7a90 100755
--- a/projects/llm_framework/tools/llm_pack.py
+++ b/projects/llm_framework/tools/llm_pack.py
@@ -225,10 +225,7 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1'):
     with open(os.path.join(deb_folder, f'lib/systemd/system/{package_name}.service'),'w') as f:
         f.write(f'[Unit]\n')
         f.write(f'Description={package_name} Service\n')
-        if package_name == 'llm-sys':
-            f.write(f'After=ubus.service\n')
-            f.write(f'Requires=ubus.service\n')
-        else:
+        if package_name != 'llm-sys':
             f.write(f'After=llm-sys.service\n')
             f.write(f'Requires=llm-sys.service\n')
         f.write(f'\n')
@@ -259,7 +256,7 @@ if __name__ == "__main__":
         os.system('rm ./*.deb m5stack_* -rf')
         exit(0)
 
-    version = '1.3'
+    version = '1.4'
     data_version = '0.2'
     src_folder = '../dist'
     revision = 'm5stack1'