From ea6f6aaa5bef9f1e18c66f99638502817f5d9018 Mon Sep 17 00:00:00 2001 From: scholar-lc <1936194231@qq.com> Date: Wed, 21 Jun 2023 11:08:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20nnrt=20=E4=BB=93=E4=B8=8B?= =?UTF-8?q?=20BUILD.gn=20=E6=96=87=E4=BB=B6=E4=B8=AD=E6=89=80=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E7=9A=84=E9=83=A8=E4=BB=B6=E5=90=8D=20hilog=5Fnative?= =?UTF-8?q?=E4=B8=8Ehiviewdfx=5Fhilog=5Fnative?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: scholar-lc <1936194231@qq.com> --- bundle.json | 2 +- .../nnrt/v1_0/hdi_cpu_service/BUILD.gn | 4 +-- .../nnrt/v2_0/hdi_cpu_service/BUILD.gn | 4 +-- frameworks/BUILD.gn | 2 +- test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn | 4 +-- .../hdinnrtpreparedmodel_fuzzer/BUILD.gn | 4 +-- test/system_test/BUILD.gn | 4 +-- test/unittest/components/BUILD.gn | 26 +++++++++---------- test/unittest/inner_kits/BUILD.gn | 2 +- test/unittest/ops/BUILD.gn | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bundle.json b/bundle.json index 8ace6a8..00970fe 100644 --- a/bundle.json +++ b/bundle.json @@ -26,7 +26,7 @@ "c_utils", "drivers_interface_nnrt", "hdf_core", - "hilog_native", + "hilog", "hitrace", "mindspore" ], diff --git a/example/drivers/nnrt/v1_0/hdi_cpu_service/BUILD.gn b/example/drivers/nnrt/v1_0/hdi_cpu_service/BUILD.gn index f17b0ce..a23a5c4 100644 --- a/example/drivers/nnrt/v1_0/hdi_cpu_service/BUILD.gn +++ b/example/drivers/nnrt/v1_0/hdi_cpu_service/BUILD.gn @@ -42,7 +42,7 @@ ohos_shared_library("libnnrt_device_service_1.0") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_stub_1.0", "hdf_core:libhdf_utils", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", ] @@ -63,7 +63,7 @@ ohos_shared_library("libnnrt_driver") { "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", "hdf_core:libhdi", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", ] diff --git a/example/drivers/nnrt/v2_0/hdi_cpu_service/BUILD.gn b/example/drivers/nnrt/v2_0/hdi_cpu_service/BUILD.gn index 6ed9f68..8bada1b 100644 --- a/example/drivers/nnrt/v2_0/hdi_cpu_service/BUILD.gn +++ b/example/drivers/nnrt/v2_0/hdi_cpu_service/BUILD.gn @@ -42,7 +42,7 @@ ohos_shared_library("libnnrt_device_service_2.0") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_stub_2.0", "hdf_core:libhdf_utils", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", ] @@ -63,7 +63,7 @@ ohos_shared_library("libnnrt_driver") { "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", "hdf_core:libhdi", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", ] diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index 347d4f4..3263b30 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -124,7 +124,7 @@ ohos_shared_library("libneural_network_runtime") { "drivers_interface_nnrt:libnnrt_proxy_1.0", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hdf_core:libhdf_utils", - "hilog_native:libhilog", + "hilog:libhilog", "hitrace:libhitracechain", "mindspore:mindir", ] diff --git a/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn b/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn index 49bd2b8..d14bd87 100644 --- a/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn +++ b/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn @@ -9,7 +9,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # 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. +# limitations under the License. #####################hydra-fuzz################### import("//build/config/features.gni") @@ -37,7 +37,7 @@ ohos_fuzztest("HdiNnrtDeviceFuzzTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_stub_2.0", "hdf_core:libhdi", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", ] } diff --git a/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn b/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn index 5eed6bd..9688db0 100644 --- a/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn +++ b/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn @@ -9,7 +9,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # 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. +# limitations under the License. #####################hydra-fuzz################### import("//build/config/features.gni") @@ -42,7 +42,7 @@ ohos_fuzztest("HdiNnrtPreparedModelFuzzTest") { "drivers_interface_nnrt:libnnrt_proxy_2.0", "drivers_interface_nnrt:libnnrt_stub_2.0", "hdf_core:libhdi", - "hilog_native:libhilog", + "hilog:libhilog", "ipc:ipc_core", "mindspore:mindir", "neural_network_runtime:nnrt_target", diff --git a/test/system_test/BUILD.gn b/test/system_test/BUILD.gn index 2436d69..95ef4a7 100644 --- a/test/system_test/BUILD.gn +++ b/test/system_test/BUILD.gn @@ -45,8 +45,8 @@ ohos_systemtest("DeviceTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", ] } @@ -68,9 +68,9 @@ ohos_systemtest("End2EndTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } diff --git a/test/unittest/components/BUILD.gn b/test/unittest/components/BUILD.gn index 53e4ac9..a9d0e39 100644 --- a/test/unittest/components/BUILD.gn +++ b/test/unittest/components/BUILD.gn @@ -43,8 +43,8 @@ ohos_unittest("CompilationTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -66,8 +66,8 @@ ohos_unittest("ExecutorTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -88,8 +88,8 @@ ohos_unittest("DeviceManagerTest") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -110,8 +110,8 @@ ohos_unittest("DeviceRegistrarTest") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -133,8 +133,8 @@ ohos_unittest("HDIDeviceTest") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -156,8 +156,8 @@ ohos_unittest("HDIPreparedModelTest") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -177,8 +177,8 @@ ohos_unittest("MemoryManagerTest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -197,8 +197,8 @@ ohos_unittest("TransformTest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -220,8 +220,8 @@ ohos_unittest("InnerModelTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -242,8 +242,8 @@ ohos_unittest("NnTensorTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -264,8 +264,8 @@ ohos_unittest("NnValidationTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -286,8 +286,8 @@ ohos_unittest("OpsRegistryTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } @@ -310,8 +310,8 @@ ohos_unittest("NeuralNetworkRuntimeTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } diff --git a/test/unittest/inner_kits/BUILD.gn b/test/unittest/inner_kits/BUILD.gn index be46c5f..68848df 100644 --- a/test/unittest/inner_kits/BUILD.gn +++ b/test/unittest/inner_kits/BUILD.gn @@ -50,8 +50,8 @@ ohos_unittest("NeuralNetworkRuntimeInnerTest") { "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", + "hilog:libhilog", "hitrace:libhitracechain", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } diff --git a/test/unittest/ops/BUILD.gn b/test/unittest/ops/BUILD.gn index 4386b66..7f65e52 100644 --- a/test/unittest/ops/BUILD.gn +++ b/test/unittest/ops/BUILD.gn @@ -105,8 +105,8 @@ ohos_unittest("OpsUnittest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", + "hilog:libhilog", "hitrace:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", "mindspore:mindir", ] } -- Gitee