diff --git a/README.md b/README.md index c6b1d94e58d655a50f50c0fee81d063a1049865b..5afc0f713d593715d666bccb44b2f02edaf6e4e4 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 d6047be300586568ddc0613912c180e2e60ee2a2..63bc9816dd76b986aec836b4d420cd3810339cda 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 21af6310800be746664d7588909a0551c077aa3f..dff2888aa5a0dc5b45d9c3d14d098d8c429ec743 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 729cb7f4d9c5c85eb995b1b6070e78a9377b8a68..de0f81829db67628c1a38bc8e0ab702b4c585081 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 7e2ba73eaf634e873e399ef1578badcc9fe2e5ce..d500022f0931f0bc635696ac48e080bb20a6a7d9 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 f187802c8de0e87cae52fa39f9651ec05804aa64..97811e157457fc6852da6fab71b27c951c78fd5b 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 d48b6af936f02adc945d93e11c682cf5412b206d..d170c668479972b4060987cb89c2bb9b8c1a0f13 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 f64f5e9f5735838a9e3f1f0bcd4de48b6e55a8dd..bd637b8041c16e266e4974b044caa5350135955a 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 a491b090c7622eac6dd746689c575399edcbaf4e..4e33bf1c73edc2740d63ff5606f723dab1b37435 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 78ce64a8e96fe81ba6eba653aea5cff81714b121..956b4856baa2e8c35f53fc3b4fb00cbf964888a7 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 5759eed65adf775d144529ecb2c3b571f7603a55..b77f16f66b9c15f8216d43f04e0b2506e0acee3b 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 496788669054b2c821c28ad04a247db2ecd19bc5..fa1e4d22e5b4495c2ade34e5145c27bc4a2987d4 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 e03b651af337a34c3073c4baf958ad50c48f96d2..69cd9b46198949d4e210a23569c3f54b2174ab1e 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 c32dac20cbce66bc034c1cd96a1ff82bbaebb51a..79e72c554aceddd30cc93cb57ffe9ce1d40222c9 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 f6737164e12e64d715e609fbebf8a30215f4409b..1cb7cc63186b794d88d412380742f5bc12f7da2c 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 0b3490e9e23b986bc0846d51d2776ed594000fb3..b558132e065036c57b0d9bece00f5b967bffa97c 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 667a9853f370267b19712d3170bfb30206747f40..e1793b70374eea91700eb32ce42d1b144a023e9b 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 e94e86be4c06ab653ca758fd8d9c2305b8c3dbc7..ab9ac56d1d943faceb5a04bb1f5698bc00ae2efa 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 fd0915cee2f3aabf14e7d653c8331570e8b47e20..e6dac232e0a19d34a63ad7857fc4c3db3d2cf6af 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 e958637d4f302e74bb7e4f4e209f32fe1dd9168b..d63e51c7deb0b9efd4100c3137e0e32b8d7b7a8e 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 d02c536aae70fb64fc9b028fe11a68b842f16536..d5fc8f2df7c612b16771a03230d5e23318c9b3b0 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 167c1a9ff3973549ba526f223ef0b0f1d6cd3479..d9ebdcb4703e87174125f79f4a31e56c63cbefd3 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 b667577d1a0ec673ce6793fa8c3feb985574182a..942f8bdacd3261386a53cc3172bec67bfc113f5c 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 e2cc61b57bb6e35874f99746fa52056ce2009190..6a19814e67458893927a25ffaace87ce077da08a 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 36a847febf5e717030097c3e97432b2636789d91..900889eca4a5912f68fea01d7846276b235648df 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 fa207f500056e38bebbffed852872e5a2cea961b..6b6166b6e82b850f22e138a2f358ad7dafea939f 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 bd13f6dbd93ea958bb00a1627bf7f004480b68c6..c734610bb32e46d2ce49d351d4741033831a0415 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 ad9b78557aaf828b97d0715566da1d46ee970685..014d460b57a282d3bfe939d18b969458b7b61b68 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 a2d8b29b441872696e0bdbe69b658a81ddc5b2e8..e734b8af6c63d48b7ae024664490dd31f2d69318 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 0ab46df82c66daa0d9bba9acd01d8579bcb06bc6..de0f87cfc7928093dae1aa76cdedb35e37568099 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 edbc73196a70bf15144decc13b273300821255df..ced0c1d6ae2ed56dff52f2745535a12ddba47742 100755 --- a/services/server/server_executor/BUILD.gn +++ b/services/server/server_executor/BUILD.gn @@ -28,13 +28,11 @@ 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", - ] + deps = [ "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel" ] } diff --git a/test/BUILD.gn b/test/BUILD.gn index 2d28e51da7c90af4885310e2b0e99cb93335993c..907d8f54cbdb69f0252a473bb396e2df5c9ef061 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 b63ba4edace891f64bafbdb7f7a9084f30ada6ee..4ff775c80288437340cfabc1f0a9878c1dff999b 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 03af586cfea8b15fbfd01958207cd20692d6b093..23008a8dd485df489a39de39f181fe577f589374 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 2a8d7a2de184c9c59ab56aa219150c8c45b2d24b..8535dc0838abf7c42edc68e03ca599a14ee4b457 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/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/function/BUILD.gn b/test/function/BUILD.gn index e831938932e9e5593728ca4e3f510ea6169d8716..54c584e50a86db59804c4d4a5a36f3c4a8b41a8f 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 4ae8c9213053cbdd50163acfecb3da8fbe4e4c3e..0930cc6cac8461865f21b112e8382e57267c88e5 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 92eef767e5a61b73643eb99bb5a706b9ffabfe74..9ddf7f3e5dc7bcd00ca7449cb3012c7e6770df02 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 4658435dd85ea65199efdd3a496dcd1a01d6161f..062e50c4a6745728e96109e12434b488841af37f 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", ] } @@ -32,9 +32,7 @@ lite_component("sample_plugin_1") { cflags = [ "-fPIC" ] cflags_cc = cflags features = [ ":syncDemoPluginCode" ] - deps = [ - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - ] + deps = [ "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel" ] } source_set("asyncDemoPluginCode") { @@ -45,9 +43,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", ] } @@ -57,7 +55,5 @@ lite_component("sample_plugin_2") { cflags = [ "-fPIC" ] cflags_cc = cflags features = [ ":asyncDemoPluginCode" ] - deps = [ - "//foundation/ai/engine/services/common/protocol/data_channel:data_channel", - ] + deps = [ "//foundation/ai/ai_engine/services/common/protocol/data_channel:data_channel" ] }