From d3cc69c613f32f4e7ad666f16cc800e0cd26d81d Mon Sep 17 00:00:00 2001 From: hlzhangaj Date: Thu, 25 Jul 2024 07:51:28 +0000 Subject: [PATCH] mindspore:mindir_lib test Signed-off-by: hlzhangaj --- .../native/neural_network_runtime/BUILD.gn | 2 +- test/unittest/components/BUILD.gn | 72 +++++++------------ test/unittest/inner_kits/BUILD.gn | 2 +- test/unittest/ops/BUILD.gn | 2 +- 4 files changed, 28 insertions(+), 50 deletions(-) diff --git a/frameworks/native/neural_network_runtime/BUILD.gn b/frameworks/native/neural_network_runtime/BUILD.gn index cf98d69..c4c0335 100644 --- a/frameworks/native/neural_network_runtime/BUILD.gn +++ b/frameworks/native/neural_network_runtime/BUILD.gn @@ -189,7 +189,7 @@ ohos_shared_library("libneural_network_runtime") { "hilog:libhilog", "hitrace:libhitracechain", "ipc:ipc_core", - "mindspore:mindir", + "mindspore:mindir_lib", ] deps = [ "../neural_network_core:libneural_network_core" ] diff --git a/test/unittest/components/BUILD.gn b/test/unittest/components/BUILD.gn index ef821b2..5ded84e 100644 --- a/test/unittest/components/BUILD.gn +++ b/test/unittest/components/BUILD.gn @@ -48,7 +48,7 @@ ohos_unittest("CompilationV1_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -71,7 +71,7 @@ ohos_unittest("ExecutorV1_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -94,7 +94,7 @@ ohos_unittest("DeviceManagerV1_0Test") { "drivers_interface_nnrt:libnnrt_proxy_1.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -117,7 +117,7 @@ ohos_unittest("DeviceRegistrarV1_0Test") { "drivers_interface_nnrt:libnnrt_proxy_1.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -141,7 +141,7 @@ ohos_unittest("HDIDeviceV1_0Test") { "drivers_interface_nnrt:libnnrt_proxy_1.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -165,7 +165,7 @@ ohos_unittest("HDIPreparedModelV1_0Test") { "drivers_interface_nnrt:libnnrt_proxy_1.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -187,7 +187,7 @@ ohos_unittest("MemoryManagerTest") { "drivers_interface_nnrt:libnnrt_proxy_1.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -313,26 +313,6 @@ ohos_unittest("NNExecutorTest") { ] } -ohos_unittest("NNTensor2_0Test") { - module_out_path = module_output_path - - sources = [ "./nn_tensor/nn_tensor_test.cpp" ] - configs = [ ":module_private_config" ] - - deps = [ - "../../../frameworks/native/neural_network_core:libneural_network_core", - "../../../frameworks/native/neural_network_runtime:libneural_network_runtime", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] - - external_deps = [ - "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", - ] -} - ohos_unittest("TransformV1_0Test") { module_out_path = module_output_path @@ -350,7 +330,7 @@ ohos_unittest("TransformV1_0Test") { "drivers_interface_nnrt:libnnrt_proxy_1.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -374,7 +354,7 @@ ohos_unittest("InnerModelV1_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -397,7 +377,7 @@ ohos_unittest("NnTensorV1_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -442,7 +422,7 @@ ohos_unittest("NnValidationV1_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -465,7 +445,7 @@ ohos_unittest("OpsRegistryV1_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -491,7 +471,7 @@ ohos_unittest("NeuralNetworkRuntimeV1_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -514,7 +494,7 @@ ohos_unittest("CompilationV2_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -537,7 +517,7 @@ ohos_unittest("ExecutorV2_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -560,7 +540,7 @@ ohos_unittest("DeviceManagerV2_0Test") { "drivers_interface_nnrt:libnnrt_proxy_2.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -583,7 +563,7 @@ ohos_unittest("DeviceRegistrarV2_0Test") { "drivers_interface_nnrt:libnnrt_proxy_2.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -607,7 +587,7 @@ ohos_unittest("HDIDeviceV2_0Test") { "drivers_interface_nnrt:libnnrt_proxy_2.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -631,7 +611,7 @@ ohos_unittest("HDIPreparedModelV2_0Test") { "drivers_interface_nnrt:libnnrt_proxy_2.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -675,7 +655,7 @@ ohos_unittest("TransformV2_0Test") { "drivers_interface_nnrt:libnnrt_proxy_2.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -699,7 +679,7 @@ ohos_unittest("InnerModelV2_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -722,7 +702,7 @@ ohos_unittest("NnTensorV2_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -745,7 +725,7 @@ ohos_unittest("NnValidationV2_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -768,7 +748,7 @@ ohos_unittest("OpsRegistryV2_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } @@ -794,14 +774,13 @@ ohos_unittest("NeuralNetworkRuntimeV2_0Test") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } group("components_unittest") { testonly = true deps = [ - ":DeviceManagerV1_0Test", ":HDIDeviceV1_0Test", ":HDIDeviceV2_0Test", ":HDIPreparedModelV1_0Test", @@ -814,7 +793,6 @@ group("components_unittest") { ":NNCompiledCacheTest", ":NNCompilerTest", ":NNExecutorTest", - ":NNTensor2_0Test", ":NeuralNetworkCoreV1_0Test", ":NeuralNetworkRuntimeV1_0Test", ":NeuralNetworkRuntimeV2_0Test", diff --git a/test/unittest/inner_kits/BUILD.gn b/test/unittest/inner_kits/BUILD.gn index 9f90993..f737b17 100644 --- a/test/unittest/inner_kits/BUILD.gn +++ b/test/unittest/inner_kits/BUILD.gn @@ -55,7 +55,7 @@ ohos_unittest("NeuralNetworkRuntimeInnerTest") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "mindspore:mindir_lib", ] } diff --git a/test/unittest/ops/BUILD.gn b/test/unittest/ops/BUILD.gn index e11bc3b..d81ec29 100644 --- a/test/unittest/ops/BUILD.gn +++ b/test/unittest/ops/BUILD.gn @@ -166,7 +166,7 @@ ohos_unittest("OpsUnittest") { "drivers_interface_nnrt:libnnrt_proxy_2.1", "hilog:libhilog", "hitrace:hitrace_meter", - "mindspore:mindir", + "mindspore:mindir_lib", ] } -- Gitee