From 73790909d0558cea4d051c2314570536ebc8f017 Mon Sep 17 00:00:00 2001 From: fwx1157193 Date: Wed, 14 Sep 2022 09:26:41 +0800 Subject: [PATCH 1/4] update engine ai_engine Signed-off-by: bwx1095090 --- README.md | 8 ++-- README_zh.md | 8 ++-- bundle.json | 6 +-- services/client/BUILD.gn | 6 +-- services/client/CMakeLists.txt | 34 ++++++++--------- .../asr/keyword_spotting/BUILD.gn | 36 +++++++++--------- .../cv/image_classification/BUILD.gn | 32 ++++++++-------- services/client/client_executor/BUILD.gn | 6 +-- .../client/communication_adapter/BUILD.gn | 6 +-- services/common/CMakeLists.txt | 28 +++++++------- .../common/platform/dl_operation/BUILD.gn | 2 +- services/common/platform/event/BUILD.gn | 4 +- services/common/platform/lock/BUILD.gn | 2 +- .../platform/os_wrapper/audio_loader/BUILD.gn | 18 ++++----- .../platform/os_wrapper/feature/BUILD.gn | 8 ++-- .../common/platform/os_wrapper/ipc/BUILD.gn | 2 +- .../common/platform/os_wrapper/utils/BUILD.gn | 14 +++---- services/common/platform/semaphore/BUILD.gn | 4 +- services/common/platform/threadpool/BUILD.gn | 6 +-- services/common/platform/time/BUILD.gn | 2 +- .../common/protocol/data_channel/BUILD.gn | 2 +- services/common/utils/encdec/BUILD.gn | 4 +- services/common/utils/file_operation/BUILD.gn | 4 +- services/server/BUILD.gn | 12 +++--- services/server/CMakeLists.txt | 32 ++++++++-------- .../server/communication_adapter/BUILD.gn | 6 +-- services/server/plugin/BUILD.gn | 2 +- .../plugin/asr/keyword_spotting/BUILD.gn | 38 +++++++++---------- .../plugin/cv/image_classification/BUILD.gn | 36 +++++++++--------- services/server/plugin_manager/BUILD.gn | 8 ++-- services/server/server_executor/BUILD.gn | 8 ++-- test/BUILD.gn | 2 +- test/CMakeLists.txt | 16 ++++---- test/common/BUILD.gn | 16 ++++---- .../dl_operation/dl_operation_so/BUILD.gn | 2 +- test/function/BUILD.gn | 24 ++++++------ test/function/death_callback/BUILD.gn | 10 ++--- test/performance/BUILD.gn | 24 ++++++------ test/sample/BUILD.gn | 16 ++++---- 39 files changed, 247 insertions(+), 247 deletions(-) diff --git a/README.md b/README.md index c6b1d94..5afc0f7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI ## Directory Structure ``` -/foundation/ai/engine # Home directory of the AI subsystem +/foundation/ai/ai_engine # Home directory of the AI subsystem ├── interfaces │ └── kits # External APIs of the AI subsystem └── services @@ -51,7 +51,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI 1. Compile the AI subsystem. - The source code for lightweight AI framework is available at **//foundation/ai/engine/services**. + The source code for lightweight AI framework is available at **//foundation/ai/ai_engine/services**. The compilation procedure is as follows: @@ -78,7 +78,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI 2. Develop the plug-in, with keyword spotting as an example. - Directory: //foundation/ai/engine/services/server/plugin/asr/keyword\_spotting + Directory: //foundation/ai/ai_engine/services/server/plugin/asr/keyword\_spotting **Note**: The plug-in must implement the **IPlugin** and **IPluginCallback** APIs provided by the server. @@ -138,7 +138,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI 3. Develop the SDK, with keyword spotting as an example. - Directory: //foundation/ai/engine/services/client/algorithm\_sdk/asr/keyword\_spotting + Directory: //foundation/ai/ai_engine/services/client/algorithm\_sdk/asr/keyword\_spotting Keyword spotting SDK: diff --git a/README_zh.md b/README_zh.md index d6047be..63bc981 100644 --- a/README_zh.md +++ b/README_zh.md @@ -17,7 +17,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 ## 目录 ``` -/foundation/ai/engine # AI子系统主目录 +/foundation/ai/ai_engine # AI子系统主目录 ├── interfaces │ └── kits # AI子系统对外接口 └── services @@ -51,7 +51,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 1. **AI业务子系统编译** - 轻量级AI引擎框架模块，代码所在路径：//foundation/ai/engine/services + 轻量级AI引擎框架模块，代码所在路径：//foundation/ai/ai_engine/services 编译指令如下： @@ -78,7 +78,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 2. **插件开发**（以唤醒词识别为例） - 位置：//foundation/ai/engine/services/server/plugin/asr/keyword\_spotting + 位置：//foundation/ai/ai_engine/services/server/plugin/asr/keyword\_spotting **注意**：插件需要实现server提供的IPlugin接口和IPluginCallback接口 @@ -138,7 +138,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 3. **插件SDK开发**（以唤醒词识别kws\_sdk为例） - 位置：//foundation/ai/engine/services/client/algorithm\_sdk/asr/keyword\_spotting + 位置：//foundation/ai/ai_engine/services/client/algorithm\_sdk/asr/keyword\_spotting 唤醒词识别SDK： diff --git a/bundle.json b/bundle.json index 21af631..dff2888 100644 --- a/bundle.json +++ b/bundle.json @@ -5,7 +5,7 @@ "license": "Apache License 2.0", "pubiishAs": "code-segment", "segment": { - "destPath": "foundation/ai/engine" + "destPath": "foundation/ai/ai_engine" }, "dirs": {}, "scripts": {}, @@ -29,9 +29,9 @@ ] }, "build": { - "sub_component": [ "//foundation/ai/engine/services:ai" ], + "sub_component": [ "//foundation/ai/ai_engine/services:ai" ], "inner_kits": [], - "test": [ "//foundation/ai/engine/test" ] + "test": [ "//foundation/ai/ai_engine/test" ] } } } diff --git a/services/client/BUILD.gn b/services/client/BUILD.gn index 729cb7f..de0f818 100755 --- a/services/client/BUILD.gn +++ b/services/client/BUILD.gn @@ -11,14 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/ai/engine/services/ai_plugin_config.gni") +import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") shared_library("ai_client") { deps = [ "client_executor", "communication_adapter:ai_communication_adapter", - "//foundation/ai/engine/services/common/platform/os_wrapper/ipc:aie_ipc", - "//foundation/ai/engine/services/common/platform/threadpool:threadpool", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/ipc:aie_ipc", + "//foundation/ai/ai_engine/services/common/platform/threadpool:threadpool", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] } diff --git a/services/client/CMakeLists.txt b/services/client/CMakeLists.txt index 7e2ba73..d500022 100644 --- a/services/client/CMakeLists.txt +++ b/services/client/CMakeLists.txt @@ -4,23 +4,23 @@ project(engine) set(CMAKE_CXX_STANDARD 14) include_directories(../../../../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog) -include_directories(../../../../../foundation/ai/engine/interfaces) -include_directories(../../../../../foundation/ai/engine/interfaces/kits) -include_directories(../../../../../foundation/ai/engine/interfaces/kits/asr/keyword_spotting) -include_directories(../../../../../foundation/ai/engine/interfaces/kits/cv/image_classification) -include_directories(../../../../../foundation/ai/engine/services/client) -include_directories(../../../../../foundation/ai/engine/services/client/algorithm_sdk/asr/keyword_spotting/include) -include_directories(../../../../../foundation/ai/engine/services/client/client_executor/include) -include_directories(../../../../../foundation/ai/engine/services/common) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/utils) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/plugin_config) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/retcode_inner) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/struct_definition) -include_directories(../../../../../foundation/ai/engine/services/common/utils) -include_directories(../../../../../foundation/ai/engine/services/common/utils/constants) -include_directories(../../../../../foundation/ai/engine/services/common/utils/encdec/include) -include_directories(../../../../../foundation/ai/engine/services/common/utils/log) +include_directories(../../../../../foundation/ai/ai_engine/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/asr/keyword_spotting) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/cv/image_classification) +include_directories(../../../../../foundation/ai/ai_engine/services/client) +include_directories(../../../../../foundation/ai/ai_engine/services/client/algorithm_sdk/asr/keyword_spotting/include) +include_directories(../../../../../foundation/ai/ai_engine/services/client/client_executor/include) +include_directories(../../../../../foundation/ai/ai_engine/services/common) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/plugin_config) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/retcode_inner) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/struct_definition) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/constants) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/encdec/include) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/log) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr) include_directories(../../../../../third_party/bounds_checking_function/include) diff --git a/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn b/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn index f187802..97811e1 100644 --- a/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn +++ b/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn @@ -22,27 +22,27 @@ static_library("keyword_spotting_sdk") { "source/pcm_iterator.cpp", ] include_dirs = [ - "//foundation/ai/engine/interfaces/kits", - "//foundation/ai/engine/interfaces/kits/asr/keyword_spotting", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/client/algorithm_sdk/asr/keyword_spotting/include", - "//foundation/ai/engine/services/client/client_executor/include", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/engine/services/common/protocol/plugin_config", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/protocol/struct_definition", - "//foundation/ai/engine/services/common/utils/constants", - "//foundation/ai/engine/services/common/utils/encdec/include", - "//foundation/ai/engine/services/common/utils/log", + "//foundation/ai/ai_engine/interfaces/kits", + "//foundation/ai/ai_engine/interfaces/kits/asr/keyword_spotting", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/client/algorithm_sdk/asr/keyword_spotting/include", + "//foundation/ai/ai_engine/services/client/client_executor/include", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/services/common/protocol/plugin_config", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/protocol/struct_definition", + "//foundation/ai/ai_engine/services/common/utils/constants", + "//foundation/ai/ai_engine/services/common/utils/encdec/include", + "//foundation/ai/ai_engine/services/common/utils/log", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:ai_client", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature:audio_features_sdk", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/engine/services/common/utils/encdec:encdec", + "//foundation/ai/ai_engine/services/client:ai_client", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature:audio_features_sdk", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", "//third_party/bounds_checking_function:libsec_shared", ] libs = [ "audio_features" ] diff --git a/services/client/algorithm_sdk/cv/image_classification/BUILD.gn b/services/client/algorithm_sdk/cv/image_classification/BUILD.gn index d48b6af..d170c66 100644 --- a/services/client/algorithm_sdk/cv/image_classification/BUILD.gn +++ b/services/client/algorithm_sdk/cv/image_classification/BUILD.gn @@ -22,25 +22,25 @@ static_library("image_classification_sdk") { include_dirs = [ "include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/interfaces/kits", - "//foundation/ai/engine/interfaces/kits/cv/image_classification", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/engine/services/client/client_executor/include", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/protocol/plugin_config", - "//foundation/ai/engine/services/common/protocol/struct_definition", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/utils/constants", - "//foundation/ai/engine/services/common/utils/encdec/include", - "//foundation/ai/engine/services/common/utils", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/interfaces/kits", + "//foundation/ai/ai_engine/interfaces/kits/cv/image_classification", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/services/client/client_executor/include", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/protocol/plugin_config", + "//foundation/ai/ai_engine/services/common/protocol/struct_definition", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/utils/constants", + "//foundation/ai/ai_engine/services/common/utils/encdec/include", + "//foundation/ai/ai_engine/services/common/utils", "//third_party/bounds_checking_function/include", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:ai_client", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/engine/services/common/utils/encdec:encdec", + "//foundation/ai/ai_engine/services/client:ai_client", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", ] } diff --git a/services/client/client_executor/BUILD.gn b/services/client/client_executor/BUILD.gn index f64f5e9..bd637b8 100755 --- a/services/client/client_executor/BUILD.gn +++ b/services/client/client_executor/BUILD.gn @@ -20,8 +20,8 @@ source_set("client_executor") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", ] } diff --git a/services/client/communication_adapter/BUILD.gn b/services/client/communication_adapter/BUILD.gn index a491b09..4e33bf1 100755 --- a/services/client/communication_adapter/BUILD.gn +++ b/services/client/communication_adapter/BUILD.gn @@ -21,9 +21,9 @@ source_set("ai_communication_adapter") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", diff --git a/services/common/CMakeLists.txt b/services/common/CMakeLists.txt index 78ce64a..956b485 100644 --- a/services/common/CMakeLists.txt +++ b/services/common/CMakeLists.txt @@ -9,20 +9,20 @@ include_directories(../../../../../base/hiviewdfx/hilog_lite/interfaces/native/k include_directories(../../../../../drivers/peripheral/audio/interfaces/include) include_directories(../../../../../drivers/peripheral/codec/interfaces/include) include_directories(../../../../../drivers/peripheral/format/interfaces/include) -include_directories(../../../../../foundation/ai/engine/interfaces) -include_directories(../../../../../foundation/ai/engine/interfaces/kits) -include_directories(../../../../../foundation/ai/engine/services/common) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include/codec) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/utils) -include_directories(../../../../../foundation/ai/engine/services/common/platform/utils) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/retcode_inner) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/struct_definition) -include_directories(../../../../../foundation/ai/engine/services/common/utils) -include_directories(../../../../../foundation/ai/engine/services/common/utils/encdec/include) -include_directories(../../../../../foundation/ai/engine/services/common/utils/log) -include_directories(../../../../../foundation/ai/engine/services/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/ai_engine/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits) +include_directories(../../../../../foundation/ai/ai_engine/services/common) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include/codec) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/retcode_inner) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/struct_definition) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/encdec/include) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/log) +include_directories(../../../../../foundation/ai/ai_engine/services/platform/os_wrapper/utils) include_directories(../../../../../foundation/multimedia/audio_lite/interfaces/kits) include_directories(../../../../../foundation/multimedia/hals/camera_lite) include_directories(../../../../../foundation/multimedia/utils/lite/hals) diff --git a/services/common/platform/dl_operation/BUILD.gn b/services/common/platform/dl_operation/BUILD.gn index 5759eed..b77f16f 100755 --- a/services/common/platform/dl_operation/BUILD.gn +++ b/services/common/platform/dl_operation/BUILD.gn @@ -18,6 +18,6 @@ source_set("dlOperation") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/services/common", ] } diff --git a/services/common/platform/event/BUILD.gn b/services/common/platform/event/BUILD.gn index 4967886..fa1e4d2 100755 --- a/services/common/platform/event/BUILD.gn +++ b/services/common/platform/event/BUILD.gn @@ -16,7 +16,7 @@ source_set("event") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", ] } diff --git a/services/common/platform/lock/BUILD.gn b/services/common/platform/lock/BUILD.gn index e03b651..69cd9b4 100755 --- a/services/common/platform/lock/BUILD.gn +++ b/services/common/platform/lock/BUILD.gn @@ -16,5 +16,5 @@ source_set("lock") { cflags = [ "-fPIC" ] cflags_cc = cflags - include_dirs = [ "//foundation/ai/engine/services/common" ] + include_dirs = [ "//foundation/ai/ai_engine/services/common" ] } diff --git a/services/common/platform/os_wrapper/audio_loader/BUILD.gn b/services/common/platform/os_wrapper/audio_loader/BUILD.gn index c32dac2..79e72c5 100755 --- a/services/common/platform/os_wrapper/audio_loader/BUILD.gn +++ b/services/common/platform/os_wrapper/audio_loader/BUILD.gn @@ -14,15 +14,15 @@ import("//build/lite/config/component/lite_component.gni") config("libaudio_common_config") { include_dirs = [ - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include", - "//foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include/codec", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/engine/services/common/platform/utils", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/utils", - "//foundation/ai/engine/services/common/utils/log", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include/codec", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/services/common/platform/utils", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/utils", + "//foundation/ai/ai_engine/services/common/utils/log", "//foundation/multimedia/audio_lite/interfaces/kits", "//foundation/multimedia/hals/camera_lite", "//foundation/multimedia/utils/lite/hals", diff --git a/services/common/platform/os_wrapper/feature/BUILD.gn b/services/common/platform/os_wrapper/feature/BUILD.gn index f673716..1cb7cc6 100644 --- a/services/common/platform/os_wrapper/feature/BUILD.gn +++ b/services/common/platform/os_wrapper/feature/BUILD.gn @@ -16,10 +16,10 @@ config("feature_config") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits/hilog", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/utils", - "//foundation/ai/engine/services/common/utils/log", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/utils", + "//foundation/ai/ai_engine/services/common/utils/log", "//third_party/bounds_checking_function/include", ] } diff --git a/services/common/platform/os_wrapper/ipc/BUILD.gn b/services/common/platform/os_wrapper/ipc/BUILD.gn index 0b3490e..b558132 100644 --- a/services/common/platform/os_wrapper/ipc/BUILD.gn +++ b/services/common/platform/os_wrapper/ipc/BUILD.gn @@ -17,7 +17,7 @@ source_set("aie_ipc") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/services/common", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//third_party/bounds_checking_function/include", ] diff --git a/services/common/platform/os_wrapper/utils/BUILD.gn b/services/common/platform/os_wrapper/utils/BUILD.gn index 667a985..e1793b7 100644 --- a/services/common/platform/os_wrapper/utils/BUILD.gn +++ b/services/common/platform/os_wrapper/utils/BUILD.gn @@ -14,13 +14,13 @@ import("//build/lite/config/component/lite_component.gni") config("os_wrapper_utils_config") { include_dirs = [ - "//foundation/ai/engine/interfaces/kits", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/protocol/struct_definition", - "//foundation/ai/engine/services/common/utils", - "//foundation/ai/engine/services/common/utils/encdec/include", - "//foundation/ai/engine/services/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/interfaces/kits", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/protocol/struct_definition", + "//foundation/ai/ai_engine/services/common/utils", + "//foundation/ai/ai_engine/services/common/utils/encdec/include", + "//foundation/ai/ai_engine/services/platform/os_wrapper/utils", ] } diff --git a/services/common/platform/semaphore/BUILD.gn b/services/common/platform/semaphore/BUILD.gn index e94e86b..ab9ac56 100755 --- a/services/common/platform/semaphore/BUILD.gn +++ b/services/common/platform/semaphore/BUILD.gn @@ -15,7 +15,7 @@ source_set("semaphore") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", ] } diff --git a/services/common/platform/threadpool/BUILD.gn b/services/common/platform/threadpool/BUILD.gn index fd0915c..e6dac23 100755 --- a/services/common/platform/threadpool/BUILD.gn +++ b/services/common/platform/threadpool/BUILD.gn @@ -20,9 +20,9 @@ source_set("threadpool") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", "//third_party/bounds_checking_function/include", ] - deps = [ "//foundation/ai/engine/services/common/platform/time:time" ] + deps = [ "//foundation/ai/ai_engine/services/common/platform/time:time" ] } diff --git a/services/common/platform/time/BUILD.gn b/services/common/platform/time/BUILD.gn index e958637..d63e51c 100755 --- a/services/common/platform/time/BUILD.gn +++ b/services/common/platform/time/BUILD.gn @@ -18,7 +18,7 @@ source_set("time") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/services/common", "//third_party/bounds_checking_function/include", ] } diff --git a/services/common/protocol/data_channel/BUILD.gn b/services/common/protocol/data_channel/BUILD.gn index d02c536..d5fc8f2 100755 --- a/services/common/protocol/data_channel/BUILD.gn +++ b/services/common/protocol/data_channel/BUILD.gn @@ -17,5 +17,5 @@ source_set("data_channel") { ] cflags = [ "-fPIC" ] cflags_cc = cflags - include_dirs = [ "//foundation/ai/engine/services/common" ] + include_dirs = [ "//foundation/ai/ai_engine/services/common" ] } diff --git a/services/common/utils/encdec/BUILD.gn b/services/common/utils/encdec/BUILD.gn index 167c1a9..d9ebdcb 100755 --- a/services/common/utils/encdec/BUILD.gn +++ b/services/common/utils/encdec/BUILD.gn @@ -20,8 +20,8 @@ source_set("encdec") { include_dirs = [ "include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", "//third_party/bounds_checking_function/include", ] } diff --git a/services/common/utils/file_operation/BUILD.gn b/services/common/utils/file_operation/BUILD.gn index b667577..942f8bd 100755 --- a/services/common/utils/file_operation/BUILD.gn +++ b/services/common/utils/file_operation/BUILD.gn @@ -17,7 +17,7 @@ source_set("fileOperation") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", ] } diff --git a/services/server/BUILD.gn b/services/server/BUILD.gn index e2cc61b..6a19814 100755 --- a/services/server/BUILD.gn +++ b/services/server/BUILD.gn @@ -31,12 +31,12 @@ lite_component("ai_server") { ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/engine/services/common/platform/event:event", - "//foundation/ai/engine/services/common/platform/lock:lock", - "//foundation/ai/engine/services/common/platform/os_wrapper/ipc:aie_ipc", - "//foundation/ai/engine/services/common/platform/semaphore:semaphore", - "//foundation/ai/engine/services/common/platform/threadpool:threadpool", + "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/ai_engine/services/common/platform/event:event", + "//foundation/ai/ai_engine/services/common/platform/lock:lock", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/ipc:aie_ipc", + "//foundation/ai/ai_engine/services/common/platform/semaphore:semaphore", + "//foundation/ai/ai_engine/services/common/platform/threadpool:threadpool", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] } diff --git a/services/server/CMakeLists.txt b/services/server/CMakeLists.txt index 36a847f..900889e 100644 --- a/services/server/CMakeLists.txt +++ b/services/server/CMakeLists.txt @@ -4,22 +4,22 @@ project(engine) set(CMAKE_CXX_STANDARD 14) include_directories(../../../../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog) -include_directories(../../../../../foundation/ai/engine/interfaces) -include_directories(../../../../../foundation/ai/engine/interfaces/kits) -include_directories(../../../../../foundation/ai/engine/interfaces/kits/asr) -include_directories(../../../../../foundation/ai/engine/interfaces/kits/cv/image_classification) -include_directories(../../../../../foundation/ai/engine/services/common) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/engine_hal/interfaces) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/utils) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/plugin_config) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/retcode_inner) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/struct_definition) -include_directories(../../../../../foundation/ai/engine/services/common/utils) -include_directories(../../../../../foundation/ai/engine/services/common/utils/encdec/include) -include_directories(../../../../../foundation/ai/engine/services/common/utils/log) -include_directories(../../../../../foundation/ai/engine/services/server) +include_directories(../../../../../foundation/ai/ai_engine/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/asr) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/cv/image_classification) +include_directories(../../../../../foundation/ai/ai_engine/services/common) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/engine_hal/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/plugin_config) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/retcode_inner) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/struct_definition) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/encdec/include) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/log) +include_directories(../../../../../foundation/ai/ai_engine/services/server) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry) diff --git a/services/server/communication_adapter/BUILD.gn b/services/server/communication_adapter/BUILD.gn index fa207f5..6b6166b 100755 --- a/services/server/communication_adapter/BUILD.gn +++ b/services/server/communication_adapter/BUILD.gn @@ -22,9 +22,9 @@ static_library("ai_communication_adapter") { "source/start_server.c", ] include_dirs = [ - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", diff --git a/services/server/plugin/BUILD.gn b/services/server/plugin/BUILD.gn index bd13f6d..c734610 100644 --- a/services/server/plugin/BUILD.gn +++ b/services/server/plugin/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/ai/engine/services/ai_plugin_config.gni") +import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") lite_component("plugin") { features = [ diff --git a/services/server/plugin/asr/keyword_spotting/BUILD.gn b/services/server/plugin/asr/keyword_spotting/BUILD.gn index ad9b785..014d460 100755 --- a/services/server/plugin/asr/keyword_spotting/BUILD.gn +++ b/services/server/plugin/asr/keyword_spotting/BUILD.gn @@ -28,20 +28,20 @@ lite_library("asr_keyword_spotting") { cflags_cc = cflags include_dirs = [ "include", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/interfaces/kits", - "//foundation/ai/engine/interfaces/kits/asr", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/utils/encdec/include", - "//foundation/ai/engine/services/common/platform/os_wrapper/engine_hal/interfaces", - "//foundation/ai/engine/services/common/platform/os_wrapper", - "//foundation/ai/engine/services/common/protocol/struct_definition", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/protocol/plugin_config", - "//foundation/ai/engine/services/common/utils/log", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/engine/services/server", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/interfaces/kits", + "//foundation/ai/ai_engine/interfaces/kits/asr", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/utils/encdec/include", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/engine_hal/interfaces", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper", + "//foundation/ai/ai_engine/services/common/protocol/struct_definition", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/protocol/plugin_config", + "//foundation/ai/ai_engine/services/common/utils/log", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/services/server", ] ldflags = [ "-lstdc++" ] ldflags += [ "-lnnie" ] @@ -51,11 +51,11 @@ lite_library("asr_keyword_spotting") { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//device/soc/hisilicon/common/hal/ai:engine_nnie_sdk", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature:norm_processor_dep", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature:slide_window_processor_dep", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/engine/services/common/utils/encdec:encdec", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature:norm_processor_dep", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature:slide_window_processor_dep", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", "//third_party/bounds_checking_function:libsec_shared", ] } diff --git a/services/server/plugin/cv/image_classification/BUILD.gn b/services/server/plugin/cv/image_classification/BUILD.gn index a2d8b29..e734b8a 100755 --- a/services/server/plugin/cv/image_classification/BUILD.gn +++ b/services/server/plugin/cv/image_classification/BUILD.gn @@ -24,21 +24,21 @@ lite_library("cv_image_classification") { cflags_cc = cflags include_dirs = [ "include", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/interfaces/kits", - "//foundation/ai/engine/interfaces/kits/cv/image_classification", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/platform/os_wrapper", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/engine/services/common/platform/os_wrapper/engine_hal/interfaces", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/engine/services/common/protocol/struct_definition", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/protocol/plugin_config", - "//foundation/ai/engine/services/common/utils", - "//foundation/ai/engine/services/common/utils/encdec/include", - "//foundation/ai/engine/services/common/utils/log", - "//foundation/ai/engine/services/server", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/interfaces/kits", + "//foundation/ai/ai_engine/interfaces/kits/cv/image_classification", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/engine_hal/interfaces", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/ai_engine/services/common/protocol/struct_definition", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/protocol/plugin_config", + "//foundation/ai/ai_engine/services/common/utils", + "//foundation/ai/ai_engine/services/common/utils/encdec/include", + "//foundation/ai/ai_engine/services/common/utils/log", + "//foundation/ai/ai_engine/services/server", ] ldflags = [ "-lstdc++" ] ldflags += [ "-lnnie_adapter" ] @@ -46,9 +46,9 @@ lite_library("cv_image_classification") { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//device/soc/hisilicon/common/hal/ai:engine_nnie_sdk", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/engine/services/common/utils/encdec:encdec", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", "//third_party/bounds_checking_function:libsec_shared", ] } diff --git a/services/server/plugin_manager/BUILD.gn b/services/server/plugin_manager/BUILD.gn index 0ab46df..de0f87c 100755 --- a/services/server/plugin_manager/BUILD.gn +++ b/services/server/plugin_manager/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/ai/engine/services/ai_plugin_config.gni") +import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") action("gen_etc_ini") { outputs = [ "${root_out_dir}/etc/ai_engine_plugin.ini" ] @@ -35,9 +35,9 @@ source_set("plugin_manager") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces/", - "//foundation/ai/engine/services/common/", - "//foundation/ai/engine/services/server/", + "//foundation/ai/ai_engine/interfaces/", + "//foundation/ai/ai_engine/services/common/", + "//foundation/ai/ai_engine/services/server/", "//third_party/bounds_checking_function/include", ] } diff --git a/services/server/server_executor/BUILD.gn b/services/server/server_executor/BUILD.gn index edbc731..88ee5ed 100755 --- a/services/server/server_executor/BUILD.gn +++ b/services/server/server_executor/BUILD.gn @@ -28,13 +28,13 @@ source_set("server_executor") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", ] } diff --git a/test/BUILD.gn b/test/BUILD.gn index 2d28e51..907d8f5 100755 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/ai/engine/services/ai_plugin_config.gni") +import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") lite_component("test") { features = [ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b63ba4e..4ff775c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,14 +4,14 @@ project(engine) set(CMAKE_CXX_STANDARD 14) include_directories(../../../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog) -include_directories(../../../../foundation/ai/engine/interfaces) -include_directories(../../../../foundation/ai/engine/services/client) -include_directories(../../../../foundation/ai/engine/services/common) -include_directories(../../../../foundation/ai/engine/services/server) -include_directories(../../../../foundation/ai/engine/test) -include_directories(../../../../foundation/ai/engine/test/common/dl_operation/dl_operation_so/include) -include_directories(../../../../foundation/ai/engine/test/performance) -include_directories(../../../../foundation/ai/engine/test/utils) +include_directories(../../../../foundation/ai/ai_engine/interfaces) +include_directories(../../../../foundation/ai/ai_engine/services/client) +include_directories(../../../../foundation/ai/ai_engine/services/common) +include_directories(../../../../foundation/ai/ai_engine/services/server) +include_directories(../../../../foundation/ai/ai_engine/test) +include_directories(../../../../foundation/ai/ai_engine/test/common/dl_operation/dl_operation_so/include) +include_directories(../../../../foundation/ai/ai_engine/test/performance) +include_directories(../../../../foundation/ai/ai_engine/test/utils) include_directories(../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry) include_directories(../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr) include_directories(../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry) diff --git a/test/common/BUILD.gn b/test/common/BUILD.gn index 03af586..23008a8 100755 --- a/test/common/BUILD.gn +++ b/test/common/BUILD.gn @@ -22,19 +22,19 @@ unittest("ai_test_common_door") { ] include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", "//third_party/googletest/googletest/include", "//third_party/googletest/googletest/src", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/engine/services/common/platform/event:event", - "//foundation/ai/engine/services/common/platform/semaphore:semaphore", - "//foundation/ai/engine/services/common/platform/threadpool:threadpool", - "//foundation/ai/engine/services/common/platform/time:time", - "//foundation/ai/engine/services/common/utils/encdec:encdec", + "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/ai_engine/services/common/platform/event:event", + "//foundation/ai/ai_engine/services/common/platform/semaphore:semaphore", + "//foundation/ai/ai_engine/services/common/platform/threadpool:threadpool", + "//foundation/ai/ai_engine/services/common/platform/time:time", + "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", ] sources = [ "dl_operation/dl_operation_test.cpp", diff --git a/test/common/dl_operation/dl_operation_so/BUILD.gn b/test/common/dl_operation/dl_operation_so/BUILD.gn index 2a8d7a2..2ea7ca4 100755 --- a/test/common/dl_operation/dl_operation_so/BUILD.gn +++ b/test/common/dl_operation/dl_operation_so/BUILD.gn @@ -17,6 +17,6 @@ shared_library("dlOperationSo") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/test/common/dl_operation/dl_operation_so/include", + "//foundation/ai/ai_engine/test/common/dl_operation/dl_operation_so/include", ] } diff --git a/test/function/BUILD.gn b/test/function/BUILD.gn index e831938..54c584e 100644 --- a/test/function/BUILD.gn +++ b/test/function/BUILD.gn @@ -22,11 +22,11 @@ unittest("ai_test_function_door") { ] include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", - "//foundation/ai/engine/test/utils", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", + "//foundation/ai/ai_engine/test/utils", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", @@ -37,13 +37,13 @@ unittest("ai_test_function_door") { ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:client", - "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/engine/services/common/platform/lock:lock", - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/engine/services/server/plugin_manager:plugin_manager", - "//foundation/ai/engine/test/sample:sample_plugin_1", - "//foundation/ai/engine/test/sample:sample_plugin_2", + "//foundation/ai/ai_engine/services/client:client", + "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/ai_engine/services/common/platform/lock:lock", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/server/plugin_manager:plugin_manager", + "//foundation/ai/ai_engine/test/sample:sample_plugin_1", + "//foundation/ai/ai_engine/test/sample:sample_plugin_2", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] sources = [ diff --git a/test/function/death_callback/BUILD.gn b/test/function/death_callback/BUILD.gn index 4ae8c92..0930cc6 100755 --- a/test/function/death_callback/BUILD.gn +++ b/test/function/death_callback/BUILD.gn @@ -17,10 +17,10 @@ static_library("testDeathCallbackLibrary") { cflags_cc = [ "-fexceptions" ] include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/test/utils", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/test/utils", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", @@ -38,7 +38,7 @@ lite_component("testDeathCallback") { ldflags = [ "-lstdc++" ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:ai_client", + "//foundation/ai/ai_engine/services/client:ai_client", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] } diff --git a/test/performance/BUILD.gn b/test/performance/BUILD.gn index 92eef76..9ddf7f3 100644 --- a/test/performance/BUILD.gn +++ b/test/performance/BUILD.gn @@ -23,22 +23,22 @@ unittest("ai_test_performance_unittest") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/test/utils", - "//foundation/ai/engine/test/performance", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/test/utils", + "//foundation/ai/ai_engine/test/performance", "//commonlibrary/utils_lite/include", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:client", - "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/engine/services/common/platform/lock:lock", - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/engine/services/server/plugin_manager:plugin_manager", - "//foundation/ai/engine/test/sample:sample_plugin_1", - "//foundation/ai/engine/test/sample:sample_plugin_2", + "//foundation/ai/ai_engine/services/client:client", + "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/ai_engine/services/common/platform/lock:lock", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/server/plugin_manager:plugin_manager", + "//foundation/ai/ai_engine/test/sample:sample_plugin_1", + "//foundation/ai/ai_engine/test/sample:sample_plugin_2", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] sources = [ diff --git a/test/sample/BUILD.gn b/test/sample/BUILD.gn index 4658435..a7c7557 100644 --- a/test/sample/BUILD.gn +++ b/test/sample/BUILD.gn @@ -20,9 +20,9 @@ source_set("syncDemoPluginCode") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", - "//foundation/ai/engine/test", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", + "//foundation/ai/ai_engine/test", "//third_party/bounds_checking_function/include", ] } @@ -33,7 +33,7 @@ lite_component("sample_plugin_1") { cflags_cc = cflags features = [ ":syncDemoPluginCode" ] deps = [ - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", ] } @@ -45,9 +45,9 @@ source_set("asyncDemoPluginCode") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", - "//foundation/ai/engine/test", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", + "//foundation/ai/ai_engine/test", "//third_party/bounds_checking_function/include", ] } @@ -58,6 +58,6 @@ lite_component("sample_plugin_2") { cflags_cc = cflags features = [ ":asyncDemoPluginCode" ] deps = [ - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", ] } -- Gitee From 20f74f3a153bb943a97a40424c59ef44087ffdd2 Mon Sep 17 00:00:00 2001 From: fwx1157193 Date: Wed, 14 Sep 2022 10:02:48 +0800 Subject: [PATCH 2/4] Update file path Signed-off-by: bwx1095090 --- README.md | 8 ++-- README_zh.md | 8 ++-- bundle.json | 6 +-- services/client/BUILD.gn | 6 +-- services/client/CMakeLists.txt | 34 ++++++++--------- .../asr/keyword_spotting/BUILD.gn | 36 +++++++++--------- .../cv/image_classification/BUILD.gn | 32 ++++++++-------- services/client/client_executor/BUILD.gn | 6 +-- .../client/communication_adapter/BUILD.gn | 6 +-- services/common/CMakeLists.txt | 28 +++++++------- .../common/platform/dl_operation/BUILD.gn | 2 +- services/common/platform/event/BUILD.gn | 4 +- services/common/platform/lock/BUILD.gn | 2 +- .../platform/os_wrapper/audio_loader/BUILD.gn | 18 ++++----- .../platform/os_wrapper/feature/BUILD.gn | 8 ++-- .../common/platform/os_wrapper/ipc/BUILD.gn | 2 +- .../common/platform/os_wrapper/utils/BUILD.gn | 14 +++---- services/common/platform/semaphore/BUILD.gn | 4 +- services/common/platform/threadpool/BUILD.gn | 6 +-- services/common/platform/time/BUILD.gn | 2 +- .../common/protocol/data_channel/BUILD.gn | 2 +- services/common/utils/encdec/BUILD.gn | 4 +- services/common/utils/file_operation/BUILD.gn | 4 +- services/server/BUILD.gn | 12 +++--- services/server/CMakeLists.txt | 32 ++++++++-------- .../server/communication_adapter/BUILD.gn | 6 +-- services/server/plugin/BUILD.gn | 2 +- .../plugin/asr/keyword_spotting/BUILD.gn | 38 +++++++++---------- .../plugin/cv/image_classification/BUILD.gn | 36 +++++++++--------- services/server/plugin_manager/BUILD.gn | 8 ++-- services/server/server_executor/BUILD.gn | 8 ++-- test/BUILD.gn | 2 +- test/CMakeLists.txt | 16 ++++---- test/common/BUILD.gn | 16 ++++---- .../dl_operation/dl_operation_so/BUILD.gn | 2 +- test/function/BUILD.gn | 24 ++++++------ test/function/death_callback/BUILD.gn | 10 ++--- test/performance/BUILD.gn | 24 ++++++------ test/sample/BUILD.gn | 16 ++++---- 39 files changed, 247 insertions(+), 247 deletions(-) diff --git a/README.md b/README.md index 5afc0f7..c6b1d94 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI ## Directory Structure ``` -/foundation/ai/ai_engine # Home directory of the AI subsystem +/foundation/ai/engine # Home directory of the AI subsystem ├── interfaces │ └── kits # External APIs of the AI subsystem └── services @@ -51,7 +51,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI 1. Compile the AI subsystem. - The source code for lightweight AI framework is available at **//foundation/ai/ai_engine/services**. + The source code for lightweight AI framework is available at **//foundation/ai/engine/services**. The compilation procedure is as follows: @@ -78,7 +78,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI 2. Develop the plug-in, with keyword spotting as an example. - Directory: //foundation/ai/ai_engine/services/server/plugin/asr/keyword\_spotting + Directory: //foundation/ai/engine/services/server/plugin/asr/keyword\_spotting **Note**: The plug-in must implement the **IPlugin** and **IPluginCallback** APIs provided by the server. @@ -138,7 +138,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI 3. Develop the SDK, with keyword spotting as an example. - Directory: //foundation/ai/ai_engine/services/client/algorithm\_sdk/asr/keyword\_spotting + Directory: //foundation/ai/engine/services/client/algorithm\_sdk/asr/keyword\_spotting Keyword spotting SDK: diff --git a/README_zh.md b/README_zh.md index 63bc981..d6047be 100644 --- a/README_zh.md +++ b/README_zh.md @@ -17,7 +17,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 ## 目录 ``` -/foundation/ai/ai_engine # AI子系统主目录 +/foundation/ai/engine # AI子系统主目录 ├── interfaces │ └── kits # AI子系统对外接口 └── services @@ -51,7 +51,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 1. **AI业务子系统编译** - 轻量级AI引擎框架模块，代码所在路径：//foundation/ai/ai_engine/services + 轻量级AI引擎框架模块，代码所在路径：//foundation/ai/engine/services 编译指令如下： @@ -78,7 +78,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 2. **插件开发**（以唤醒词识别为例） - 位置：//foundation/ai/ai_engine/services/server/plugin/asr/keyword\_spotting + 位置：//foundation/ai/engine/services/server/plugin/asr/keyword\_spotting **注意**：插件需要实现server提供的IPlugin接口和IPluginCallback接口 @@ -138,7 +138,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 3. **插件SDK开发**（以唤醒词识别kws\_sdk为例） - 位置：//foundation/ai/ai_engine/services/client/algorithm\_sdk/asr/keyword\_spotting + 位置：//foundation/ai/engine/services/client/algorithm\_sdk/asr/keyword\_spotting 唤醒词识别SDK： diff --git a/bundle.json b/bundle.json index dff2888..21af631 100644 --- a/bundle.json +++ b/bundle.json @@ -5,7 +5,7 @@ "license": "Apache License 2.0", "pubiishAs": "code-segment", "segment": { - "destPath": "foundation/ai/ai_engine" + "destPath": "foundation/ai/engine" }, "dirs": {}, "scripts": {}, @@ -29,9 +29,9 @@ ] }, "build": { - "sub_component": [ "//foundation/ai/ai_engine/services:ai" ], + "sub_component": [ "//foundation/ai/engine/services:ai" ], "inner_kits": [], - "test": [ "//foundation/ai/ai_engine/test" ] + "test": [ "//foundation/ai/engine/test" ] } } } diff --git a/services/client/BUILD.gn b/services/client/BUILD.gn index de0f818..729cb7f 100755 --- a/services/client/BUILD.gn +++ b/services/client/BUILD.gn @@ -11,14 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") +import("//foundation/ai/engine/services/ai_plugin_config.gni") shared_library("ai_client") { deps = [ "client_executor", "communication_adapter:ai_communication_adapter", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/ipc:aie_ipc", - "//foundation/ai/ai_engine/services/common/platform/threadpool:threadpool", + "//foundation/ai/engine/services/common/platform/os_wrapper/ipc:aie_ipc", + "//foundation/ai/engine/services/common/platform/threadpool:threadpool", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] } diff --git a/services/client/CMakeLists.txt b/services/client/CMakeLists.txt index d500022..7e2ba73 100644 --- a/services/client/CMakeLists.txt +++ b/services/client/CMakeLists.txt @@ -4,23 +4,23 @@ project(engine) set(CMAKE_CXX_STANDARD 14) include_directories(../../../../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog) -include_directories(../../../../../foundation/ai/ai_engine/interfaces) -include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits) -include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/asr/keyword_spotting) -include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/cv/image_classification) -include_directories(../../../../../foundation/ai/ai_engine/services/client) -include_directories(../../../../../foundation/ai/ai_engine/services/client/algorithm_sdk/asr/keyword_spotting/include) -include_directories(../../../../../foundation/ai/ai_engine/services/client/client_executor/include) -include_directories(../../../../../foundation/ai/ai_engine/services/common) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/utils) -include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/plugin_config) -include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/retcode_inner) -include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/struct_definition) -include_directories(../../../../../foundation/ai/ai_engine/services/common/utils) -include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/constants) -include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/encdec/include) -include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/log) +include_directories(../../../../../foundation/ai/engine/interfaces) +include_directories(../../../../../foundation/ai/engine/interfaces/kits) +include_directories(../../../../../foundation/ai/engine/interfaces/kits/asr/keyword_spotting) +include_directories(../../../../../foundation/ai/engine/interfaces/kits/cv/image_classification) +include_directories(../../../../../foundation/ai/engine/services/client) +include_directories(../../../../../foundation/ai/engine/services/client/algorithm_sdk/asr/keyword_spotting/include) +include_directories(../../../../../foundation/ai/engine/services/client/client_executor/include) +include_directories(../../../../../foundation/ai/engine/services/common) +include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces) +include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/engine/services/common/protocol/plugin_config) +include_directories(../../../../../foundation/ai/engine/services/common/protocol/retcode_inner) +include_directories(../../../../../foundation/ai/engine/services/common/protocol/struct_definition) +include_directories(../../../../../foundation/ai/engine/services/common/utils) +include_directories(../../../../../foundation/ai/engine/services/common/utils/constants) +include_directories(../../../../../foundation/ai/engine/services/common/utils/encdec/include) +include_directories(../../../../../foundation/ai/engine/services/common/utils/log) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr) include_directories(../../../../../third_party/bounds_checking_function/include) diff --git a/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn b/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn index 97811e1..f187802 100644 --- a/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn +++ b/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn @@ -22,27 +22,27 @@ static_library("keyword_spotting_sdk") { "source/pcm_iterator.cpp", ] include_dirs = [ - "//foundation/ai/ai_engine/interfaces/kits", - "//foundation/ai/ai_engine/interfaces/kits/asr/keyword_spotting", - "//foundation/ai/ai_engine/services/client", - "//foundation/ai/ai_engine/services/client/algorithm_sdk/asr/keyword_spotting/include", - "//foundation/ai/ai_engine/services/client/client_executor/include", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/ai_engine/services/common/protocol/plugin_config", - "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", - "//foundation/ai/ai_engine/services/common/protocol/struct_definition", - "//foundation/ai/ai_engine/services/common/utils/constants", - "//foundation/ai/ai_engine/services/common/utils/encdec/include", - "//foundation/ai/ai_engine/services/common/utils/log", + "//foundation/ai/engine/interfaces/kits", + "//foundation/ai/engine/interfaces/kits/asr/keyword_spotting", + "//foundation/ai/engine/services/client", + "//foundation/ai/engine/services/client/algorithm_sdk/asr/keyword_spotting/include", + "//foundation/ai/engine/services/client/client_executor/include", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/engine/services/common/protocol/plugin_config", + "//foundation/ai/engine/services/common/protocol/retcode_inner", + "//foundation/ai/engine/services/common/protocol/struct_definition", + "//foundation/ai/engine/services/common/utils/constants", + "//foundation/ai/engine/services/common/utils/encdec/include", + "//foundation/ai/engine/services/common/utils/log", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/ai_engine/services/client:ai_client", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature:audio_features_sdk", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", + "//foundation/ai/engine/services/client:ai_client", + "//foundation/ai/engine/services/common/platform/os_wrapper/feature:audio_features_sdk", + "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/engine/services/common/utils/encdec:encdec", "//third_party/bounds_checking_function:libsec_shared", ] libs = [ "audio_features" ] diff --git a/services/client/algorithm_sdk/cv/image_classification/BUILD.gn b/services/client/algorithm_sdk/cv/image_classification/BUILD.gn index d170c66..d48b6af 100644 --- a/services/client/algorithm_sdk/cv/image_classification/BUILD.gn +++ b/services/client/algorithm_sdk/cv/image_classification/BUILD.gn @@ -22,25 +22,25 @@ static_library("image_classification_sdk") { include_dirs = [ "include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/interfaces/kits", - "//foundation/ai/ai_engine/interfaces/kits/cv/image_classification", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/ai_engine/services/client/client_executor/include", - "//foundation/ai/ai_engine/services/client", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/common/protocol/plugin_config", - "//foundation/ai/ai_engine/services/common/protocol/struct_definition", - "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", - "//foundation/ai/ai_engine/services/common/utils/constants", - "//foundation/ai/ai_engine/services/common/utils/encdec/include", - "//foundation/ai/ai_engine/services/common/utils", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/interfaces/kits", + "//foundation/ai/engine/interfaces/kits/cv/image_classification", + "//foundation/ai/engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/engine/services/client/client_executor/include", + "//foundation/ai/engine/services/client", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/common/protocol/plugin_config", + "//foundation/ai/engine/services/common/protocol/struct_definition", + "//foundation/ai/engine/services/common/protocol/retcode_inner", + "//foundation/ai/engine/services/common/utils/constants", + "//foundation/ai/engine/services/common/utils/encdec/include", + "//foundation/ai/engine/services/common/utils", "//third_party/bounds_checking_function/include", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/ai_engine/services/client:ai_client", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", + "//foundation/ai/engine/services/client:ai_client", + "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/engine/services/common/utils/encdec:encdec", ] } diff --git a/services/client/client_executor/BUILD.gn b/services/client/client_executor/BUILD.gn index bd637b8..f64f5e9 100755 --- a/services/client/client_executor/BUILD.gn +++ b/services/client/client_executor/BUILD.gn @@ -20,8 +20,8 @@ source_set("client_executor") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/client", - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/client", + "//foundation/ai/engine/services/common", ] } diff --git a/services/client/communication_adapter/BUILD.gn b/services/client/communication_adapter/BUILD.gn index 4e33bf1..a491b09 100755 --- a/services/client/communication_adapter/BUILD.gn +++ b/services/client/communication_adapter/BUILD.gn @@ -21,9 +21,9 @@ source_set("ai_communication_adapter") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/client", - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/client", + "//foundation/ai/engine/services/common", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", diff --git a/services/common/CMakeLists.txt b/services/common/CMakeLists.txt index 956b485..78ce64a 100644 --- a/services/common/CMakeLists.txt +++ b/services/common/CMakeLists.txt @@ -9,20 +9,20 @@ include_directories(../../../../../base/hiviewdfx/hilog_lite/interfaces/native/k include_directories(../../../../../drivers/peripheral/audio/interfaces/include) include_directories(../../../../../drivers/peripheral/codec/interfaces/include) include_directories(../../../../../drivers/peripheral/format/interfaces/include) -include_directories(../../../../../foundation/ai/ai_engine/interfaces) -include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits) -include_directories(../../../../../foundation/ai/ai_engine/services/common) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include/codec) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/utils) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/utils) -include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/retcode_inner) -include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/struct_definition) -include_directories(../../../../../foundation/ai/ai_engine/services/common/utils) -include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/encdec/include) -include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/log) -include_directories(../../../../../foundation/ai/ai_engine/services/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/engine/interfaces) +include_directories(../../../../../foundation/ai/engine/interfaces/kits) +include_directories(../../../../../foundation/ai/engine/services/common) +include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include) +include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include/codec) +include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces) +include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/engine/services/common/platform/utils) +include_directories(../../../../../foundation/ai/engine/services/common/protocol/retcode_inner) +include_directories(../../../../../foundation/ai/engine/services/common/protocol/struct_definition) +include_directories(../../../../../foundation/ai/engine/services/common/utils) +include_directories(../../../../../foundation/ai/engine/services/common/utils/encdec/include) +include_directories(../../../../../foundation/ai/engine/services/common/utils/log) +include_directories(../../../../../foundation/ai/engine/services/platform/os_wrapper/utils) include_directories(../../../../../foundation/multimedia/audio_lite/interfaces/kits) include_directories(../../../../../foundation/multimedia/hals/camera_lite) include_directories(../../../../../foundation/multimedia/utils/lite/hals) diff --git a/services/common/platform/dl_operation/BUILD.gn b/services/common/platform/dl_operation/BUILD.gn index b77f16f..5759eed 100755 --- a/services/common/platform/dl_operation/BUILD.gn +++ b/services/common/platform/dl_operation/BUILD.gn @@ -18,6 +18,6 @@ source_set("dlOperation") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/services/common", ] } diff --git a/services/common/platform/event/BUILD.gn b/services/common/platform/event/BUILD.gn index fa1e4d2..4967886 100755 --- a/services/common/platform/event/BUILD.gn +++ b/services/common/platform/event/BUILD.gn @@ -16,7 +16,7 @@ source_set("event") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/common", ] } diff --git a/services/common/platform/lock/BUILD.gn b/services/common/platform/lock/BUILD.gn index 69cd9b4..e03b651 100755 --- a/services/common/platform/lock/BUILD.gn +++ b/services/common/platform/lock/BUILD.gn @@ -16,5 +16,5 @@ source_set("lock") { cflags = [ "-fPIC" ] cflags_cc = cflags - include_dirs = [ "//foundation/ai/ai_engine/services/common" ] + include_dirs = [ "//foundation/ai/engine/services/common" ] } diff --git a/services/common/platform/os_wrapper/audio_loader/BUILD.gn b/services/common/platform/os_wrapper/audio_loader/BUILD.gn index 79e72c5..c32dac2 100755 --- a/services/common/platform/os_wrapper/audio_loader/BUILD.gn +++ b/services/common/platform/os_wrapper/audio_loader/BUILD.gn @@ -14,15 +14,15 @@ import("//build/lite/config/component/lite_component.gni") config("libaudio_common_config") { include_dirs = [ - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include/codec", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/ai_engine/services/common/platform/utils", - "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", - "//foundation/ai/ai_engine/services/common/utils", - "//foundation/ai/ai_engine/services/common/utils/log", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include", + "//foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include/codec", + "//foundation/ai/engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/engine/services/common/platform/utils", + "//foundation/ai/engine/services/common/protocol/retcode_inner", + "//foundation/ai/engine/services/common/utils", + "//foundation/ai/engine/services/common/utils/log", "//foundation/multimedia/audio_lite/interfaces/kits", "//foundation/multimedia/hals/camera_lite", "//foundation/multimedia/utils/lite/hals", diff --git a/services/common/platform/os_wrapper/feature/BUILD.gn b/services/common/platform/os_wrapper/feature/BUILD.gn index 1cb7cc6..f673716 100644 --- a/services/common/platform/os_wrapper/feature/BUILD.gn +++ b/services/common/platform/os_wrapper/feature/BUILD.gn @@ -16,10 +16,10 @@ config("feature_config") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits/hilog", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", - "//foundation/ai/ai_engine/services/common/utils", - "//foundation/ai/ai_engine/services/common/utils/log", + "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/engine/services/common/protocol/retcode_inner", + "//foundation/ai/engine/services/common/utils", + "//foundation/ai/engine/services/common/utils/log", "//third_party/bounds_checking_function/include", ] } diff --git a/services/common/platform/os_wrapper/ipc/BUILD.gn b/services/common/platform/os_wrapper/ipc/BUILD.gn index b558132..0b3490e 100644 --- a/services/common/platform/os_wrapper/ipc/BUILD.gn +++ b/services/common/platform/os_wrapper/ipc/BUILD.gn @@ -17,7 +17,7 @@ source_set("aie_ipc") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/services/common", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//third_party/bounds_checking_function/include", ] diff --git a/services/common/platform/os_wrapper/utils/BUILD.gn b/services/common/platform/os_wrapper/utils/BUILD.gn index e1793b7..667a985 100644 --- a/services/common/platform/os_wrapper/utils/BUILD.gn +++ b/services/common/platform/os_wrapper/utils/BUILD.gn @@ -14,13 +14,13 @@ import("//build/lite/config/component/lite_component.gni") config("os_wrapper_utils_config") { include_dirs = [ - "//foundation/ai/ai_engine/interfaces/kits", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", - "//foundation/ai/ai_engine/services/common/protocol/struct_definition", - "//foundation/ai/ai_engine/services/common/utils", - "//foundation/ai/ai_engine/services/common/utils/encdec/include", - "//foundation/ai/ai_engine/services/platform/os_wrapper/utils", + "//foundation/ai/engine/interfaces/kits", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/common/protocol/retcode_inner", + "//foundation/ai/engine/services/common/protocol/struct_definition", + "//foundation/ai/engine/services/common/utils", + "//foundation/ai/engine/services/common/utils/encdec/include", + "//foundation/ai/engine/services/platform/os_wrapper/utils", ] } diff --git a/services/common/platform/semaphore/BUILD.gn b/services/common/platform/semaphore/BUILD.gn index ab9ac56..e94e86b 100755 --- a/services/common/platform/semaphore/BUILD.gn +++ b/services/common/platform/semaphore/BUILD.gn @@ -15,7 +15,7 @@ source_set("semaphore") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/common", ] } diff --git a/services/common/platform/threadpool/BUILD.gn b/services/common/platform/threadpool/BUILD.gn index e6dac23..fd0915c 100755 --- a/services/common/platform/threadpool/BUILD.gn +++ b/services/common/platform/threadpool/BUILD.gn @@ -20,9 +20,9 @@ source_set("threadpool") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/common", "//third_party/bounds_checking_function/include", ] - deps = [ "//foundation/ai/ai_engine/services/common/platform/time:time" ] + deps = [ "//foundation/ai/engine/services/common/platform/time:time" ] } diff --git a/services/common/platform/time/BUILD.gn b/services/common/platform/time/BUILD.gn index d63e51c..e958637 100755 --- a/services/common/platform/time/BUILD.gn +++ b/services/common/platform/time/BUILD.gn @@ -18,7 +18,7 @@ source_set("time") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/services/common", "//third_party/bounds_checking_function/include", ] } diff --git a/services/common/protocol/data_channel/BUILD.gn b/services/common/protocol/data_channel/BUILD.gn index d5fc8f2..d02c536 100755 --- a/services/common/protocol/data_channel/BUILD.gn +++ b/services/common/protocol/data_channel/BUILD.gn @@ -17,5 +17,5 @@ source_set("data_channel") { ] cflags = [ "-fPIC" ] cflags_cc = cflags - include_dirs = [ "//foundation/ai/ai_engine/services/common" ] + include_dirs = [ "//foundation/ai/engine/services/common" ] } diff --git a/services/common/utils/encdec/BUILD.gn b/services/common/utils/encdec/BUILD.gn index d9ebdcb..167c1a9 100755 --- a/services/common/utils/encdec/BUILD.gn +++ b/services/common/utils/encdec/BUILD.gn @@ -20,8 +20,8 @@ source_set("encdec") { include_dirs = [ "include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/common", "//third_party/bounds_checking_function/include", ] } diff --git a/services/common/utils/file_operation/BUILD.gn b/services/common/utils/file_operation/BUILD.gn index 942f8bd..b667577 100755 --- a/services/common/utils/file_operation/BUILD.gn +++ b/services/common/utils/file_operation/BUILD.gn @@ -17,7 +17,7 @@ source_set("fileOperation") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/common", ] } diff --git a/services/server/BUILD.gn b/services/server/BUILD.gn index 6a19814..e2cc61b 100755 --- a/services/server/BUILD.gn +++ b/services/server/BUILD.gn @@ -31,12 +31,12 @@ lite_component("ai_server") { ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/ai_engine/services/common/platform/event:event", - "//foundation/ai/ai_engine/services/common/platform/lock:lock", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/ipc:aie_ipc", - "//foundation/ai/ai_engine/services/common/platform/semaphore:semaphore", - "//foundation/ai/ai_engine/services/common/platform/threadpool:threadpool", + "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/engine/services/common/platform/event:event", + "//foundation/ai/engine/services/common/platform/lock:lock", + "//foundation/ai/engine/services/common/platform/os_wrapper/ipc:aie_ipc", + "//foundation/ai/engine/services/common/platform/semaphore:semaphore", + "//foundation/ai/engine/services/common/platform/threadpool:threadpool", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] } diff --git a/services/server/CMakeLists.txt b/services/server/CMakeLists.txt index 900889e..36a847f 100644 --- a/services/server/CMakeLists.txt +++ b/services/server/CMakeLists.txt @@ -4,22 +4,22 @@ project(engine) set(CMAKE_CXX_STANDARD 14) include_directories(../../../../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog) -include_directories(../../../../../foundation/ai/ai_engine/interfaces) -include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits) -include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/asr) -include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/cv/image_classification) -include_directories(../../../../../foundation/ai/ai_engine/services/common) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/engine_hal/interfaces) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces) -include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/utils) -include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/plugin_config) -include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/retcode_inner) -include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/struct_definition) -include_directories(../../../../../foundation/ai/ai_engine/services/common/utils) -include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/encdec/include) -include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/log) -include_directories(../../../../../foundation/ai/ai_engine/services/server) +include_directories(../../../../../foundation/ai/engine/interfaces) +include_directories(../../../../../foundation/ai/engine/interfaces/kits) +include_directories(../../../../../foundation/ai/engine/interfaces/kits/asr) +include_directories(../../../../../foundation/ai/engine/interfaces/kits/cv/image_classification) +include_directories(../../../../../foundation/ai/engine/services/common) +include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper) +include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/engine_hal/interfaces) +include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces) +include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/engine/services/common/protocol/plugin_config) +include_directories(../../../../../foundation/ai/engine/services/common/protocol/retcode_inner) +include_directories(../../../../../foundation/ai/engine/services/common/protocol/struct_definition) +include_directories(../../../../../foundation/ai/engine/services/common/utils) +include_directories(../../../../../foundation/ai/engine/services/common/utils/encdec/include) +include_directories(../../../../../foundation/ai/engine/services/common/utils/log) +include_directories(../../../../../foundation/ai/engine/services/server) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry) diff --git a/services/server/communication_adapter/BUILD.gn b/services/server/communication_adapter/BUILD.gn index 6b6166b..fa207f5 100755 --- a/services/server/communication_adapter/BUILD.gn +++ b/services/server/communication_adapter/BUILD.gn @@ -22,9 +22,9 @@ static_library("ai_communication_adapter") { "source/start_server.c", ] include_dirs = [ - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/server", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/server", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", diff --git a/services/server/plugin/BUILD.gn b/services/server/plugin/BUILD.gn index c734610..bd13f6d 100644 --- a/services/server/plugin/BUILD.gn +++ b/services/server/plugin/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") +import("//foundation/ai/engine/services/ai_plugin_config.gni") lite_component("plugin") { features = [ diff --git a/services/server/plugin/asr/keyword_spotting/BUILD.gn b/services/server/plugin/asr/keyword_spotting/BUILD.gn index 014d460..ad9b785 100755 --- a/services/server/plugin/asr/keyword_spotting/BUILD.gn +++ b/services/server/plugin/asr/keyword_spotting/BUILD.gn @@ -28,20 +28,20 @@ lite_library("asr_keyword_spotting") { cflags_cc = cflags include_dirs = [ "include", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/interfaces/kits", - "//foundation/ai/ai_engine/interfaces/kits/asr", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/common/utils/encdec/include", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/engine_hal/interfaces", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper", - "//foundation/ai/ai_engine/services/common/protocol/struct_definition", - "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", - "//foundation/ai/ai_engine/services/common/protocol/plugin_config", - "//foundation/ai/ai_engine/services/common/utils/log", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/ai_engine/services/server", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/interfaces/kits", + "//foundation/ai/engine/interfaces/kits/asr", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/common/utils/encdec/include", + "//foundation/ai/engine/services/common/platform/os_wrapper/engine_hal/interfaces", + "//foundation/ai/engine/services/common/platform/os_wrapper", + "//foundation/ai/engine/services/common/protocol/struct_definition", + "//foundation/ai/engine/services/common/protocol/retcode_inner", + "//foundation/ai/engine/services/common/protocol/plugin_config", + "//foundation/ai/engine/services/common/utils/log", + "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/engine/services/server", ] ldflags = [ "-lstdc++" ] ldflags += [ "-lnnie" ] @@ -51,11 +51,11 @@ lite_library("asr_keyword_spotting") { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//device/soc/hisilicon/common/hal/ai:engine_nnie_sdk", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature:norm_processor_dep", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature:slide_window_processor_dep", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", + "//foundation/ai/engine/services/common/platform/os_wrapper/feature:norm_processor_dep", + "//foundation/ai/engine/services/common/platform/os_wrapper/feature:slide_window_processor_dep", + "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/engine/services/common/utils/encdec:encdec", "//third_party/bounds_checking_function:libsec_shared", ] } diff --git a/services/server/plugin/cv/image_classification/BUILD.gn b/services/server/plugin/cv/image_classification/BUILD.gn index e734b8a..a2d8b29 100755 --- a/services/server/plugin/cv/image_classification/BUILD.gn +++ b/services/server/plugin/cv/image_classification/BUILD.gn @@ -24,21 +24,21 @@ lite_library("cv_image_classification") { cflags_cc = cflags include_dirs = [ "include", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/interfaces/kits", - "//foundation/ai/ai_engine/interfaces/kits/cv/image_classification", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/engine_hal/interfaces", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/ai_engine/services/common/protocol/struct_definition", - "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", - "//foundation/ai/ai_engine/services/common/protocol/plugin_config", - "//foundation/ai/ai_engine/services/common/utils", - "//foundation/ai/ai_engine/services/common/utils/encdec/include", - "//foundation/ai/ai_engine/services/common/utils/log", - "//foundation/ai/ai_engine/services/server", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/interfaces/kits", + "//foundation/ai/engine/interfaces/kits/cv/image_classification", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/common/platform/os_wrapper", + "//foundation/ai/engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/engine/services/common/platform/os_wrapper/engine_hal/interfaces", + "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/engine/services/common/protocol/struct_definition", + "//foundation/ai/engine/services/common/protocol/retcode_inner", + "//foundation/ai/engine/services/common/protocol/plugin_config", + "//foundation/ai/engine/services/common/utils", + "//foundation/ai/engine/services/common/utils/encdec/include", + "//foundation/ai/engine/services/common/utils/log", + "//foundation/ai/engine/services/server", ] ldflags = [ "-lstdc++" ] ldflags += [ "-lnnie_adapter" ] @@ -46,9 +46,9 @@ lite_library("cv_image_classification") { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//device/soc/hisilicon/common/hal/ai:engine_nnie_sdk", - "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", + "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/engine/services/common/utils/encdec:encdec", "//third_party/bounds_checking_function:libsec_shared", ] } diff --git a/services/server/plugin_manager/BUILD.gn b/services/server/plugin_manager/BUILD.gn index de0f87c..0ab46df 100755 --- a/services/server/plugin_manager/BUILD.gn +++ b/services/server/plugin_manager/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") +import("//foundation/ai/engine/services/ai_plugin_config.gni") action("gen_etc_ini") { outputs = [ "${root_out_dir}/etc/ai_engine_plugin.ini" ] @@ -35,9 +35,9 @@ source_set("plugin_manager") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces/", - "//foundation/ai/ai_engine/services/common/", - "//foundation/ai/ai_engine/services/server/", + "//foundation/ai/engine/interfaces/", + "//foundation/ai/engine/services/common/", + "//foundation/ai/engine/services/server/", "//third_party/bounds_checking_function/include", ] } diff --git a/services/server/server_executor/BUILD.gn b/services/server/server_executor/BUILD.gn index 88ee5ed..edbc731 100755 --- a/services/server/server_executor/BUILD.gn +++ b/services/server/server_executor/BUILD.gn @@ -28,13 +28,13 @@ source_set("server_executor") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/server", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/server", "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", ] } diff --git a/test/BUILD.gn b/test/BUILD.gn index 907d8f5..2d28e51 100755 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") +import("//foundation/ai/engine/services/ai_plugin_config.gni") lite_component("test") { features = [ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4ff775c..b63ba4e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,14 +4,14 @@ project(engine) set(CMAKE_CXX_STANDARD 14) include_directories(../../../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog) -include_directories(../../../../foundation/ai/ai_engine/interfaces) -include_directories(../../../../foundation/ai/ai_engine/services/client) -include_directories(../../../../foundation/ai/ai_engine/services/common) -include_directories(../../../../foundation/ai/ai_engine/services/server) -include_directories(../../../../foundation/ai/ai_engine/test) -include_directories(../../../../foundation/ai/ai_engine/test/common/dl_operation/dl_operation_so/include) -include_directories(../../../../foundation/ai/ai_engine/test/performance) -include_directories(../../../../foundation/ai/ai_engine/test/utils) +include_directories(../../../../foundation/ai/engine/interfaces) +include_directories(../../../../foundation/ai/engine/services/client) +include_directories(../../../../foundation/ai/engine/services/common) +include_directories(../../../../foundation/ai/engine/services/server) +include_directories(../../../../foundation/ai/engine/test) +include_directories(../../../../foundation/ai/engine/test/common/dl_operation/dl_operation_so/include) +include_directories(../../../../foundation/ai/engine/test/performance) +include_directories(../../../../foundation/ai/engine/test/utils) include_directories(../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry) include_directories(../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr) include_directories(../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry) diff --git a/test/common/BUILD.gn b/test/common/BUILD.gn index 23008a8..03af586 100755 --- a/test/common/BUILD.gn +++ b/test/common/BUILD.gn @@ -22,19 +22,19 @@ unittest("ai_test_common_door") { ] include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/common", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/common", "//third_party/googletest/googletest/include", "//third_party/googletest/googletest/src", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/ai_engine/services/common/platform/event:event", - "//foundation/ai/ai_engine/services/common/platform/semaphore:semaphore", - "//foundation/ai/ai_engine/services/common/platform/threadpool:threadpool", - "//foundation/ai/ai_engine/services/common/platform/time:time", - "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", + "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/engine/services/common/platform/event:event", + "//foundation/ai/engine/services/common/platform/semaphore:semaphore", + "//foundation/ai/engine/services/common/platform/threadpool:threadpool", + "//foundation/ai/engine/services/common/platform/time:time", + "//foundation/ai/engine/services/common/utils/encdec:encdec", ] sources = [ "dl_operation/dl_operation_test.cpp", diff --git a/test/common/dl_operation/dl_operation_so/BUILD.gn b/test/common/dl_operation/dl_operation_so/BUILD.gn index 2ea7ca4..2a8d7a2 100755 --- a/test/common/dl_operation/dl_operation_so/BUILD.gn +++ b/test/common/dl_operation/dl_operation_so/BUILD.gn @@ -17,6 +17,6 @@ shared_library("dlOperationSo") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/ai_engine/test/common/dl_operation/dl_operation_so/include", + "//foundation/ai/engine/test/common/dl_operation/dl_operation_so/include", ] } diff --git a/test/function/BUILD.gn b/test/function/BUILD.gn index 54c584e..e831938 100644 --- a/test/function/BUILD.gn +++ b/test/function/BUILD.gn @@ -22,11 +22,11 @@ unittest("ai_test_function_door") { ] include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/client", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/server", - "//foundation/ai/ai_engine/test/utils", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/client", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/server", + "//foundation/ai/engine/test/utils", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", @@ -37,13 +37,13 @@ unittest("ai_test_function_door") { ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/ai_engine/services/client:client", - "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/ai_engine/services/common/platform/lock:lock", - "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/ai_engine/services/server/plugin_manager:plugin_manager", - "//foundation/ai/ai_engine/test/sample:sample_plugin_1", - "//foundation/ai/ai_engine/test/sample:sample_plugin_2", + "//foundation/ai/engine/services/client:client", + "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/engine/services/common/platform/lock:lock", + "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/engine/services/server/plugin_manager:plugin_manager", + "//foundation/ai/engine/test/sample:sample_plugin_1", + "//foundation/ai/engine/test/sample:sample_plugin_2", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] sources = [ diff --git a/test/function/death_callback/BUILD.gn b/test/function/death_callback/BUILD.gn index 0930cc6..4ae8c92 100755 --- a/test/function/death_callback/BUILD.gn +++ b/test/function/death_callback/BUILD.gn @@ -17,10 +17,10 @@ static_library("testDeathCallbackLibrary") { cflags_cc = [ "-fexceptions" ] include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/client", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/test/utils", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/client", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/test/utils", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", @@ -38,7 +38,7 @@ lite_component("testDeathCallback") { ldflags = [ "-lstdc++" ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/ai_engine/services/client:ai_client", + "//foundation/ai/engine/services/client:ai_client", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] } diff --git a/test/performance/BUILD.gn b/test/performance/BUILD.gn index 9ddf7f3..92eef76 100644 --- a/test/performance/BUILD.gn +++ b/test/performance/BUILD.gn @@ -23,22 +23,22 @@ unittest("ai_test_performance_unittest") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/interfaces", - "//foundation/ai/ai_engine/services/client", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/test/utils", - "//foundation/ai/ai_engine/test/performance", + "//foundation/ai/engine/interfaces", + "//foundation/ai/engine/services/client", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/test/utils", + "//foundation/ai/engine/test/performance", "//commonlibrary/utils_lite/include", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/ai_engine/services/client:client", - "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/ai_engine/services/common/platform/lock:lock", - "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/ai_engine/services/server/plugin_manager:plugin_manager", - "//foundation/ai/ai_engine/test/sample:sample_plugin_1", - "//foundation/ai/ai_engine/test/sample:sample_plugin_2", + "//foundation/ai/engine/services/client:client", + "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/engine/services/common/platform/lock:lock", + "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/engine/services/server/plugin_manager:plugin_manager", + "//foundation/ai/engine/test/sample:sample_plugin_1", + "//foundation/ai/engine/test/sample:sample_plugin_2", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] sources = [ diff --git a/test/sample/BUILD.gn b/test/sample/BUILD.gn index a7c7557..4658435 100644 --- a/test/sample/BUILD.gn +++ b/test/sample/BUILD.gn @@ -20,9 +20,9 @@ source_set("syncDemoPluginCode") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/server", - "//foundation/ai/ai_engine/test", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/server", + "//foundation/ai/engine/test", "//third_party/bounds_checking_function/include", ] } @@ -33,7 +33,7 @@ lite_component("sample_plugin_1") { cflags_cc = cflags features = [ ":syncDemoPluginCode" ] deps = [ - "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", ] } @@ -45,9 +45,9 @@ source_set("asyncDemoPluginCode") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/ai_engine/services/common", - "//foundation/ai/ai_engine/services/server", - "//foundation/ai/ai_engine/test", + "//foundation/ai/engine/services/common", + "//foundation/ai/engine/services/server", + "//foundation/ai/engine/test", "//third_party/bounds_checking_function/include", ] } @@ -58,6 +58,6 @@ lite_component("sample_plugin_2") { cflags_cc = cflags features = [ ":asyncDemoPluginCode" ] deps = [ - "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", ] } -- Gitee From 60a78b8737f0a57aade7e75d0e8a1230433b455d Mon Sep 17 00:00:00 2001 From: fwx1157193 Date: Wed, 14 Sep 2022 14:59:49 +0800 Subject: [PATCH 3/4] update Signed-off-by: bwx1095090 --- README.md | 8 ++-- README_zh.md | 8 ++-- bundle.json | 6 +-- services/client/BUILD.gn | 6 +-- services/client/CMakeLists.txt | 34 ++++++++--------- .../asr/keyword_spotting/BUILD.gn | 36 +++++++++--------- .../cv/image_classification/BUILD.gn | 32 ++++++++-------- services/client/client_executor/BUILD.gn | 6 +-- .../client/communication_adapter/BUILD.gn | 6 +-- services/common/CMakeLists.txt | 28 +++++++------- .../common/platform/dl_operation/BUILD.gn | 2 +- services/common/platform/event/BUILD.gn | 4 +- services/common/platform/lock/BUILD.gn | 2 +- .../platform/os_wrapper/audio_loader/BUILD.gn | 18 ++++----- .../platform/os_wrapper/feature/BUILD.gn | 8 ++-- .../common/platform/os_wrapper/ipc/BUILD.gn | 2 +- .../common/platform/os_wrapper/utils/BUILD.gn | 14 +++---- services/common/platform/semaphore/BUILD.gn | 4 +- services/common/platform/threadpool/BUILD.gn | 6 +-- services/common/platform/time/BUILD.gn | 2 +- .../common/protocol/data_channel/BUILD.gn | 2 +- services/common/utils/encdec/BUILD.gn | 4 +- services/common/utils/file_operation/BUILD.gn | 4 +- services/server/BUILD.gn | 12 +++--- services/server/CMakeLists.txt | 32 ++++++++-------- .../server/communication_adapter/BUILD.gn | 6 +-- services/server/plugin/BUILD.gn | 2 +- .../plugin/asr/keyword_spotting/BUILD.gn | 38 +++++++++---------- .../plugin/cv/image_classification/BUILD.gn | 36 +++++++++--------- services/server/plugin_manager/BUILD.gn | 8 ++-- services/server/server_executor/BUILD.gn | 8 ++-- test/BUILD.gn | 2 +- test/CMakeLists.txt | 16 ++++---- test/common/BUILD.gn | 16 ++++---- .../dl_operation/dl_operation_so/BUILD.gn | 2 +- test/function/BUILD.gn | 24 ++++++------ test/function/death_callback/BUILD.gn | 10 ++--- test/performance/BUILD.gn | 24 ++++++------ test/sample/BUILD.gn | 16 ++++---- 39 files changed, 247 insertions(+), 247 deletions(-) diff --git a/README.md b/README.md index c6b1d94..5afc0f7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI ## Directory Structure ``` -/foundation/ai/engine # Home directory of the AI subsystem +/foundation/ai/ai_engine # Home directory of the AI subsystem ├── interfaces │ └── kits # External APIs of the AI subsystem └── services @@ -51,7 +51,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI 1. Compile the AI subsystem. - The source code for lightweight AI framework is available at **//foundation/ai/engine/services**. + The source code for lightweight AI framework is available at **//foundation/ai/ai_engine/services**. The compilation procedure is as follows: @@ -78,7 +78,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI 2. Develop the plug-in, with keyword spotting as an example. - Directory: //foundation/ai/engine/services/server/plugin/asr/keyword\_spotting + Directory: //foundation/ai/ai_engine/services/server/plugin/asr/keyword\_spotting **Note**: The plug-in must implement the **IPlugin** and **IPluginCallback** APIs provided by the server. @@ -138,7 +138,7 @@ The AI subsystem is the part of OpenHarmony that provides native distributed AI 3. Develop the SDK, with keyword spotting as an example. - Directory: //foundation/ai/engine/services/client/algorithm\_sdk/asr/keyword\_spotting + Directory: //foundation/ai/ai_engine/services/client/algorithm\_sdk/asr/keyword\_spotting Keyword spotting SDK: diff --git a/README_zh.md b/README_zh.md index d6047be..63bc981 100644 --- a/README_zh.md +++ b/README_zh.md @@ -17,7 +17,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 ## 目录 ``` -/foundation/ai/engine # AI子系统主目录 +/foundation/ai/ai_engine # AI子系统主目录 ├── interfaces │ └── kits # AI子系统对外接口 └── services @@ -51,7 +51,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 1. **AI业务子系统编译** - 轻量级AI引擎框架模块，代码所在路径：//foundation/ai/engine/services + 轻量级AI引擎框架模块，代码所在路径：//foundation/ai/ai_engine/services 编译指令如下： @@ -78,7 +78,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 2. **插件开发**（以唤醒词识别为例） - 位置：//foundation/ai/engine/services/server/plugin/asr/keyword\_spotting + 位置：//foundation/ai/ai_engine/services/server/plugin/asr/keyword\_spotting **注意**：插件需要实现server提供的IPlugin接口和IPluginCallback接口 @@ -138,7 +138,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 3. **插件SDK开发**（以唤醒词识别kws\_sdk为例） - 位置：//foundation/ai/engine/services/client/algorithm\_sdk/asr/keyword\_spotting + 位置：//foundation/ai/ai_engine/services/client/algorithm\_sdk/asr/keyword\_spotting 唤醒词识别SDK： diff --git a/bundle.json b/bundle.json index 21af631..dff2888 100644 --- a/bundle.json +++ b/bundle.json @@ -5,7 +5,7 @@ "license": "Apache License 2.0", "pubiishAs": "code-segment", "segment": { - "destPath": "foundation/ai/engine" + "destPath": "foundation/ai/ai_engine" }, "dirs": {}, "scripts": {}, @@ -29,9 +29,9 @@ ] }, "build": { - "sub_component": [ "//foundation/ai/engine/services:ai" ], + "sub_component": [ "//foundation/ai/ai_engine/services:ai" ], "inner_kits": [], - "test": [ "//foundation/ai/engine/test" ] + "test": [ "//foundation/ai/ai_engine/test" ] } } } diff --git a/services/client/BUILD.gn b/services/client/BUILD.gn index 729cb7f..de0f818 100755 --- a/services/client/BUILD.gn +++ b/services/client/BUILD.gn @@ -11,14 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/ai/engine/services/ai_plugin_config.gni") +import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") shared_library("ai_client") { deps = [ "client_executor", "communication_adapter:ai_communication_adapter", - "//foundation/ai/engine/services/common/platform/os_wrapper/ipc:aie_ipc", - "//foundation/ai/engine/services/common/platform/threadpool:threadpool", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/ipc:aie_ipc", + "//foundation/ai/ai_engine/services/common/platform/threadpool:threadpool", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] } diff --git a/services/client/CMakeLists.txt b/services/client/CMakeLists.txt index 7e2ba73..d500022 100644 --- a/services/client/CMakeLists.txt +++ b/services/client/CMakeLists.txt @@ -4,23 +4,23 @@ project(engine) set(CMAKE_CXX_STANDARD 14) include_directories(../../../../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog) -include_directories(../../../../../foundation/ai/engine/interfaces) -include_directories(../../../../../foundation/ai/engine/interfaces/kits) -include_directories(../../../../../foundation/ai/engine/interfaces/kits/asr/keyword_spotting) -include_directories(../../../../../foundation/ai/engine/interfaces/kits/cv/image_classification) -include_directories(../../../../../foundation/ai/engine/services/client) -include_directories(../../../../../foundation/ai/engine/services/client/algorithm_sdk/asr/keyword_spotting/include) -include_directories(../../../../../foundation/ai/engine/services/client/client_executor/include) -include_directories(../../../../../foundation/ai/engine/services/common) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/utils) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/plugin_config) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/retcode_inner) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/struct_definition) -include_directories(../../../../../foundation/ai/engine/services/common/utils) -include_directories(../../../../../foundation/ai/engine/services/common/utils/constants) -include_directories(../../../../../foundation/ai/engine/services/common/utils/encdec/include) -include_directories(../../../../../foundation/ai/engine/services/common/utils/log) +include_directories(../../../../../foundation/ai/ai_engine/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/asr/keyword_spotting) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/cv/image_classification) +include_directories(../../../../../foundation/ai/ai_engine/services/client) +include_directories(../../../../../foundation/ai/ai_engine/services/client/algorithm_sdk/asr/keyword_spotting/include) +include_directories(../../../../../foundation/ai/ai_engine/services/client/client_executor/include) +include_directories(../../../../../foundation/ai/ai_engine/services/common) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/plugin_config) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/retcode_inner) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/struct_definition) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/constants) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/encdec/include) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/log) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr) include_directories(../../../../../third_party/bounds_checking_function/include) diff --git a/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn b/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn index f187802..97811e1 100644 --- a/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn +++ b/services/client/algorithm_sdk/asr/keyword_spotting/BUILD.gn @@ -22,27 +22,27 @@ static_library("keyword_spotting_sdk") { "source/pcm_iterator.cpp", ] include_dirs = [ - "//foundation/ai/engine/interfaces/kits", - "//foundation/ai/engine/interfaces/kits/asr/keyword_spotting", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/client/algorithm_sdk/asr/keyword_spotting/include", - "//foundation/ai/engine/services/client/client_executor/include", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/engine/services/common/protocol/plugin_config", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/protocol/struct_definition", - "//foundation/ai/engine/services/common/utils/constants", - "//foundation/ai/engine/services/common/utils/encdec/include", - "//foundation/ai/engine/services/common/utils/log", + "//foundation/ai/ai_engine/interfaces/kits", + "//foundation/ai/ai_engine/interfaces/kits/asr/keyword_spotting", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/client/algorithm_sdk/asr/keyword_spotting/include", + "//foundation/ai/ai_engine/services/client/client_executor/include", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/services/common/protocol/plugin_config", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/protocol/struct_definition", + "//foundation/ai/ai_engine/services/common/utils/constants", + "//foundation/ai/ai_engine/services/common/utils/encdec/include", + "//foundation/ai/ai_engine/services/common/utils/log", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:ai_client", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature:audio_features_sdk", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/engine/services/common/utils/encdec:encdec", + "//foundation/ai/ai_engine/services/client:ai_client", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature:audio_features_sdk", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", "//third_party/bounds_checking_function:libsec_shared", ] libs = [ "audio_features" ] diff --git a/services/client/algorithm_sdk/cv/image_classification/BUILD.gn b/services/client/algorithm_sdk/cv/image_classification/BUILD.gn index d48b6af..d170c66 100644 --- a/services/client/algorithm_sdk/cv/image_classification/BUILD.gn +++ b/services/client/algorithm_sdk/cv/image_classification/BUILD.gn @@ -22,25 +22,25 @@ static_library("image_classification_sdk") { include_dirs = [ "include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/interfaces/kits", - "//foundation/ai/engine/interfaces/kits/cv/image_classification", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/engine/services/client/client_executor/include", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/protocol/plugin_config", - "//foundation/ai/engine/services/common/protocol/struct_definition", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/utils/constants", - "//foundation/ai/engine/services/common/utils/encdec/include", - "//foundation/ai/engine/services/common/utils", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/interfaces/kits", + "//foundation/ai/ai_engine/interfaces/kits/cv/image_classification", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/services/client/client_executor/include", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/protocol/plugin_config", + "//foundation/ai/ai_engine/services/common/protocol/struct_definition", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/utils/constants", + "//foundation/ai/ai_engine/services/common/utils/encdec/include", + "//foundation/ai/ai_engine/services/common/utils", "//third_party/bounds_checking_function/include", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:ai_client", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/engine/services/common/utils/encdec:encdec", + "//foundation/ai/ai_engine/services/client:ai_client", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", ] } diff --git a/services/client/client_executor/BUILD.gn b/services/client/client_executor/BUILD.gn index f64f5e9..bd637b8 100755 --- a/services/client/client_executor/BUILD.gn +++ b/services/client/client_executor/BUILD.gn @@ -20,8 +20,8 @@ source_set("client_executor") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", ] } diff --git a/services/client/communication_adapter/BUILD.gn b/services/client/communication_adapter/BUILD.gn index a491b09..4e33bf1 100755 --- a/services/client/communication_adapter/BUILD.gn +++ b/services/client/communication_adapter/BUILD.gn @@ -21,9 +21,9 @@ source_set("ai_communication_adapter") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", diff --git a/services/common/CMakeLists.txt b/services/common/CMakeLists.txt index 78ce64a..956b485 100644 --- a/services/common/CMakeLists.txt +++ b/services/common/CMakeLists.txt @@ -9,20 +9,20 @@ include_directories(../../../../../base/hiviewdfx/hilog_lite/interfaces/native/k include_directories(../../../../../drivers/peripheral/audio/interfaces/include) include_directories(../../../../../drivers/peripheral/codec/interfaces/include) include_directories(../../../../../drivers/peripheral/format/interfaces/include) -include_directories(../../../../../foundation/ai/engine/interfaces) -include_directories(../../../../../foundation/ai/engine/interfaces/kits) -include_directories(../../../../../foundation/ai/engine/services/common) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include/codec) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/utils) -include_directories(../../../../../foundation/ai/engine/services/common/platform/utils) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/retcode_inner) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/struct_definition) -include_directories(../../../../../foundation/ai/engine/services/common/utils) -include_directories(../../../../../foundation/ai/engine/services/common/utils/encdec/include) -include_directories(../../../../../foundation/ai/engine/services/common/utils/log) -include_directories(../../../../../foundation/ai/engine/services/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/ai_engine/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits) +include_directories(../../../../../foundation/ai/ai_engine/services/common) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include/codec) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/retcode_inner) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/struct_definition) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/encdec/include) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/log) +include_directories(../../../../../foundation/ai/ai_engine/services/platform/os_wrapper/utils) include_directories(../../../../../foundation/multimedia/audio_lite/interfaces/kits) include_directories(../../../../../foundation/multimedia/hals/camera_lite) include_directories(../../../../../foundation/multimedia/utils/lite/hals) diff --git a/services/common/platform/dl_operation/BUILD.gn b/services/common/platform/dl_operation/BUILD.gn index 5759eed..b77f16f 100755 --- a/services/common/platform/dl_operation/BUILD.gn +++ b/services/common/platform/dl_operation/BUILD.gn @@ -18,6 +18,6 @@ source_set("dlOperation") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/services/common", ] } diff --git a/services/common/platform/event/BUILD.gn b/services/common/platform/event/BUILD.gn index 4967886..fa1e4d2 100755 --- a/services/common/platform/event/BUILD.gn +++ b/services/common/platform/event/BUILD.gn @@ -16,7 +16,7 @@ source_set("event") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", ] } diff --git a/services/common/platform/lock/BUILD.gn b/services/common/platform/lock/BUILD.gn index e03b651..69cd9b4 100755 --- a/services/common/platform/lock/BUILD.gn +++ b/services/common/platform/lock/BUILD.gn @@ -16,5 +16,5 @@ source_set("lock") { cflags = [ "-fPIC" ] cflags_cc = cflags - include_dirs = [ "//foundation/ai/engine/services/common" ] + include_dirs = [ "//foundation/ai/ai_engine/services/common" ] } diff --git a/services/common/platform/os_wrapper/audio_loader/BUILD.gn b/services/common/platform/os_wrapper/audio_loader/BUILD.gn index c32dac2..79e72c5 100755 --- a/services/common/platform/os_wrapper/audio_loader/BUILD.gn +++ b/services/common/platform/os_wrapper/audio_loader/BUILD.gn @@ -14,15 +14,15 @@ import("//build/lite/config/component/lite_component.gni") config("libaudio_common_config") { include_dirs = [ - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include", - "//foundation/ai/engine/services/common/platform/os_wrapper/audio_loader/include/codec", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/engine/services/common/platform/utils", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/utils", - "//foundation/ai/engine/services/common/utils/log", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/audio_loader/include/codec", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/services/common/platform/utils", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/utils", + "//foundation/ai/ai_engine/services/common/utils/log", "//foundation/multimedia/audio_lite/interfaces/kits", "//foundation/multimedia/hals/camera_lite", "//foundation/multimedia/utils/lite/hals", diff --git a/services/common/platform/os_wrapper/feature/BUILD.gn b/services/common/platform/os_wrapper/feature/BUILD.gn index f673716..1cb7cc6 100644 --- a/services/common/platform/os_wrapper/feature/BUILD.gn +++ b/services/common/platform/os_wrapper/feature/BUILD.gn @@ -16,10 +16,10 @@ config("feature_config") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits/hilog", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/utils", - "//foundation/ai/engine/services/common/utils/log", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/utils", + "//foundation/ai/ai_engine/services/common/utils/log", "//third_party/bounds_checking_function/include", ] } diff --git a/services/common/platform/os_wrapper/ipc/BUILD.gn b/services/common/platform/os_wrapper/ipc/BUILD.gn index 0b3490e..b558132 100644 --- a/services/common/platform/os_wrapper/ipc/BUILD.gn +++ b/services/common/platform/os_wrapper/ipc/BUILD.gn @@ -17,7 +17,7 @@ source_set("aie_ipc") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/services/common", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//third_party/bounds_checking_function/include", ] diff --git a/services/common/platform/os_wrapper/utils/BUILD.gn b/services/common/platform/os_wrapper/utils/BUILD.gn index 667a985..e1793b7 100644 --- a/services/common/platform/os_wrapper/utils/BUILD.gn +++ b/services/common/platform/os_wrapper/utils/BUILD.gn @@ -14,13 +14,13 @@ import("//build/lite/config/component/lite_component.gni") config("os_wrapper_utils_config") { include_dirs = [ - "//foundation/ai/engine/interfaces/kits", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/protocol/struct_definition", - "//foundation/ai/engine/services/common/utils", - "//foundation/ai/engine/services/common/utils/encdec/include", - "//foundation/ai/engine/services/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/interfaces/kits", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/protocol/struct_definition", + "//foundation/ai/ai_engine/services/common/utils", + "//foundation/ai/ai_engine/services/common/utils/encdec/include", + "//foundation/ai/ai_engine/services/platform/os_wrapper/utils", ] } diff --git a/services/common/platform/semaphore/BUILD.gn b/services/common/platform/semaphore/BUILD.gn index e94e86b..ab9ac56 100755 --- a/services/common/platform/semaphore/BUILD.gn +++ b/services/common/platform/semaphore/BUILD.gn @@ -15,7 +15,7 @@ source_set("semaphore") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", ] } diff --git a/services/common/platform/threadpool/BUILD.gn b/services/common/platform/threadpool/BUILD.gn index fd0915c..e6dac23 100755 --- a/services/common/platform/threadpool/BUILD.gn +++ b/services/common/platform/threadpool/BUILD.gn @@ -20,9 +20,9 @@ source_set("threadpool") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", "//third_party/bounds_checking_function/include", ] - deps = [ "//foundation/ai/engine/services/common/platform/time:time" ] + deps = [ "//foundation/ai/ai_engine/services/common/platform/time:time" ] } diff --git a/services/common/platform/time/BUILD.gn b/services/common/platform/time/BUILD.gn index e958637..d63e51c 100755 --- a/services/common/platform/time/BUILD.gn +++ b/services/common/platform/time/BUILD.gn @@ -18,7 +18,7 @@ source_set("time") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/services/common", "//third_party/bounds_checking_function/include", ] } diff --git a/services/common/protocol/data_channel/BUILD.gn b/services/common/protocol/data_channel/BUILD.gn index d02c536..d5fc8f2 100755 --- a/services/common/protocol/data_channel/BUILD.gn +++ b/services/common/protocol/data_channel/BUILD.gn @@ -17,5 +17,5 @@ source_set("data_channel") { ] cflags = [ "-fPIC" ] cflags_cc = cflags - include_dirs = [ "//foundation/ai/engine/services/common" ] + include_dirs = [ "//foundation/ai/ai_engine/services/common" ] } diff --git a/services/common/utils/encdec/BUILD.gn b/services/common/utils/encdec/BUILD.gn index 167c1a9..d9ebdcb 100755 --- a/services/common/utils/encdec/BUILD.gn +++ b/services/common/utils/encdec/BUILD.gn @@ -20,8 +20,8 @@ source_set("encdec") { include_dirs = [ "include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", "//third_party/bounds_checking_function/include", ] } diff --git a/services/common/utils/file_operation/BUILD.gn b/services/common/utils/file_operation/BUILD.gn index b667577..942f8bd 100755 --- a/services/common/utils/file_operation/BUILD.gn +++ b/services/common/utils/file_operation/BUILD.gn @@ -17,7 +17,7 @@ source_set("fileOperation") { cflags_cc = cflags include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", ] } diff --git a/services/server/BUILD.gn b/services/server/BUILD.gn index e2cc61b..6a19814 100755 --- a/services/server/BUILD.gn +++ b/services/server/BUILD.gn @@ -31,12 +31,12 @@ lite_component("ai_server") { ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/engine/services/common/platform/event:event", - "//foundation/ai/engine/services/common/platform/lock:lock", - "//foundation/ai/engine/services/common/platform/os_wrapper/ipc:aie_ipc", - "//foundation/ai/engine/services/common/platform/semaphore:semaphore", - "//foundation/ai/engine/services/common/platform/threadpool:threadpool", + "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/ai_engine/services/common/platform/event:event", + "//foundation/ai/ai_engine/services/common/platform/lock:lock", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/ipc:aie_ipc", + "//foundation/ai/ai_engine/services/common/platform/semaphore:semaphore", + "//foundation/ai/ai_engine/services/common/platform/threadpool:threadpool", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] } diff --git a/services/server/CMakeLists.txt b/services/server/CMakeLists.txt index 36a847f..900889e 100644 --- a/services/server/CMakeLists.txt +++ b/services/server/CMakeLists.txt @@ -4,22 +4,22 @@ project(engine) set(CMAKE_CXX_STANDARD 14) include_directories(../../../../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog) -include_directories(../../../../../foundation/ai/engine/interfaces) -include_directories(../../../../../foundation/ai/engine/interfaces/kits) -include_directories(../../../../../foundation/ai/engine/interfaces/kits/asr) -include_directories(../../../../../foundation/ai/engine/interfaces/kits/cv/image_classification) -include_directories(../../../../../foundation/ai/engine/services/common) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/engine_hal/interfaces) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces) -include_directories(../../../../../foundation/ai/engine/services/common/platform/os_wrapper/utils) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/plugin_config) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/retcode_inner) -include_directories(../../../../../foundation/ai/engine/services/common/protocol/struct_definition) -include_directories(../../../../../foundation/ai/engine/services/common/utils) -include_directories(../../../../../foundation/ai/engine/services/common/utils/encdec/include) -include_directories(../../../../../foundation/ai/engine/services/common/utils/log) -include_directories(../../../../../foundation/ai/engine/services/server) +include_directories(../../../../../foundation/ai/ai_engine/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/asr) +include_directories(../../../../../foundation/ai/ai_engine/interfaces/kits/cv/image_classification) +include_directories(../../../../../foundation/ai/ai_engine/services/common) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/engine_hal/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces) +include_directories(../../../../../foundation/ai/ai_engine/services/common/platform/os_wrapper/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/plugin_config) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/retcode_inner) +include_directories(../../../../../foundation/ai/ai_engine/services/common/protocol/struct_definition) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/encdec/include) +include_directories(../../../../../foundation/ai/ai_engine/services/common/utils/log) +include_directories(../../../../../foundation/ai/ai_engine/services/server) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr) include_directories(../../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry) diff --git a/services/server/communication_adapter/BUILD.gn b/services/server/communication_adapter/BUILD.gn index fa207f5..6b6166b 100755 --- a/services/server/communication_adapter/BUILD.gn +++ b/services/server/communication_adapter/BUILD.gn @@ -22,9 +22,9 @@ static_library("ai_communication_adapter") { "source/start_server.c", ] include_dirs = [ - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", diff --git a/services/server/plugin/BUILD.gn b/services/server/plugin/BUILD.gn index bd13f6d..c734610 100644 --- a/services/server/plugin/BUILD.gn +++ b/services/server/plugin/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/ai/engine/services/ai_plugin_config.gni") +import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") lite_component("plugin") { features = [ diff --git a/services/server/plugin/asr/keyword_spotting/BUILD.gn b/services/server/plugin/asr/keyword_spotting/BUILD.gn index ad9b785..014d460 100755 --- a/services/server/plugin/asr/keyword_spotting/BUILD.gn +++ b/services/server/plugin/asr/keyword_spotting/BUILD.gn @@ -28,20 +28,20 @@ lite_library("asr_keyword_spotting") { cflags_cc = cflags include_dirs = [ "include", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/interfaces/kits", - "//foundation/ai/engine/interfaces/kits/asr", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/utils/encdec/include", - "//foundation/ai/engine/services/common/platform/os_wrapper/engine_hal/interfaces", - "//foundation/ai/engine/services/common/platform/os_wrapper", - "//foundation/ai/engine/services/common/protocol/struct_definition", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/protocol/plugin_config", - "//foundation/ai/engine/services/common/utils/log", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/engine/services/server", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/interfaces/kits", + "//foundation/ai/ai_engine/interfaces/kits/asr", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/utils/encdec/include", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/engine_hal/interfaces", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper", + "//foundation/ai/ai_engine/services/common/protocol/struct_definition", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/protocol/plugin_config", + "//foundation/ai/ai_engine/services/common/utils/log", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/services/server", ] ldflags = [ "-lstdc++" ] ldflags += [ "-lnnie" ] @@ -51,11 +51,11 @@ lite_library("asr_keyword_spotting") { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//device/soc/hisilicon/common/hal/ai:engine_nnie_sdk", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature:norm_processor_dep", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature:slide_window_processor_dep", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/engine/services/common/utils/encdec:encdec", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature:norm_processor_dep", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature:slide_window_processor_dep", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", "//third_party/bounds_checking_function:libsec_shared", ] } diff --git a/services/server/plugin/cv/image_classification/BUILD.gn b/services/server/plugin/cv/image_classification/BUILD.gn index a2d8b29..e734b8a 100755 --- a/services/server/plugin/cv/image_classification/BUILD.gn +++ b/services/server/plugin/cv/image_classification/BUILD.gn @@ -24,21 +24,21 @@ lite_library("cv_image_classification") { cflags_cc = cflags include_dirs = [ "include", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/interfaces/kits", - "//foundation/ai/engine/interfaces/kits/cv/image_classification", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/common/platform/os_wrapper", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils", - "//foundation/ai/engine/services/common/platform/os_wrapper/engine_hal/interfaces", - "//foundation/ai/engine/services/common/platform/os_wrapper/feature/interfaces", - "//foundation/ai/engine/services/common/protocol/struct_definition", - "//foundation/ai/engine/services/common/protocol/retcode_inner", - "//foundation/ai/engine/services/common/protocol/plugin_config", - "//foundation/ai/engine/services/common/utils", - "//foundation/ai/engine/services/common/utils/encdec/include", - "//foundation/ai/engine/services/common/utils/log", - "//foundation/ai/engine/services/server", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/interfaces/kits", + "//foundation/ai/ai_engine/interfaces/kits/cv/image_classification", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/engine_hal/interfaces", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/feature/interfaces", + "//foundation/ai/ai_engine/services/common/protocol/struct_definition", + "//foundation/ai/ai_engine/services/common/protocol/retcode_inner", + "//foundation/ai/ai_engine/services/common/protocol/plugin_config", + "//foundation/ai/ai_engine/services/common/utils", + "//foundation/ai/ai_engine/services/common/utils/encdec/include", + "//foundation/ai/ai_engine/services/common/utils/log", + "//foundation/ai/ai_engine/services/server", ] ldflags = [ "-lstdc++" ] ldflags += [ "-lnnie_adapter" ] @@ -46,9 +46,9 @@ lite_library("cv_image_classification") { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//device/soc/hisilicon/common/hal/ai:engine_nnie_sdk", - "//foundation/ai/engine/services/common/platform/os_wrapper/utils:plugin_helper", - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/engine/services/common/utils/encdec:encdec", + "//foundation/ai/ai_engine/services/common/platform/os_wrapper/utils:plugin_helper", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", "//third_party/bounds_checking_function:libsec_shared", ] } diff --git a/services/server/plugin_manager/BUILD.gn b/services/server/plugin_manager/BUILD.gn index 0ab46df..de0f87c 100755 --- a/services/server/plugin_manager/BUILD.gn +++ b/services/server/plugin_manager/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/ai/engine/services/ai_plugin_config.gni") +import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") action("gen_etc_ini") { outputs = [ "${root_out_dir}/etc/ai_engine_plugin.ini" ] @@ -35,9 +35,9 @@ source_set("plugin_manager") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces/", - "//foundation/ai/engine/services/common/", - "//foundation/ai/engine/services/server/", + "//foundation/ai/ai_engine/interfaces/", + "//foundation/ai/ai_engine/services/common/", + "//foundation/ai/ai_engine/services/server/", "//third_party/bounds_checking_function/include", ] } diff --git a/services/server/server_executor/BUILD.gn b/services/server/server_executor/BUILD.gn index edbc731..88ee5ed 100755 --- a/services/server/server_executor/BUILD.gn +++ b/services/server/server_executor/BUILD.gn @@ -28,13 +28,13 @@ source_set("server_executor") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", ] } diff --git a/test/BUILD.gn b/test/BUILD.gn index 2d28e51..907d8f5 100755 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/ai/engine/services/ai_plugin_config.gni") +import("//foundation/ai/ai_engine/services/ai_plugin_config.gni") lite_component("test") { features = [ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b63ba4e..4ff775c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,14 +4,14 @@ project(engine) set(CMAKE_CXX_STANDARD 14) include_directories(../../../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog) -include_directories(../../../../foundation/ai/engine/interfaces) -include_directories(../../../../foundation/ai/engine/services/client) -include_directories(../../../../foundation/ai/engine/services/common) -include_directories(../../../../foundation/ai/engine/services/server) -include_directories(../../../../foundation/ai/engine/test) -include_directories(../../../../foundation/ai/engine/test/common/dl_operation/dl_operation_so/include) -include_directories(../../../../foundation/ai/engine/test/performance) -include_directories(../../../../foundation/ai/engine/test/utils) +include_directories(../../../../foundation/ai/ai_engine/interfaces) +include_directories(../../../../foundation/ai/ai_engine/services/client) +include_directories(../../../../foundation/ai/ai_engine/services/common) +include_directories(../../../../foundation/ai/ai_engine/services/server) +include_directories(../../../../foundation/ai/ai_engine/test) +include_directories(../../../../foundation/ai/ai_engine/test/common/dl_operation/dl_operation_so/include) +include_directories(../../../../foundation/ai/ai_engine/test/performance) +include_directories(../../../../foundation/ai/ai_engine/test/utils) include_directories(../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry) include_directories(../../../../foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr) include_directories(../../../../foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry) diff --git a/test/common/BUILD.gn b/test/common/BUILD.gn index 03af586..23008a8 100755 --- a/test/common/BUILD.gn +++ b/test/common/BUILD.gn @@ -22,19 +22,19 @@ unittest("ai_test_common_door") { ] include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/common", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/common", "//third_party/googletest/googletest/include", "//third_party/googletest/googletest/src", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/engine/services/common/platform/event:event", - "//foundation/ai/engine/services/common/platform/semaphore:semaphore", - "//foundation/ai/engine/services/common/platform/threadpool:threadpool", - "//foundation/ai/engine/services/common/platform/time:time", - "//foundation/ai/engine/services/common/utils/encdec:encdec", + "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/ai_engine/services/common/platform/event:event", + "//foundation/ai/ai_engine/services/common/platform/semaphore:semaphore", + "//foundation/ai/ai_engine/services/common/platform/threadpool:threadpool", + "//foundation/ai/ai_engine/services/common/platform/time:time", + "//foundation/ai/ai_engine/services/common/utils/encdec:encdec", ] sources = [ "dl_operation/dl_operation_test.cpp", diff --git a/test/common/dl_operation/dl_operation_so/BUILD.gn b/test/common/dl_operation/dl_operation_so/BUILD.gn index 2a8d7a2..2ea7ca4 100755 --- a/test/common/dl_operation/dl_operation_so/BUILD.gn +++ b/test/common/dl_operation/dl_operation_so/BUILD.gn @@ -17,6 +17,6 @@ shared_library("dlOperationSo") { cflags = [ "-fPIC" ] cflags_cc = cflags include_dirs = [ - "//foundation/ai/engine/test/common/dl_operation/dl_operation_so/include", + "//foundation/ai/ai_engine/test/common/dl_operation/dl_operation_so/include", ] } diff --git a/test/function/BUILD.gn b/test/function/BUILD.gn index e831938..54c584e 100644 --- a/test/function/BUILD.gn +++ b/test/function/BUILD.gn @@ -22,11 +22,11 @@ unittest("ai_test_function_door") { ] include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", - "//foundation/ai/engine/test/utils", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", + "//foundation/ai/ai_engine/test/utils", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", @@ -37,13 +37,13 @@ unittest("ai_test_function_door") { ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:client", - "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/engine/services/common/platform/lock:lock", - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/engine/services/server/plugin_manager:plugin_manager", - "//foundation/ai/engine/test/sample:sample_plugin_1", - "//foundation/ai/engine/test/sample:sample_plugin_2", + "//foundation/ai/ai_engine/services/client:client", + "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/ai_engine/services/common/platform/lock:lock", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/server/plugin_manager:plugin_manager", + "//foundation/ai/ai_engine/test/sample:sample_plugin_1", + "//foundation/ai/ai_engine/test/sample:sample_plugin_2", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] sources = [ diff --git a/test/function/death_callback/BUILD.gn b/test/function/death_callback/BUILD.gn index 4ae8c92..0930cc6 100755 --- a/test/function/death_callback/BUILD.gn +++ b/test/function/death_callback/BUILD.gn @@ -17,10 +17,10 @@ static_library("testDeathCallbackLibrary") { cflags_cc = [ "-fexceptions" ] include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/test/utils", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/test/utils", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr", @@ -38,7 +38,7 @@ lite_component("testDeathCallback") { ldflags = [ "-lstdc++" ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:ai_client", + "//foundation/ai/ai_engine/services/client:ai_client", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] } diff --git a/test/performance/BUILD.gn b/test/performance/BUILD.gn index 92eef76..9ddf7f3 100644 --- a/test/performance/BUILD.gn +++ b/test/performance/BUILD.gn @@ -23,22 +23,22 @@ unittest("ai_test_performance_unittest") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/interfaces", - "//foundation/ai/engine/services/client", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/test/utils", - "//foundation/ai/engine/test/performance", + "//foundation/ai/ai_engine/interfaces", + "//foundation/ai/ai_engine/services/client", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/test/utils", + "//foundation/ai/ai_engine/test/performance", "//commonlibrary/utils_lite/include", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/ai/engine/services/client:client", - "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", - "//foundation/ai/engine/services/common/platform/lock:lock", - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - "//foundation/ai/engine/services/server/plugin_manager:plugin_manager", - "//foundation/ai/engine/test/sample:sample_plugin_1", - "//foundation/ai/engine/test/sample:sample_plugin_2", + "//foundation/ai/ai_engine/services/client:client", + "//foundation/ai/ai_engine/services/common/platform/dl_operation:dlOperation", + "//foundation/ai/ai_engine/services/common/platform/lock:lock", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/server/plugin_manager:plugin_manager", + "//foundation/ai/ai_engine/test/sample:sample_plugin_1", + "//foundation/ai/ai_engine/test/sample:sample_plugin_2", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", ] sources = [ diff --git a/test/sample/BUILD.gn b/test/sample/BUILD.gn index 4658435..a7c7557 100644 --- a/test/sample/BUILD.gn +++ b/test/sample/BUILD.gn @@ -20,9 +20,9 @@ source_set("syncDemoPluginCode") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", - "//foundation/ai/engine/test", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", + "//foundation/ai/ai_engine/test", "//third_party/bounds_checking_function/include", ] } @@ -33,7 +33,7 @@ lite_component("sample_plugin_1") { cflags_cc = cflags features = [ ":syncDemoPluginCode" ] deps = [ - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", ] } @@ -45,9 +45,9 @@ source_set("asyncDemoPluginCode") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", - "//foundation/ai/engine/services/common", - "//foundation/ai/engine/services/server", - "//foundation/ai/engine/test", + "//foundation/ai/ai_engine/services/common", + "//foundation/ai/ai_engine/services/server", + "//foundation/ai/ai_engine/test", "//third_party/bounds_checking_function/include", ] } @@ -58,6 +58,6 @@ lite_component("sample_plugin_2") { cflags_cc = cflags features = [ ":asyncDemoPluginCode" ] deps = [ - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", + "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", ] } -- Gitee From 83e3a936aa0c3192c8a26f7c780e5ff9f0373dfa Mon Sep 17 00:00:00 2001 From: fwx1157193 Date: Thu, 15 Sep 2022 14:55:01 +0800 Subject: [PATCH 4/4] format Signed-off-by: bwx1095090 --- services/server/server_executor/BUILD.gn | 4 +--- test/common/dl_operation/dl_operation_so/BUILD.gn | 4 +--- test/sample/BUILD.gn | 8 ++------ 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/services/server/server_executor/BUILD.gn b/services/server/server_executor/BUILD.gn index 88ee5ed..ced0c1d 100755 --- a/services/server/server_executor/BUILD.gn +++ b/services/server/server_executor/BUILD.gn @@ -34,7 +34,5 @@ source_set("server_executor") { "//third_party/bounds_checking_function/include", ] - deps = [ - "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", - ] + deps = [ "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel" ] } diff --git a/test/common/dl_operation/dl_operation_so/BUILD.gn b/test/common/dl_operation/dl_operation_so/BUILD.gn index 2ea7ca4..8535dc0 100755 --- a/test/common/dl_operation/dl_operation_so/BUILD.gn +++ b/test/common/dl_operation/dl_operation_so/BUILD.gn @@ -16,7 +16,5 @@ shared_library("dlOperationSo") { sources = [ "source/dl_operation_fun.cpp" ] cflags = [ "-fPIC" ] cflags_cc = cflags - include_dirs = [ - "//foundation/ai/ai_engine/test/common/dl_operation/dl_operation_so/include", - ] + include_dirs = [ "//foundation/ai/ai_engine/test/common/dl_operation/dl_operation_so/include" ] } diff --git a/test/sample/BUILD.gn b/test/sample/BUILD.gn index a7c7557..062e50c 100644 --- a/test/sample/BUILD.gn +++ b/test/sample/BUILD.gn @@ -32,9 +32,7 @@ lite_component("sample_plugin_1") { cflags = [ "-fPIC" ] cflags_cc = cflags features = [ ":syncDemoPluginCode" ] - deps = [ - "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", - ] + deps = [ "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel" ] } source_set("asyncDemoPluginCode") { @@ -57,7 +55,5 @@ lite_component("sample_plugin_2") { cflags = [ "-fPIC" ] cflags_cc = cflags features = [ ":asyncDemoPluginCode" ] - deps = [ - "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel", - ] + deps = [ "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel" ] } -- Gitee