From 0ea3df70df10f0abb574fa5a5b7efb4babb3131d Mon Sep 17 00:00:00 2001 From: w30052974 Date: Thu, 27 Feb 2025 14:53:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?nnrt=20=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: w30052974 --- .../delegates/nnrt_delegate/nnrt_delegate.h | 2 +- .../nnrt_delegate/nnrt_delegate_provider.cpp | 2 +- .../delegates/nnrt_delegate/nnrt_op_builder.h | 2 +- .../tflite/tools/utils.h | 2 +- .../native/neural_network_core/BUILD.gn | 1 + .../native/neural_network_core/backend.h | 2 +- .../neural_network_core/backend_manager.h | 2 +- .../neural_network_core/backend_registrar.cpp | 4 +- .../native/neural_network_core/compilation.h | 2 +- .../native/neural_network_core/compiler.h | 2 +- .../native/neural_network_core/cpp_type.h | 2 +- .../native/neural_network_core/executor.h | 2 +- .../neural_network_core.cpp | 4 +- .../neural_network_core/nnrt_client.cpp | 2 +- .../neural_network_core/tensor_desc.cpp | 2 +- .../native/neural_network_core/tensor_desc.h | 2 +- .../native/neural_network_core/utils.cpp | 2 +- .../native/neural_network_core/validation.h | 4 +- .../native/neural_network_runtime/BUILD.gn | 1 + .../native/neural_network_runtime/device.h | 2 +- .../hdi_device_v1_0.cpp | 4 +- .../hdi_device_v2_0.cpp | 4 +- .../hdi_device_v2_1.cpp | 4 +- .../hdi_prepared_model_v1_0.cpp | 2 +- .../hdi_prepared_model_v2_0.cpp | 2 +- .../hdi_prepared_model_v2_1.cpp | 2 +- .../hdi_returncode_utils.h | 2 +- .../hdi_returncode_utils_v2_1.h | 2 +- .../neural_network_runtime/inner_model.cpp | 4 +- .../neural_network_runtime/inner_model.h | 4 +- .../lite_graph_to_hdi_model_v1_0.cpp | 2 +- .../lite_graph_to_hdi_model_v2_0.cpp | 2 +- .../lite_graph_to_hdi_model_v2_1.cpp | 2 +- .../neural_network_runtime/memory_manager.cpp | 2 +- .../neural_network_runtime/memory_manager.h | 2 +- .../neural_network_runtime.cpp | 6 +- .../neural_network_runtime_compat.cpp | 6 +- .../neural_network_runtime/nn_tensor.cpp | 2 +- .../native/neural_network_runtime/nn_tensor.h | 4 +- .../neural_network_runtime/nnbackend.cpp | 4 +- .../nncompiled_cache.cpp | 2 +- .../neural_network_runtime/nncompiled_cache.h | 2 +- .../neural_network_runtime/nncompiler.cpp | 2 +- .../neural_network_runtime/nnexecutor.cpp | 6 +- .../neural_network_runtime/nntensor.cpp | 4 +- .../ops/strided_slice_builder.cpp | 2 +- .../neural_network_runtime/ops_builder.h | 4 +- .../neural_network_runtime/ops_registry.h | 2 +- .../neural_network_runtime/prepared_model.h | 2 +- .../neural_network_runtime/quant_param.cpp | 2 +- .../neural_network_runtime/quant_param.h | 2 +- .../register_hdi_device_v1_0.cpp | 4 +- .../register_hdi_device_v2_0.cpp | 4 +- .../register_hdi_device_v2_1.cpp | 4 +- .../neural_network_runtime/transform.cpp | 2 +- .../native/neural_network_runtime/transform.h | 2 +- .../c/neural_network_runtime_inner.h | 2 +- test/fuzztest/data.h | 2 +- test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn | 5 +- .../hdinnrtdevice_fuzzer.cpp | 6 +- .../hdinnrtpreparedmodel_fuzzer/BUILD.gn | 5 +- .../hdinnrtpreparedmodel_fuzzer.cpp | 6 +- test/fuzztest/nnrt_device_impl.h | 2 +- test/fuzztest/nnrt_prepare_model_impl.h | 2 +- test/system_test/common/nnrt_test.cpp | 2 +- test/system_test/common/nnrt_test.h | 2 +- test/system_test/device_test.cpp | 2 +- test/system_test/end_to_end_test.cpp | 4 +- test/system_test/end_to_end_test.h | 2 +- test/unittest/common/file_utils.cpp | 2 +- .../common/v1_0/compilation_mock_idevice.cpp | 2 +- .../common/v1_0/inner_model_mock_device.cpp | 2 +- .../common/v2_0/compilation_mock_idevice.cpp | 2 +- .../common/v2_0/inner_model_mock_device.cpp | 2 +- test/unittest/components/BUILD.gn | 439 +++++++----------- .../components/nn_backend/nn_backend_test.cpp | 2 +- .../nn_compiled_cache_test.cpp | 4 +- .../nn_compiler/nn_compiler_test.cpp | 4 +- .../nn_executor/nn_executor_test.cpp | 6 +- .../components/nn_tensor/nn_tensor_test.cpp | 6 +- .../device_manager/device_manager_test.cpp | 4 +- .../device_registrar_test.cpp | 2 +- .../v1_0/executor/executor_test.cpp | 2 +- .../hdi_prepared_model_test.cpp | 2 +- .../v1_0/inner_model/inner_model_test.cpp | 6 +- .../neural_network_core_test.cpp | 6 +- .../neural_network_core_test.h | 2 +- .../neural_network_runtime_test.cpp | 2 +- .../neural_network_runtime_test.h | 2 +- .../device_manager/device_manager_test.cpp | 2 +- .../device_registrar_test.cpp | 2 +- .../v2_0/executor/executor_test.cpp | 2 +- .../v2_0/hdi_device/hdi_device_test.cpp | 4 +- .../hdi_prepared_model_test.cpp | 2 +- .../v2_0/inner_model/inner_model_test.cpp | 6 +- .../neural_network_runtime_test.cpp | 2 +- .../neural_network_runtime_test.h | 2 +- .../hdi_prepared_model_test.cpp | 2 +- test/unittest/inner_kits/BUILD.gn | 20 +- test/unittest/ops/BUILD.gn | 19 +- 100 files changed, 322 insertions(+), 434 deletions(-) diff --git a/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_delegate.h b/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_delegate.h index 681e069..50588bc 100644 --- a/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_delegate.h +++ b/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_delegate.h @@ -24,7 +24,7 @@ #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/delegates/serialization.h" -#include "../nnrt/nnrt_implementation.h" +#include "nnrt_implementation.h" namespace tflite { namespace delegate { diff --git a/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_delegate_provider.cpp b/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_delegate_provider.cpp index e7592a3..6bcd7f1 100644 --- a/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_delegate_provider.cpp +++ b/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_delegate_provider.cpp @@ -19,7 +19,7 @@ #include "tensorflow/lite/tools/delegates/delegate_provider.h" #include "nnrt_delegate.h" -#include "../nnrt/nnrt_implementation.h" +#include "nnrt_implementation.h" namespace tflite { namespace tools { diff --git a/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_op_builder.h b/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_op_builder.h index bb4e823..5753075 100644 --- a/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_op_builder.h +++ b/example/deep_learning_framework/tflite/delegates/nnrt_delegate/nnrt_op_builder.h @@ -23,7 +23,7 @@ #include "tensorflow/lite/kernels/kernel_util.h" #include "tensorflow/lite/minimal_logging.h" -#include "../nnrt/nnrt_implementation.h" +#include "nnrt_implementation.h" #include "tensor_mapping.h" namespace tflite { diff --git a/example/deep_learning_framework/tflite/tools/utils.h b/example/deep_learning_framework/tflite/tools/utils.h index f97a883..1efea84 100644 --- a/example/deep_learning_framework/tflite/tools/utils.h +++ b/example/deep_learning_framework/tflite/tools/utils.h @@ -16,7 +16,7 @@ #ifndef TENSORFLOW_LITE_EXAMPLES_LABEL_CLASSIFY_UTILS_H #define TENSORFLOW_LITE_EXAMPLES_LABEL_CLASSIFY_UTILS_H -#include "../label_classify/label_classify.h" +#include "label_classify.h" #include "sys/time.h" diff --git a/frameworks/native/neural_network_core/BUILD.gn b/frameworks/native/neural_network_core/BUILD.gn index 5d221b4..02ece69 100644 --- a/frameworks/native/neural_network_core/BUILD.gn +++ b/frameworks/native/neural_network_core/BUILD.gn @@ -21,6 +21,7 @@ config("nnrt_config") { config("nnrt_public_config") { include_dirs = [ "./", + "../../../common", "../neural_network_runtime", "../../../interfaces/innerkits/c", "../../../interfaces/kits/c", diff --git a/frameworks/native/neural_network_core/backend.h b/frameworks/native/neural_network_core/backend.h index 1d3b21d..977758a 100644 --- a/frameworks/native/neural_network_core/backend.h +++ b/frameworks/native/neural_network_core/backend.h @@ -23,7 +23,7 @@ #include "compiler.h" #include "executor.h" #include "tensor.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_core/backend_manager.h b/frameworks/native/neural_network_core/backend_manager.h index 954fab5..506f0c2 100644 --- a/frameworks/native/neural_network_core/backend_manager.h +++ b/frameworks/native/neural_network_core/backend_manager.h @@ -26,7 +26,7 @@ #include #include "backend.h" -#include "common/log.h" +#include "log.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_core/backend_registrar.cpp b/frameworks/native/neural_network_core/backend_registrar.cpp index 0a9b2a6..54ed758 100644 --- a/frameworks/native/neural_network_core/backend_registrar.cpp +++ b/frameworks/native/neural_network_core/backend_registrar.cpp @@ -15,8 +15,8 @@ #include "backend_registrar.h" -#include "common/log.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "log.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_core/compilation.h b/frameworks/native/neural_network_core/compilation.h index c327f7a..531773b 100644 --- a/frameworks/native/neural_network_core/compilation.h +++ b/frameworks/native/neural_network_core/compilation.h @@ -22,7 +22,7 @@ #include #include "compiler.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_core/compiler.h b/frameworks/native/neural_network_core/compiler.h index 7bbed9e..6d62c9a 100644 --- a/frameworks/native/neural_network_core/compiler.h +++ b/frameworks/native/neural_network_core/compiler.h @@ -19,7 +19,7 @@ #include #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" #include "cpp_type.h" namespace OHOS { diff --git a/frameworks/native/neural_network_core/cpp_type.h b/frameworks/native/neural_network_core/cpp_type.h index 18f2a3f..3122297 100644 --- a/frameworks/native/neural_network_core/cpp_type.h +++ b/frameworks/native/neural_network_core/cpp_type.h @@ -21,7 +21,7 @@ #include #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_core/executor.h b/frameworks/native/neural_network_core/executor.h index cf05e8c..d63ad39 100644 --- a/frameworks/native/neural_network_core/executor.h +++ b/frameworks/native/neural_network_core/executor.h @@ -23,7 +23,7 @@ #include "compiler.h" #include "tensor_desc.h" #include "executor_config.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_core/neural_network_core.cpp b/frameworks/native/neural_network_core/neural_network_core.cpp index 276aa82..ee8aa28 100644 --- a/frameworks/native/neural_network_core/neural_network_core.cpp +++ b/frameworks/native/neural_network_core/neural_network_core.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "interfaces/kits/c/neural_network_runtime/neural_network_core.h" +#include "neural_network_runtime/neural_network_core.h" #include #include @@ -22,7 +22,7 @@ #include #include -#include "common/log.h" +#include "log.h" #include "executor.h" #include "tensor.h" #include "compilation.h" diff --git a/frameworks/native/neural_network_core/nnrt_client.cpp b/frameworks/native/neural_network_core/nnrt_client.cpp index 618efe1..4921ac1 100644 --- a/frameworks/native/neural_network_core/nnrt_client.cpp +++ b/frameworks/native/neural_network_core/nnrt_client.cpp @@ -18,7 +18,7 @@ #include #include -#include "common/log.h" +#include "log.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_core/tensor_desc.cpp b/frameworks/native/neural_network_core/tensor_desc.cpp index 34c3ce4..2f1a8bf 100644 --- a/frameworks/native/neural_network_core/tensor_desc.cpp +++ b/frameworks/native/neural_network_core/tensor_desc.cpp @@ -15,7 +15,7 @@ #include "tensor_desc.h" #include "validation.h" -#include "common/log.h" +#include "log.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_core/tensor_desc.h b/frameworks/native/neural_network_core/tensor_desc.h index 08981a3..6297f06 100644 --- a/frameworks/native/neural_network_core/tensor_desc.h +++ b/frameworks/native/neural_network_core/tensor_desc.h @@ -18,7 +18,7 @@ #include #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_core/utils.cpp b/frameworks/native/neural_network_core/utils.cpp index 2a635fe..53334b8 100644 --- a/frameworks/native/neural_network_core/utils.cpp +++ b/frameworks/native/neural_network_core/utils.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "common/utils.h" +#include "utils.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_core/validation.h b/frameworks/native/neural_network_core/validation.h index ddcd289..940033d 100644 --- a/frameworks/native/neural_network_core/validation.h +++ b/frameworks/native/neural_network_core/validation.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_VALIDATION_H #define NEURAL_NETWORK_RUNTIME_VALIDATION_H -#include "common/log.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "log.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/BUILD.gn b/frameworks/native/neural_network_runtime/BUILD.gn index 1d43ecd..adf9fa0 100644 --- a/frameworks/native/neural_network_runtime/BUILD.gn +++ b/frameworks/native/neural_network_runtime/BUILD.gn @@ -18,6 +18,7 @@ config("nnrt_config") { cflags_cc = [ "-fexceptions" ] include_dirs = [ "./", + "../../../common", "../neural_network_core", "../../../interfaces/innerkits/c", "../../../interfaces/kits/c", diff --git a/frameworks/native/neural_network_runtime/device.h b/frameworks/native/neural_network_runtime/device.h index 5dd2d67..17017ba 100644 --- a/frameworks/native/neural_network_runtime/device.h +++ b/frameworks/native/neural_network_runtime/device.h @@ -20,7 +20,7 @@ #include #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" #include "cpp_type.h" #include "tensor_desc.h" #include "prepared_model.h" diff --git a/frameworks/native/neural_network_runtime/hdi_device_v1_0.cpp b/frameworks/native/neural_network_runtime/hdi_device_v1_0.cpp index c271b72..a8fac98 100644 --- a/frameworks/native/neural_network_runtime/hdi_device_v1_0.cpp +++ b/frameworks/native/neural_network_runtime/hdi_device_v1_0.cpp @@ -22,8 +22,8 @@ #include "lite_graph_to_hdi_model_v1_0.h" #include "memory_manager.h" #include "transform.h" -#include "common/log.h" -#include "common/utils.h" +#include "log.h" +#include "utils.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/hdi_device_v2_0.cpp b/frameworks/native/neural_network_runtime/hdi_device_v2_0.cpp index 6656124..459f3f0 100644 --- a/frameworks/native/neural_network_runtime/hdi_device_v2_0.cpp +++ b/frameworks/native/neural_network_runtime/hdi_device_v2_0.cpp @@ -24,8 +24,8 @@ #include "hdi_returncode_utils.h" #include "memory_manager.h" #include "transform.h" -#include "common/log.h" -#include "common/utils.h" +#include "log.h" +#include "utils.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/hdi_device_v2_1.cpp b/frameworks/native/neural_network_runtime/hdi_device_v2_1.cpp index 330fcce..2f3135c 100644 --- a/frameworks/native/neural_network_runtime/hdi_device_v2_1.cpp +++ b/frameworks/native/neural_network_runtime/hdi_device_v2_1.cpp @@ -24,8 +24,8 @@ #include "hdi_returncode_utils_v2_1.h" #include "memory_manager.h" #include "transform.h" -#include "common/log.h" -#include "common/utils.h" +#include "log.h" +#include "utils.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/hdi_prepared_model_v1_0.cpp b/frameworks/native/neural_network_runtime/hdi_prepared_model_v1_0.cpp index 15b7548..2213dee 100644 --- a/frameworks/native/neural_network_runtime/hdi_prepared_model_v1_0.cpp +++ b/frameworks/native/neural_network_runtime/hdi_prepared_model_v1_0.cpp @@ -15,7 +15,7 @@ #include "hdi_prepared_model_v1_0.h" -#include "common/log.h" +#include "log.h" #include "memory_manager.h" #include "nntensor.h" diff --git a/frameworks/native/neural_network_runtime/hdi_prepared_model_v2_0.cpp b/frameworks/native/neural_network_runtime/hdi_prepared_model_v2_0.cpp index e4c2d68..b55cf7d 100644 --- a/frameworks/native/neural_network_runtime/hdi_prepared_model_v2_0.cpp +++ b/frameworks/native/neural_network_runtime/hdi_prepared_model_v2_0.cpp @@ -15,7 +15,7 @@ #include "hdi_prepared_model_v2_0.h" -#include "common/log.h" +#include "log.h" #include "hdi_returncode_utils.h" #include "memory_manager.h" #include "nntensor.h" diff --git a/frameworks/native/neural_network_runtime/hdi_prepared_model_v2_1.cpp b/frameworks/native/neural_network_runtime/hdi_prepared_model_v2_1.cpp index c568239..5be2fc3 100644 --- a/frameworks/native/neural_network_runtime/hdi_prepared_model_v2_1.cpp +++ b/frameworks/native/neural_network_runtime/hdi_prepared_model_v2_1.cpp @@ -15,7 +15,7 @@ #include "hdi_prepared_model_v2_1.h" -#include "common/log.h" +#include "log.h" #include "hdi_returncode_utils_v2_1.h" #include "memory_manager.h" #include "nntensor.h" diff --git a/frameworks/native/neural_network_runtime/hdi_returncode_utils.h b/frameworks/native/neural_network_runtime/hdi_returncode_utils.h index 01f4252..bd663a1 100644 --- a/frameworks/native/neural_network_runtime/hdi_returncode_utils.h +++ b/frameworks/native/neural_network_runtime/hdi_returncode_utils.h @@ -20,7 +20,7 @@ #include #include #include -#include "common/log.h" +#include "log.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/hdi_returncode_utils_v2_1.h b/frameworks/native/neural_network_runtime/hdi_returncode_utils_v2_1.h index 8c4df90..d95ba40 100644 --- a/frameworks/native/neural_network_runtime/hdi_returncode_utils_v2_1.h +++ b/frameworks/native/neural_network_runtime/hdi_returncode_utils_v2_1.h @@ -20,7 +20,7 @@ #include #include #include -#include "common/log.h" +#include "log.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/inner_model.cpp b/frameworks/native/neural_network_runtime/inner_model.cpp index 0933e43..cfe6423 100644 --- a/frameworks/native/neural_network_runtime/inner_model.cpp +++ b/frameworks/native/neural_network_runtime/inner_model.cpp @@ -21,8 +21,8 @@ #include "securec.h" -#include "common/utils.h" -#include "common/scoped_trace.h" +#include "utils.h" +#include "scoped_trace.h" #include "backend_manager.h" #include "validation.h" #include "ops_builder.h" diff --git a/frameworks/native/neural_network_runtime/inner_model.h b/frameworks/native/neural_network_runtime/inner_model.h index a041f26..187d2a5 100644 --- a/frameworks/native/neural_network_runtime/inner_model.h +++ b/frameworks/native/neural_network_runtime/inner_model.h @@ -22,8 +22,8 @@ #include "mindir.h" #include "ops_builder.h" #include "tensor_desc.h" -#include "interfaces/innerkits/c/neural_network_runtime_inner.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime_inner.h" +#include "neural_network_runtime/neural_network_runtime.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v1_0.cpp b/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v1_0.cpp index 22a9b70..dca43ff 100644 --- a/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v1_0.cpp +++ b/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v1_0.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "common/log.h" +#include "log.h" #include "message_parcel.h" #include "nnrt/v1_0/nnrt_types.h" #include "nnrt/v1_0/node_attr_types.h" diff --git a/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v2_0.cpp b/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v2_0.cpp index 772a486..e34b571 100644 --- a/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v2_0.cpp +++ b/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v2_0.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "common/log.h" +#include "log.h" #include "message_parcel.h" #include "nnrt/v2_0/nnrt_types.h" #include "nnrt/v2_0/node_attr_types.h" diff --git a/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v2_1.cpp b/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v2_1.cpp index 577223b..d58b4ea 100644 --- a/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v2_1.cpp +++ b/frameworks/native/neural_network_runtime/lite_graph_to_hdi_model_v2_1.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "common/log.h" +#include "log.h" #include "message_parcel.h" #include "nnrt/v2_1/nnrt_types.h" #include "nnrt/v2_1/node_attr_types.h" diff --git a/frameworks/native/neural_network_runtime/memory_manager.cpp b/frameworks/native/neural_network_runtime/memory_manager.cpp index 217b33b..70a89c8 100644 --- a/frameworks/native/neural_network_runtime/memory_manager.cpp +++ b/frameworks/native/neural_network_runtime/memory_manager.cpp @@ -20,7 +20,7 @@ #include #include "cpp_type.h" -#include "common/log.h" +#include "log.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/memory_manager.h b/frameworks/native/neural_network_runtime/memory_manager.h index d6c9607..3158291 100644 --- a/frameworks/native/neural_network_runtime/memory_manager.h +++ b/frameworks/native/neural_network_runtime/memory_manager.h @@ -19,7 +19,7 @@ #include #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/neural_network_runtime.cpp b/frameworks/native/neural_network_runtime/neural_network_runtime.cpp index 111cce2..1228e74 100644 --- a/frameworks/native/neural_network_runtime/neural_network_runtime.cpp +++ b/frameworks/native/neural_network_runtime/neural_network_runtime.cpp @@ -13,13 +13,13 @@ * limitations under the License. */ -#include "interfaces/innerkits/c/neural_network_runtime_inner.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime_inner.h" +#include "neural_network_runtime/neural_network_runtime.h" #include "compilation.h" #include "executor.h" #include "inner_model.h" -#include "common/log.h" +#include "log.h" #include "quant_param.h" #include "validation.h" #include "syspara/parameter.h" diff --git a/frameworks/native/neural_network_runtime/neural_network_runtime_compat.cpp b/frameworks/native/neural_network_runtime/neural_network_runtime_compat.cpp index d1b348a..295ae51 100644 --- a/frameworks/native/neural_network_runtime/neural_network_runtime_compat.cpp +++ b/frameworks/native/neural_network_runtime/neural_network_runtime_compat.cpp @@ -13,13 +13,13 @@ * limitations under the License. */ -#include "interfaces/innerkits/c/neural_network_runtime_inner.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime_inner.h" +#include "neural_network_runtime/neural_network_runtime.h" #include "compilation.h" #include "nnexecutor.h" #include "inner_model.h" -#include "common/log.h" +#include "log.h" using namespace OHOS::NeuralNetworkRuntime; diff --git a/frameworks/native/neural_network_runtime/nn_tensor.cpp b/frameworks/native/neural_network_runtime/nn_tensor.cpp index d0b8a54..df42f2f 100644 --- a/frameworks/native/neural_network_runtime/nn_tensor.cpp +++ b/frameworks/native/neural_network_runtime/nn_tensor.cpp @@ -20,7 +20,7 @@ #include "nn_tensor.h" #include "validation.h" #include "transform.h" -#include "common/log.h" +#include "log.h" #include "mindir.h" #include "mindir_types.h" #include "quant_param.h" diff --git a/frameworks/native/neural_network_runtime/nn_tensor.h b/frameworks/native/neural_network_runtime/nn_tensor.h index 9eec18d..ca3ac71 100644 --- a/frameworks/native/neural_network_runtime/nn_tensor.h +++ b/frameworks/native/neural_network_runtime/nn_tensor.h @@ -21,8 +21,8 @@ #include "cpp_type.h" #include "tensor_desc.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" -#include "interfaces/innerkits/c/neural_network_runtime_inner.h" +#include "neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime_inner.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/nnbackend.cpp b/frameworks/native/neural_network_runtime/nnbackend.cpp index dd2cec2..0647e79 100644 --- a/frameworks/native/neural_network_runtime/nnbackend.cpp +++ b/frameworks/native/neural_network_runtime/nnbackend.cpp @@ -16,8 +16,8 @@ #include "nnbackend.h" #include -#include "common/log.h" -#include "common/utils.h" +#include "log.h" +#include "utils.h" #include "nncompiler.h" #include "nnexecutor.h" #include "nntensor.h" diff --git a/frameworks/native/neural_network_runtime/nncompiled_cache.cpp b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp index 92a749f..5f5ab3c 100644 --- a/frameworks/native/neural_network_runtime/nncompiled_cache.cpp +++ b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp @@ -21,7 +21,7 @@ #include #include -#include "common/utils.h" +#include "utils.h" #include "backend_manager.h" #include "nnbackend.h" diff --git a/frameworks/native/neural_network_runtime/nncompiled_cache.h b/frameworks/native/neural_network_runtime/nncompiled_cache.h index 3c59c23..f182ac4 100644 --- a/frameworks/native/neural_network_runtime/nncompiled_cache.h +++ b/frameworks/native/neural_network_runtime/nncompiled_cache.h @@ -21,7 +21,7 @@ #include #include "device.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime/neural_network_runtime.h" #include "tensor_desc.h" namespace OHOS { diff --git a/frameworks/native/neural_network_runtime/nncompiler.cpp b/frameworks/native/neural_network_runtime/nncompiler.cpp index 6d7edd3..a55825e 100644 --- a/frameworks/native/neural_network_runtime/nncompiler.cpp +++ b/frameworks/native/neural_network_runtime/nncompiler.cpp @@ -22,7 +22,7 @@ #include "validation.h" #include "nncompiled_cache.h" -#include "common/utils.h" +#include "utils.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/nnexecutor.cpp b/frameworks/native/neural_network_runtime/nnexecutor.cpp index 4332663..dcf4e9c 100644 --- a/frameworks/native/neural_network_runtime/nnexecutor.cpp +++ b/frameworks/native/neural_network_runtime/nnexecutor.cpp @@ -16,12 +16,12 @@ #include "nnexecutor.h" #include "nntensor.h" -#include "common/log.h" +#include "log.h" #include "cpp_type.h" #include "securec.h" -#include "common/utils.h" -#include "common/scoped_trace.h" +#include "utils.h" +#include "scoped_trace.h" #include "transform.h" namespace OHOS { diff --git a/frameworks/native/neural_network_runtime/nntensor.cpp b/frameworks/native/neural_network_runtime/nntensor.cpp index 5c11945..ab1cae6 100644 --- a/frameworks/native/neural_network_runtime/nntensor.cpp +++ b/frameworks/native/neural_network_runtime/nntensor.cpp @@ -16,11 +16,11 @@ #include #include -#include "common/log.h" +#include "log.h" #include "backend_manager.h" #include "nnbackend.h" #include "nntensor.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/ops/strided_slice_builder.cpp b/frameworks/native/neural_network_runtime/ops/strided_slice_builder.cpp index 93a1bbf..dea7374 100644 --- a/frameworks/native/neural_network_runtime/ops/strided_slice_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/strided_slice_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/ops_builder.h b/frameworks/native/neural_network_runtime/ops_builder.h index c42604d..316df27 100644 --- a/frameworks/native/neural_network_runtime/ops_builder.h +++ b/frameworks/native/neural_network_runtime/ops_builder.h @@ -20,8 +20,8 @@ #include #include "nn_tensor.h" -#include "common/log.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "log.h" +#include "neural_network_runtime/neural_network_runtime.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/ops_registry.h b/frameworks/native/neural_network_runtime/ops_registry.h index 4908483..41087e2 100644 --- a/frameworks/native/neural_network_runtime/ops_registry.h +++ b/frameworks/native/neural_network_runtime/ops_registry.h @@ -21,7 +21,7 @@ #include #include "ops_builder.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime/neural_network_runtime.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/prepared_model.h b/frameworks/native/neural_network_runtime/prepared_model.h index 490c397..73c2174 100644 --- a/frameworks/native/neural_network_runtime/prepared_model.h +++ b/frameworks/native/neural_network_runtime/prepared_model.h @@ -18,7 +18,7 @@ #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" #include "cpp_type.h" namespace OHOS { diff --git a/frameworks/native/neural_network_runtime/quant_param.cpp b/frameworks/native/neural_network_runtime/quant_param.cpp index ba54c8f..c6de260 100644 --- a/frameworks/native/neural_network_runtime/quant_param.cpp +++ b/frameworks/native/neural_network_runtime/quant_param.cpp @@ -15,7 +15,7 @@ #include "quant_param.h" -#include "common/log.h" +#include "log.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/quant_param.h b/frameworks/native/neural_network_runtime/quant_param.h index 9722e10..088e5d4 100644 --- a/frameworks/native/neural_network_runtime/quant_param.h +++ b/frameworks/native/neural_network_runtime/quant_param.h @@ -19,7 +19,7 @@ #include #include "cpp_type.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/register_hdi_device_v1_0.cpp b/frameworks/native/neural_network_runtime/register_hdi_device_v1_0.cpp index d76825e..fd0a7cc 100644 --- a/frameworks/native/neural_network_runtime/register_hdi_device_v1_0.cpp +++ b/frameworks/native/neural_network_runtime/register_hdi_device_v1_0.cpp @@ -16,8 +16,8 @@ #include #include "hdi_device_v1_0.h" -#include "common/log.h" -#include "common/utils.h" +#include "log.h" +#include "utils.h" #include "nnbackend.h" #include "backend_registrar.h" diff --git a/frameworks/native/neural_network_runtime/register_hdi_device_v2_0.cpp b/frameworks/native/neural_network_runtime/register_hdi_device_v2_0.cpp index c8957c2..d0a3634 100644 --- a/frameworks/native/neural_network_runtime/register_hdi_device_v2_0.cpp +++ b/frameworks/native/neural_network_runtime/register_hdi_device_v2_0.cpp @@ -17,8 +17,8 @@ #include "hdi_device_v2_0.h" #include "hdi_returncode_utils.h" -#include "common/log.h" -#include "common/utils.h" +#include "log.h" +#include "utils.h" #include "nnbackend.h" #include "backend_registrar.h" diff --git a/frameworks/native/neural_network_runtime/register_hdi_device_v2_1.cpp b/frameworks/native/neural_network_runtime/register_hdi_device_v2_1.cpp index 2f6730d..eb90088 100644 --- a/frameworks/native/neural_network_runtime/register_hdi_device_v2_1.cpp +++ b/frameworks/native/neural_network_runtime/register_hdi_device_v2_1.cpp @@ -17,8 +17,8 @@ #include "hdi_device_v2_1.h" #include "hdi_returncode_utils_v2_1.h" -#include "common/log.h" -#include "common/utils.h" +#include "log.h" +#include "utils.h" #include "nnbackend.h" #include "backend_registrar.h" diff --git a/frameworks/native/neural_network_runtime/transform.cpp b/frameworks/native/neural_network_runtime/transform.cpp index 10ee391..5b3289e 100644 --- a/frameworks/native/neural_network_runtime/transform.cpp +++ b/frameworks/native/neural_network_runtime/transform.cpp @@ -15,7 +15,7 @@ #include "transform.h" -#include "common/log.h" +#include "log.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/neural_network_runtime/transform.h b/frameworks/native/neural_network_runtime/transform.h index 369223c..2cd50f9 100644 --- a/frameworks/native/neural_network_runtime/transform.h +++ b/frameworks/native/neural_network_runtime/transform.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_TRANSFORM_H #define NEURAL_NETWORK_RUNTIME_TRANSFORM_H -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" #include "cpp_type.h" #include "mindir.h" #include "mindir_types.h" diff --git a/interfaces/innerkits/c/neural_network_runtime_inner.h b/interfaces/innerkits/c/neural_network_runtime_inner.h index 67007bf..22de228 100644 --- a/interfaces/innerkits/c/neural_network_runtime_inner.h +++ b/interfaces/innerkits/c/neural_network_runtime_inner.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_INNER_H #define NEURAL_NETWORK_RUNTIME_INNER_H -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" #ifdef __cplusplus extern "C" { diff --git a/test/fuzztest/data.h b/test/fuzztest/data.h index d13e72e..d2b5123 100644 --- a/test/fuzztest/data.h +++ b/test/fuzztest/data.h @@ -18,7 +18,7 @@ #include -#include "../../common/log.h" +#include "log.h" #include "securec.h" namespace OHOS { diff --git a/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn b/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn index d14bd87..5e0e2f6 100644 --- a/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn +++ b/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("HdiNnrtDeviceFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../hdinnrtdevice_fuzzer" - include_dirs = [ "//third_party/bounds_checking_function/include" ] + include_dirs = [ "../" ] cflags = [ "-g", @@ -34,10 +34,13 @@ ohos_fuzztest("HdiNnrtDeviceFuzzTest") { sources = [ "hdinnrtdevice_fuzzer.cpp" ] external_deps = [ + "bounds_checking_function::libsec_shared", "c_utils:utils", "drivers_interface_nnrt:libnnrt_stub_2.0", "hdf_core:libhdi", "hilog:libhilog", "ipc:ipc_core", + "neural_network_runtime::neural_network_core", + "neural_network_runtime::neural_network_runtime", ] } diff --git a/test/fuzztest/hdinnrtdevice_fuzzer/hdinnrtdevice_fuzzer.cpp b/test/fuzztest/hdinnrtdevice_fuzzer/hdinnrtdevice_fuzzer.cpp index 9e2caf5..b2ecda8 100644 --- a/test/fuzztest/hdinnrtdevice_fuzzer/hdinnrtdevice_fuzzer.cpp +++ b/test/fuzztest/hdinnrtdevice_fuzzer/hdinnrtdevice_fuzzer.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ #include "hdinnrtdevice_fuzzer.h" -#include "../data.h" -#include "../nnrt_device_impl.h" -#include "../../../common/log.h" +#include "data.h" +#include "nnrt_device_impl.h" +#include "log.h" #include #include "message_parcel.h" diff --git a/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn b/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn index 99a094e..07a0540 100644 --- a/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn +++ b/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("HdiNnrtPreparedModelFuzzTest") { module_out_path = module_output_path fuzz_config_file = "../hdinnrtpreparedmodel_fuzzer" - include_dirs = [ "//third_party/bounds_checking_function/include" ] + include_dirs = [ "../" ] cflags = [ "-g", @@ -34,10 +34,13 @@ ohos_fuzztest("HdiNnrtPreparedModelFuzzTest") { sources = [ "hdinnrtpreparedmodel_fuzzer.cpp" ] external_deps = [ + "bounds_checking_function::libsec_shared", "c_utils:utils", "drivers_interface_nnrt:libnnrt_stub_2.0", "hdf_core:libhdi", "hilog:libhilog", "ipc:ipc_core", + "neural_network_runtime::neural_network_core", + "neural_network_runtime::neural_network_runtime", ] } diff --git a/test/fuzztest/hdinnrtpreparedmodel_fuzzer/hdinnrtpreparedmodel_fuzzer.cpp b/test/fuzztest/hdinnrtpreparedmodel_fuzzer/hdinnrtpreparedmodel_fuzzer.cpp index b02ae6e..b47be9c 100644 --- a/test/fuzztest/hdinnrtpreparedmodel_fuzzer/hdinnrtpreparedmodel_fuzzer.cpp +++ b/test/fuzztest/hdinnrtpreparedmodel_fuzzer/hdinnrtpreparedmodel_fuzzer.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ #include "hdinnrtpreparedmodel_fuzzer.h" -#include "../data.h" -#include "../nnrt_prepare_model_impl.h" -#include "../../../common/log.h" +#include "data.h" +#include "nnrt_prepare_model_impl.h" +#include "log.h" #include #include "message_parcel.h" diff --git a/test/fuzztest/nnrt_device_impl.h b/test/fuzztest/nnrt_device_impl.h index 1e21b53..745eeda 100644 --- a/test/fuzztest/nnrt_device_impl.h +++ b/test/fuzztest/nnrt_device_impl.h @@ -14,7 +14,7 @@ */ #ifndef OHOS_HDI_NNRT_V2_0_NNRTDEVICEIMPL_H #define OHOS_HDI_NNRT_V2_0_NNRTDEVICEIMPL_H -#include "../../common/log.h" +#include "log.h" #include "v2_0/innrt_device.h" diff --git a/test/fuzztest/nnrt_prepare_model_impl.h b/test/fuzztest/nnrt_prepare_model_impl.h index e73dcd6..6306de5 100644 --- a/test/fuzztest/nnrt_prepare_model_impl.h +++ b/test/fuzztest/nnrt_prepare_model_impl.h @@ -15,7 +15,7 @@ #ifndef OHOS_HDI_NNRT_V2_0_NNRTPREPAREMODELIMPL_H #define OHOS_HDI_NNRT_V2_0_NNRTPREPAREMODELIMPL_H -#include "../../common/log.h" +#include "log.h" #include "v2_0/iprepared_model.h" diff --git a/test/system_test/common/nnrt_test.cpp b/test/system_test/common/nnrt_test.cpp index a431b2a..cd3c1a8 100644 --- a/test/system_test/common/nnrt_test.cpp +++ b/test/system_test/common/nnrt_test.cpp @@ -17,7 +17,7 @@ #include "securec.h" -#include "common/log.h" +#include "log.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/test/system_test/common/nnrt_test.h b/test/system_test/common/nnrt_test.h index 6e057f6..c24d874 100644 --- a/test/system_test/common/nnrt_test.h +++ b/test/system_test/common/nnrt_test.h @@ -21,7 +21,7 @@ #include #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime/neural_network_runtime.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/test/system_test/device_test.cpp b/test/system_test/device_test.cpp index 5694873..a3c48b2 100644 --- a/test/system_test/device_test.cpp +++ b/test/system_test/device_test.cpp @@ -18,7 +18,7 @@ #include #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime/neural_network_runtime.h" using namespace testing; using namespace testing::ext; diff --git a/test/system_test/end_to_end_test.cpp b/test/system_test/end_to_end_test.cpp index 9248993..0998465 100644 --- a/test/system_test/end_to_end_test.cpp +++ b/test/system_test/end_to_end_test.cpp @@ -23,8 +23,8 @@ #include "securec.h" -#include "common/log.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "log.h" +#include "neural_network_runtime/neural_network_runtime.h" namespace fs = std::filesystem; diff --git a/test/system_test/end_to_end_test.h b/test/system_test/end_to_end_test.h index ae05663..d1066c0 100644 --- a/test/system_test/end_to_end_test.h +++ b/test/system_test/end_to_end_test.h @@ -20,7 +20,7 @@ #include #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime/neural_network_runtime.h" #include "test/system_test/common/nnrt_test.h" namespace OHOS { diff --git a/test/unittest/common/file_utils.cpp b/test/unittest/common/file_utils.cpp index c6cd79f..2649fd8 100644 --- a/test/unittest/common/file_utils.cpp +++ b/test/unittest/common/file_utils.cpp @@ -18,7 +18,7 @@ #include #include -#include "common/log.h" +#include "log.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/test/unittest/common/v1_0/compilation_mock_idevice.cpp b/test/unittest/common/v1_0/compilation_mock_idevice.cpp index 2861376..ad47e84 100644 --- a/test/unittest/common/v1_0/compilation_mock_idevice.cpp +++ b/test/unittest/common/v1_0/compilation_mock_idevice.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "common/utils.h" +#include "utils.h" #include "hdi_device_v1_0.h" #include "nn_tensor.h" #include "test/unittest/common/v1_0/mock_idevice.h" diff --git a/test/unittest/common/v1_0/inner_model_mock_device.cpp b/test/unittest/common/v1_0/inner_model_mock_device.cpp index a37d1bd..6d319c3 100644 --- a/test/unittest/common/v1_0/inner_model_mock_device.cpp +++ b/test/unittest/common/v1_0/inner_model_mock_device.cpp @@ -16,7 +16,7 @@ #include #include -#include "common/utils.h" +#include "utils.h" #include "inner_model.h" #include "hdi_device_v1_0.h" #include "ops/div_builder.h" diff --git a/test/unittest/common/v2_0/compilation_mock_idevice.cpp b/test/unittest/common/v2_0/compilation_mock_idevice.cpp index 8e70e0e..20b185c 100644 --- a/test/unittest/common/v2_0/compilation_mock_idevice.cpp +++ b/test/unittest/common/v2_0/compilation_mock_idevice.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "common/utils.h" +#include "utils.h" #include "hdi_device_v2_0.h" #include "nn_tensor.h" #include "test/unittest/common/v2_0/mock_idevice.h" diff --git a/test/unittest/common/v2_0/inner_model_mock_device.cpp b/test/unittest/common/v2_0/inner_model_mock_device.cpp index ef6f1a7..909e2f1 100644 --- a/test/unittest/common/v2_0/inner_model_mock_device.cpp +++ b/test/unittest/common/v2_0/inner_model_mock_device.cpp @@ -16,7 +16,7 @@ #include #include -#include "common/utils.h" +#include "utils.h" #include "inner_model.h" #include "hdi_device_v2_0.h" #include "ops/div_builder.h" diff --git a/test/unittest/components/BUILD.gn b/test/unittest/components/BUILD.gn index ef821b2..f69fed4 100644 --- a/test/unittest/components/BUILD.gn +++ b/test/unittest/components/BUILD.gn @@ -19,13 +19,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/googletest/googlemock/include", "../../..", - "../../../frameworks/native", - "../../../frameworks/native/neural_network_runtime", - "../../../frameworks/native/neural_network_core", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//third_party/mindspore/mindspore-src/source/mindspore/lite/mindir/include", ] } @@ -35,20 +29,17 @@ ohos_unittest("CompilationV1_0Test") { sources = [ "../common/v1_0/compilation_mock_idevice.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -58,20 +49,17 @@ ohos_unittest("ExecutorV1_0Test") { sources = [ "../common/v1_0/executor_mock_device.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -82,19 +70,16 @@ ohos_unittest("DeviceManagerV1_0Test") { sources += [ "../common/v1_0/mock_idevice.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -105,19 +90,16 @@ ohos_unittest("DeviceRegistrarV1_0Test") { sources += [ "../common/v1_0/mock_idevice.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -129,19 +111,16 @@ ohos_unittest("HDIDeviceV1_0Test") { sources += [ "../common/file_utils.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -153,19 +132,16 @@ ohos_unittest("HDIPreparedModelV1_0Test") { sources += [ "../common/file_utils.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -176,18 +152,15 @@ ohos_unittest("MemoryManagerTest") { sources += [ "../common/file_utils.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", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -197,19 +170,17 @@ ohos_unittest("NeuralNetworkCoreV1_0Test") { sources = [ "./v1_0/neural_network_core_test/neural_network_core_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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -219,17 +190,15 @@ ohos_unittest("QuantParamsTest") { sources = [ "./quant_param/quant_param_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", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -239,17 +208,15 @@ ohos_unittest("NNBackendTest") { sources = [ "./nn_backend/nn_backend_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", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -259,17 +226,15 @@ ohos_unittest("NNCompiledCacheTest") { sources = [ "./nn_compiled_cache/nn_compiled_cache_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", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -279,17 +244,15 @@ ohos_unittest("NNCompilerTest") { sources = [ "./nn_compiler/nn_compiler_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", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -299,17 +262,15 @@ ohos_unittest("NNExecutorTest") { sources = [ "./nn_executor/nn_executor_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", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -319,17 +280,15 @@ ohos_unittest("NNTensor2_0Test") { 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", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -339,18 +298,15 @@ ohos_unittest("TransformV1_0Test") { sources = [ "./v1_0/transform/transform_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", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -361,20 +317,17 @@ ohos_unittest("InnerModelV1_0Test") { sources += [ "../common/v1_0/inner_model_mock_device.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -384,20 +337,17 @@ ohos_unittest("NnTensorV1_0Test") { sources = [ "./v1_0/inner_model/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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -407,19 +357,17 @@ ohos_unittest("NnTensorDescV1_0Test") { sources = [ "./v1_0/inner_model/nn_tensor_desc_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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -429,20 +377,17 @@ ohos_unittest("NnValidationV1_0Test") { sources = [ "./v1_0/inner_model/nn_validation_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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -452,20 +397,17 @@ ohos_unittest("OpsRegistryV1_0Test") { sources = [ "./v1_0/inner_model/ops_registry_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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -478,20 +420,17 @@ ohos_unittest("NeuralNetworkRuntimeV1_0Test") { 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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -501,20 +440,17 @@ ohos_unittest("CompilationV2_0Test") { sources = [ "../common/v2_0/compilation_mock_idevice.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -524,20 +460,17 @@ ohos_unittest("ExecutorV2_0Test") { sources = [ "../common/v2_0/executor_mock_device.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -548,19 +481,16 @@ ohos_unittest("DeviceManagerV2_0Test") { sources += [ "../common/v2_0/mock_idevice.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -571,19 +501,16 @@ ohos_unittest("DeviceRegistrarV2_0Test") { sources += [ "../common/v2_0/mock_idevice.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -595,19 +522,16 @@ ohos_unittest("HDIDeviceV2_0Test") { sources += [ "../common/file_utils.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -619,19 +543,16 @@ ohos_unittest("HDIPreparedModelV2_0Test") { sources += [ "../common/file_utils.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -643,18 +564,16 @@ ohos_unittest("HDIPreparedModelV2_1Test") { sources += [ "../common/file_utils.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hilog:libhilog", "hitrace:libhitracechain", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -664,18 +583,15 @@ ohos_unittest("TransformV2_0Test") { sources = [ "./v2_0/transform/transform_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_2.0", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -686,20 +602,17 @@ ohos_unittest("InnerModelV2_0Test") { sources += [ "../common/v2_0/inner_model_mock_device.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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -709,20 +622,17 @@ ohos_unittest("NnTensorV2_0Test") { sources = [ "./v2_0/inner_model/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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -732,20 +642,17 @@ ohos_unittest("NnValidationV2_0Test") { sources = [ "./v2_0/inner_model/nn_validation_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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -755,20 +662,17 @@ ohos_unittest("OpsRegistryV2_0Test") { sources = [ "./v2_0/inner_model/ops_registry_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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } @@ -781,20 +685,17 @@ ohos_unittest("NeuralNetworkRuntimeV2_0Test") { 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 = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } diff --git a/test/unittest/components/nn_backend/nn_backend_test.cpp b/test/unittest/components/nn_backend/nn_backend_test.cpp index 4b2ea39..71822d9 100644 --- a/test/unittest/components/nn_backend/nn_backend_test.cpp +++ b/test/unittest/components/nn_backend/nn_backend_test.cpp @@ -18,7 +18,7 @@ #include "nnbackend.h" #include "device.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" #include "backend_manager.h" using namespace testing; diff --git a/test/unittest/components/nn_compiled_cache/nn_compiled_cache_test.cpp b/test/unittest/components/nn_compiled_cache/nn_compiled_cache_test.cpp index 690be40..e43bca5 100644 --- a/test/unittest/components/nn_compiled_cache/nn_compiled_cache_test.cpp +++ b/test/unittest/components/nn_compiled_cache/nn_compiled_cache_test.cpp @@ -20,8 +20,8 @@ #include "device.h" #include "nnbackend.h" #include "backend_manager.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" -#include "common/utils.h" +#include "neural_network_runtime/neural_network_runtime_type.h" +#include "utils.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/components/nn_compiler/nn_compiler_test.cpp b/test/unittest/components/nn_compiler/nn_compiler_test.cpp index bec6830..37d938f 100644 --- a/test/unittest/components/nn_compiler/nn_compiler_test.cpp +++ b/test/unittest/components/nn_compiler/nn_compiler_test.cpp @@ -19,8 +19,8 @@ #include "nnbackend.h" #include "nncompiler.h" #include "device.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" -#include "common/utils.h" +#include "neural_network_runtime/neural_network_runtime_type.h" +#include "utils.h" #include "inner_model.h" using namespace testing; diff --git a/test/unittest/components/nn_executor/nn_executor_test.cpp b/test/unittest/components/nn_executor/nn_executor_test.cpp index a6178eb..c57486d 100644 --- a/test/unittest/components/nn_executor/nn_executor_test.cpp +++ b/test/unittest/components/nn_executor/nn_executor_test.cpp @@ -21,9 +21,9 @@ #include "nnbackend.h" #include "device.h" #include "prepared_model.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" -#include "common/utils.h" -#include "common/log.h" +#include "neural_network_runtime/neural_network_runtime_type.h" +#include "utils.h" +#include "log.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/components/nn_tensor/nn_tensor_test.cpp b/test/unittest/components/nn_tensor/nn_tensor_test.cpp index b651ac2..9a5a9d9 100644 --- a/test/unittest/components/nn_tensor/nn_tensor_test.cpp +++ b/test/unittest/components/nn_tensor/nn_tensor_test.cpp @@ -23,9 +23,9 @@ #include "backend_manager.h" #include "device.h" #include "prepared_model.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" -#include "common/utils.h" -#include "common/log.h" +#include "neural_network_runtime/neural_network_runtime_type.h" +#include "utils.h" +#include "log.h" #include "hdi_device_v1_0.h" using namespace testing; diff --git a/test/unittest/components/v1_0/device_manager/device_manager_test.cpp b/test/unittest/components/v1_0/device_manager/device_manager_test.cpp index 441fb5c..ac2e5d5 100644 --- a/test/unittest/components/v1_0/device_manager/device_manager_test.cpp +++ b/test/unittest/components/v1_0/device_manager/device_manager_test.cpp @@ -17,13 +17,13 @@ #include #include -#include "common/log.h" +#include "log.h" #include "hdi_device_v1_0.h" #include "test/unittest/common/v1_0/mock_idevice.h" #include "lite_graph_to_hdi_model_v1_0.h" #include "device.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" #include "nnbackend.h" #include "ops_registry.h" #include "transform.h" diff --git a/test/unittest/components/v1_0/device_registrar/device_registrar_test.cpp b/test/unittest/components/v1_0/device_registrar/device_registrar_test.cpp index f8c67cd..a5ba8f2 100644 --- a/test/unittest/components/v1_0/device_registrar/device_registrar_test.cpp +++ b/test/unittest/components/v1_0/device_registrar/device_registrar_test.cpp @@ -19,7 +19,7 @@ #include -#include "common/log.h" +#include "log.h" #include "hdi_device_v1_0.h" #include "test/unittest/common/v1_0/mock_idevice.h" diff --git a/test/unittest/components/v1_0/executor/executor_test.cpp b/test/unittest/components/v1_0/executor/executor_test.cpp index 4156954..5cfee36 100644 --- a/test/unittest/components/v1_0/executor/executor_test.cpp +++ b/test/unittest/components/v1_0/executor/executor_test.cpp @@ -15,7 +15,7 @@ #include "executor_test.h" -#include "common/scoped_trace.h" +#include "scoped_trace.h" #include "compilation.h" #include "inner_model.h" #include "test/unittest/common/v1_0/mock_idevice.h" diff --git a/test/unittest/components/v1_0/hdi_prepared_model/hdi_prepared_model_test.cpp b/test/unittest/components/v1_0/hdi_prepared_model/hdi_prepared_model_test.cpp index b013e43..c78654a 100644 --- a/test/unittest/components/v1_0/hdi_prepared_model/hdi_prepared_model_test.cpp +++ b/test/unittest/components/v1_0/hdi_prepared_model/hdi_prepared_model_test.cpp @@ -20,7 +20,7 @@ #include #include -#include "common/log.h" +#include "log.h" #include "hdi_prepared_model_v1_0.h" #include "memory_manager.h" #include "transform.h" diff --git a/test/unittest/components/v1_0/inner_model/inner_model_test.cpp b/test/unittest/components/v1_0/inner_model/inner_model_test.cpp index 15d7c8f..4bb42d0 100644 --- a/test/unittest/components/v1_0/inner_model/inner_model_test.cpp +++ b/test/unittest/components/v1_0/inner_model/inner_model_test.cpp @@ -16,8 +16,8 @@ #include #include -#include "common/utils.h" -#include "common/log.h" +#include "utils.h" +#include "log.h" #include "nn_tensor.h" #include "inner_model.h" @@ -25,7 +25,7 @@ #include "lite_graph_to_hdi_model_v2_1.h" #include "device.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" #include "nnbackend.h" #include "ops_registry.h" #include "transform.h" diff --git a/test/unittest/components/v1_0/neural_network_core_test/neural_network_core_test.cpp b/test/unittest/components/v1_0/neural_network_core_test/neural_network_core_test.cpp index b997e3a..aa4b6c3 100644 --- a/test/unittest/components/v1_0/neural_network_core_test/neural_network_core_test.cpp +++ b/test/unittest/components/v1_0/neural_network_core_test/neural_network_core_test.cpp @@ -17,7 +17,7 @@ #include #include "nnbackend.h" -#include "common/utils.h" +#include "utils.h" #include "neural_network_core_test.h" #include "compilation.h" #include "tensor.h" @@ -25,8 +25,8 @@ #include "backend.h" #include "backend_manager.h" #include "backend_registrar.h" -#include "common/log.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_core.h" +#include "log.h" +#include "neural_network_runtime/neural_network_core.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/test/unittest/components/v1_0/neural_network_core_test/neural_network_core_test.h b/test/unittest/components/v1_0/neural_network_core_test/neural_network_core_test.h index 4c8d864..fd05496 100644 --- a/test/unittest/components/v1_0/neural_network_core_test/neural_network_core_test.h +++ b/test/unittest/components/v1_0/neural_network_core_test/neural_network_core_test.h @@ -18,7 +18,7 @@ #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime/neural_network_runtime.h" #include "inner_model.h" #include "executor.h" diff --git a/test/unittest/components/v1_0/neural_network_runtime_test/neural_network_runtime_test.cpp b/test/unittest/components/v1_0/neural_network_runtime_test/neural_network_runtime_test.cpp index 65d52a9..bc325d8 100644 --- a/test/unittest/components/v1_0/neural_network_runtime_test/neural_network_runtime_test.cpp +++ b/test/unittest/components/v1_0/neural_network_runtime_test/neural_network_runtime_test.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "common/utils.h" +#include "utils.h" #include "compilation.h" #include "hdi_device_v1_0.h" #include "test/unittest/common/v1_0/mock_idevice.h" diff --git a/test/unittest/components/v1_0/neural_network_runtime_test/neural_network_runtime_test.h b/test/unittest/components/v1_0/neural_network_runtime_test/neural_network_runtime_test.h index 7bee0f4..5782ccc 100644 --- a/test/unittest/components/v1_0/neural_network_runtime_test/neural_network_runtime_test.h +++ b/test/unittest/components/v1_0/neural_network_runtime_test/neural_network_runtime_test.h @@ -18,7 +18,7 @@ #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime/neural_network_runtime.h" #include "inner_model.h" #include "executor.h" diff --git a/test/unittest/components/v2_0/device_manager/device_manager_test.cpp b/test/unittest/components/v2_0/device_manager/device_manager_test.cpp index 6d2dfff..3fc16c2 100644 --- a/test/unittest/components/v2_0/device_manager/device_manager_test.cpp +++ b/test/unittest/components/v2_0/device_manager/device_manager_test.cpp @@ -16,7 +16,7 @@ #include #include -#include "common/log.h" +#include "log.h" #include "device_manager.h" #include "hdi_device_v2_0.h" #include "test/unittest/common/v2_0/mock_idevice.h" diff --git a/test/unittest/components/v2_0/device_registrar/device_registrar_test.cpp b/test/unittest/components/v2_0/device_registrar/device_registrar_test.cpp index 753e140..c31c7e0 100644 --- a/test/unittest/components/v2_0/device_registrar/device_registrar_test.cpp +++ b/test/unittest/components/v2_0/device_registrar/device_registrar_test.cpp @@ -19,7 +19,7 @@ #include #include -#include "common/log.h" +#include "log.h" #include "hdi_device_v2_0.h" #include "test/unittest/common/v2_0/mock_idevice.h" diff --git a/test/unittest/components/v2_0/executor/executor_test.cpp b/test/unittest/components/v2_0/executor/executor_test.cpp index 5d6c44d..0c9f7bb 100644 --- a/test/unittest/components/v2_0/executor/executor_test.cpp +++ b/test/unittest/components/v2_0/executor/executor_test.cpp @@ -15,7 +15,7 @@ #include "executor_test.h" -#include "common/scoped_trace.h" +#include "scoped_trace.h" #include "compilation.h" #include "inner_model.h" #include "test/unittest/common/v2_0/mock_idevice.h" diff --git a/test/unittest/components/v2_0/hdi_device/hdi_device_test.cpp b/test/unittest/components/v2_0/hdi_device/hdi_device_test.cpp index c9fa6ff..b36c802 100644 --- a/test/unittest/components/v2_0/hdi_device/hdi_device_test.cpp +++ b/test/unittest/components/v2_0/hdi_device/hdi_device_test.cpp @@ -34,8 +34,8 @@ #include "lite_graph_to_hdi_model_v2_0.h" #include "lite_graph_to_hdi_model_v2_1.h" #include "device.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" -#include "common/log.h" +#include "neural_network_runtime/neural_network_runtime_type.h" +#include "log.h" #include "nnbackend.h" #include "ops_registry.h" #include "transform.h" diff --git a/test/unittest/components/v2_0/hdi_prepared_model/hdi_prepared_model_test.cpp b/test/unittest/components/v2_0/hdi_prepared_model/hdi_prepared_model_test.cpp index 343ea31..e18c71d 100644 --- a/test/unittest/components/v2_0/hdi_prepared_model/hdi_prepared_model_test.cpp +++ b/test/unittest/components/v2_0/hdi_prepared_model/hdi_prepared_model_test.cpp @@ -20,7 +20,7 @@ #include #include -#include "common/log.h" +#include "log.h" #include "hdi_prepared_model_v2_0.h" #include "memory_manager.h" #include "transform.h" diff --git a/test/unittest/components/v2_0/inner_model/inner_model_test.cpp b/test/unittest/components/v2_0/inner_model/inner_model_test.cpp index 497c2d3..fcfe45d 100644 --- a/test/unittest/components/v2_0/inner_model/inner_model_test.cpp +++ b/test/unittest/components/v2_0/inner_model/inner_model_test.cpp @@ -16,8 +16,8 @@ #include #include -#include "common/utils.h" -#include "common/log.h" +#include "utils.h" +#include "log.h" #include "nn_tensor.h" #include "inner_model.h" @@ -25,7 +25,7 @@ #include "lite_graph_to_hdi_model_v2_0.h" #include "device.h" -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime_type.h" +#include "neural_network_runtime/neural_network_runtime_type.h" #include "nnbackend.h" #include "ops_registry.h" #include "transform.h" diff --git a/test/unittest/components/v2_0/neural_network_runtime_test/neural_network_runtime_test.cpp b/test/unittest/components/v2_0/neural_network_runtime_test/neural_network_runtime_test.cpp index a7d2de9..41d7f53 100644 --- a/test/unittest/components/v2_0/neural_network_runtime_test/neural_network_runtime_test.cpp +++ b/test/unittest/components/v2_0/neural_network_runtime_test/neural_network_runtime_test.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "common/utils.h" +#include "utils.h" #include "compilation.h" #include "hdi_device_v2_0.h" #include "test/unittest/common/v2_0/mock_idevice.h" diff --git a/test/unittest/components/v2_0/neural_network_runtime_test/neural_network_runtime_test.h b/test/unittest/components/v2_0/neural_network_runtime_test/neural_network_runtime_test.h index 7bee0f4..5782ccc 100644 --- a/test/unittest/components/v2_0/neural_network_runtime_test/neural_network_runtime_test.h +++ b/test/unittest/components/v2_0/neural_network_runtime_test/neural_network_runtime_test.h @@ -18,7 +18,7 @@ #include -#include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" +#include "neural_network_runtime/neural_network_runtime.h" #include "inner_model.h" #include "executor.h" diff --git a/test/unittest/components/v2_1/hdi_prepared_model/hdi_prepared_model_test.cpp b/test/unittest/components/v2_1/hdi_prepared_model/hdi_prepared_model_test.cpp index d60f38f..1d2983c 100644 --- a/test/unittest/components/v2_1/hdi_prepared_model/hdi_prepared_model_test.cpp +++ b/test/unittest/components/v2_1/hdi_prepared_model/hdi_prepared_model_test.cpp @@ -20,7 +20,7 @@ #include #include -#include "common/log.h" +#include "log.h" #include "hdi_prepared_model_v2_1.h" #include "memory_manager.h" #include "transform.h" diff --git a/test/unittest/inner_kits/BUILD.gn b/test/unittest/inner_kits/BUILD.gn index 9f90993..ebcbed3 100644 --- a/test/unittest/inner_kits/BUILD.gn +++ b/test/unittest/inner_kits/BUILD.gn @@ -18,15 +18,6 @@ module_output_path = "neural_network_runtime/" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "//third_party/googletest/googlemock/include", - "../../..", - "../../../frameworks/native/neural_network_runtime", - "../../../frameworks/native/neural_network_core", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//third_party/mindspore/mindspore-src/source/mindspore/lite/mindir/include", - ] - cflags = [ "-Wall", "-Wextra", @@ -43,19 +34,16 @@ ohos_unittest("NeuralNetworkRuntimeInnerTest") { configs = [ ":module_private_config" ] - deps = [ - "../../../frameworks/native/neural_network_core:libneural_network_core", - "../../../frameworks/native/neural_network_runtime:libneural_network_runtime", - "//third_party/googletest:gtest_main", - ] - external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } diff --git a/test/unittest/ops/BUILD.gn b/test/unittest/ops/BUILD.gn index e11bc3b..ee8a38e 100644 --- a/test/unittest/ops/BUILD.gn +++ b/test/unittest/ops/BUILD.gn @@ -19,13 +19,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/googletest/googlemock/include", "../../..", - "../../../frameworks/native", - "../../../frameworks/native/neural_network_runtime", - "../../../frameworks/native/neural_network_core", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//third_party/mindspore/mindspore-src/source/mindspore/lite/mindir/include", ] } @@ -155,18 +149,15 @@ ohos_unittest("OpsUnittest") { ":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_2.1", "hilog:libhilog", "hitrace:hitrace_meter", - "mindspore:mindir", + "googletest:gmock_main", + "googletest:gtest_main", + "mindspore:mindir_lib", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } -- Gitee From dffbaa1944b81a405d396fe9d7f4b353417e9362 Mon Sep 17 00:00:00 2001 From: w30052974 Date: Thu, 27 Feb 2025 15:14:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?nnrt=20=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: w30052974 --- frameworks/native/neural_network_runtime/BUILD.gn | 2 +- test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn | 6 +++--- test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn | 6 +++--- .../unittest/inner_kits/neural_network_runtime_inner_test.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frameworks/native/neural_network_runtime/BUILD.gn b/frameworks/native/neural_network_runtime/BUILD.gn index adf9fa0..31959c7 100644 --- a/frameworks/native/neural_network_runtime/BUILD.gn +++ b/frameworks/native/neural_network_runtime/BUILD.gn @@ -195,7 +195,7 @@ ohos_shared_library("libneural_network_runtime") { "hitrace:libhitracechain", "init:libbegetutil", "ipc:ipc_core", - "mindspore:mindir", + "mindspore:mindir_lib", ] deps = [ "../neural_network_core:libneural_network_core" ] diff --git a/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn b/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn index 5e0e2f6..54acb5e 100644 --- a/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn +++ b/test/fuzztest/hdinnrtdevice_fuzzer/BUILD.gn @@ -34,13 +34,13 @@ ohos_fuzztest("HdiNnrtDeviceFuzzTest") { sources = [ "hdinnrtdevice_fuzzer.cpp" ] external_deps = [ - "bounds_checking_function::libsec_shared", + "bounds_checking_function:libsec_shared", "c_utils:utils", "drivers_interface_nnrt:libnnrt_stub_2.0", "hdf_core:libhdi", "hilog:libhilog", "ipc:ipc_core", - "neural_network_runtime::neural_network_core", - "neural_network_runtime::neural_network_runtime", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } diff --git a/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn b/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn index 07a0540..414278b 100644 --- a/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn +++ b/test/fuzztest/hdinnrtpreparedmodel_fuzzer/BUILD.gn @@ -34,13 +34,13 @@ ohos_fuzztest("HdiNnrtPreparedModelFuzzTest") { sources = [ "hdinnrtpreparedmodel_fuzzer.cpp" ] external_deps = [ - "bounds_checking_function::libsec_shared", + "bounds_checking_function:libsec_shared", "c_utils:utils", "drivers_interface_nnrt:libnnrt_stub_2.0", "hdf_core:libhdi", "hilog:libhilog", "ipc:ipc_core", - "neural_network_runtime::neural_network_core", - "neural_network_runtime::neural_network_runtime", + "neural_network_runtime:libneural_network_core", + "neural_network_runtime:libneural_network_runtime", ] } diff --git a/test/unittest/inner_kits/neural_network_runtime_inner_test.h b/test/unittest/inner_kits/neural_network_runtime_inner_test.h index 03d7d92..c481ec0 100644 --- a/test/unittest/inner_kits/neural_network_runtime_inner_test.h +++ b/test/unittest/inner_kits/neural_network_runtime_inner_test.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_INNER_UNITTEST_H #define NEURAL_NETWORK_RUNTIME_INNER_UNITTEST_H -#include "interfaces/innerkits/c/neural_network_runtime_inner.h" +#include "neural_network_runtime_inner.h" #include namespace OHOS { -- Gitee From 7f83c15f520596f701f440a5986789f0dfd9f718 Mon Sep 17 00:00:00 2001 From: w30052974 Date: Mon, 3 Mar 2025 15:19:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?nnrt=20=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: w30052974 --- test/unittest/components/BUILD.gn | 140 +++++++++++++++--------------- test/unittest/inner_kits/BUILD.gn | 2 +- test/unittest/ops/BUILD.gn | 8 +- 3 files changed, 73 insertions(+), 77 deletions(-) diff --git a/test/unittest/components/BUILD.gn b/test/unittest/components/BUILD.gn index f69fed4..f5d7bdc 100644 --- a/test/unittest/components/BUILD.gn +++ b/test/unittest/components/BUILD.gn @@ -18,9 +18,7 @@ module_output_path = "neural_network_runtime/" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "../../..", - ] + include_dirs = [ "../../.." ] } ohos_unittest("CompilationV1_0Test") { @@ -32,11 +30,11 @@ ohos_unittest("CompilationV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -52,11 +50,11 @@ ohos_unittest("ExecutorV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -73,10 +71,10 @@ ohos_unittest("DeviceManagerV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -93,10 +91,10 @@ ohos_unittest("DeviceRegistrarV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -114,10 +112,10 @@ ohos_unittest("HDIDeviceV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -135,10 +133,10 @@ ohos_unittest("HDIPreparedModelV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -154,10 +152,10 @@ ohos_unittest("MemoryManagerTest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -173,11 +171,11 @@ ohos_unittest("NeuralNetworkCoreV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -192,10 +190,10 @@ ohos_unittest("QuantParamsTest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -210,10 +208,10 @@ ohos_unittest("NNBackendTest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -228,10 +226,10 @@ ohos_unittest("NNCompiledCacheTest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -246,10 +244,10 @@ ohos_unittest("NNCompilerTest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -264,10 +262,10 @@ ohos_unittest("NNExecutorTest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -282,10 +280,10 @@ ohos_unittest("NNTensor2_0Test") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -300,10 +298,10 @@ ohos_unittest("TransformV1_0Test") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_1.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -320,11 +318,11 @@ ohos_unittest("InnerModelV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -340,11 +338,11 @@ ohos_unittest("NnTensorV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -360,11 +358,11 @@ ohos_unittest("NnTensorDescV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -380,11 +378,11 @@ ohos_unittest("NnValidationV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -400,11 +398,11 @@ ohos_unittest("OpsRegistryV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -423,11 +421,11 @@ ohos_unittest("NeuralNetworkRuntimeV1_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -443,11 +441,11 @@ ohos_unittest("CompilationV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -463,11 +461,11 @@ ohos_unittest("ExecutorV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -484,10 +482,10 @@ ohos_unittest("DeviceManagerV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -504,10 +502,10 @@ ohos_unittest("DeviceRegistrarV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -525,10 +523,10 @@ ohos_unittest("HDIDeviceV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -546,10 +544,10 @@ ohos_unittest("HDIPreparedModelV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -567,10 +565,10 @@ ohos_unittest("HDIPreparedModelV2_1Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -585,10 +583,10 @@ ohos_unittest("TransformV2_0Test") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_2.0", - "hilog:libhilog", - "hitrace:libhitracechain", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:libhitracechain", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -605,11 +603,11 @@ ohos_unittest("InnerModelV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -625,11 +623,11 @@ ohos_unittest("NnTensorV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -645,11 +643,11 @@ ohos_unittest("NnValidationV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -665,11 +663,11 @@ ohos_unittest("OpsRegistryV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", @@ -688,11 +686,11 @@ ohos_unittest("NeuralNetworkRuntimeV2_0Test") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_2.0", + "googletest:gmock_main", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gmock_main", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", diff --git a/test/unittest/inner_kits/BUILD.gn b/test/unittest/inner_kits/BUILD.gn index ebcbed3..4dcd1dd 100644 --- a/test/unittest/inner_kits/BUILD.gn +++ b/test/unittest/inner_kits/BUILD.gn @@ -37,10 +37,10 @@ ohos_unittest("NeuralNetworkRuntimeInnerTest") { external_deps = [ "c_utils:utils", "drivers_interface_nnrt:libnnrt_proxy_1.0", + "googletest:gtest_main", "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "googletest:gtest_main", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", diff --git a/test/unittest/ops/BUILD.gn b/test/unittest/ops/BUILD.gn index ee8a38e..de5a980 100644 --- a/test/unittest/ops/BUILD.gn +++ b/test/unittest/ops/BUILD.gn @@ -18,9 +18,7 @@ module_output_path = "neural_network_runtime/" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "../../..", - ] + include_dirs = [ "../../.." ] } ohos_unittest("OpsUnittest") { @@ -151,10 +149,10 @@ ohos_unittest("OpsUnittest") { external_deps = [ "drivers_interface_nnrt:libnnrt_proxy_2.1", - "hilog:libhilog", - "hitrace:hitrace_meter", "googletest:gmock_main", "googletest:gtest_main", + "hilog:libhilog", + "hitrace:hitrace_meter", "mindspore:mindir_lib", "neural_network_runtime:libneural_network_core", "neural_network_runtime:libneural_network_runtime", -- Gitee