From 2bed8598c4f5bac487caf7ef2d01025e15362287 Mon Sep 17 00:00:00 2001 From: wangchuanxia Date: Wed, 24 Jan 2024 11:42:07 +0800 Subject: [PATCH 1/2] nncore sep Signed-off-by: wangchuanxia --- BUILD.gn | 8 +- bundle.json | 8 + frameworks/BUILD.gn | 175 ------------------ .../native/neural_network_core/BUILD.gn | 55 ++++++ .../{ => neural_network_core}/backend.h | 0 .../backend_manager.cpp | 0 .../backend_manager.h | 0 .../backend_registrar.cpp | 0 .../backend_registrar.h | 0 .../{ => neural_network_core}/compilation.h | 0 .../{ => neural_network_core}/compiler.h | 0 .../{ => neural_network_core}/cpp_type.h | 0 .../{ => neural_network_core}/executor.h | 0 .../neural_network_core.cpp | 0 .../native/{ => neural_network_core}/tensor.h | 0 .../{ => neural_network_core}/tensor_desc.cpp | 0 .../{ => neural_network_core}/tensor_desc.h | 0 .../{ => neural_network_core}/utils.cpp | 0 .../{ => neural_network_core}/validation.cpp | 0 .../{ => neural_network_core}/validation.h | 0 .../native/neural_network_runtime/BUILD.gn | 136 ++++++++++++++ .../{ => neural_network_runtime}/device.h | 0 .../hdi_device_v1_0.cpp | 0 .../hdi_device_v1_0.h | 0 .../hdi_device_v2_0.cpp | 0 .../hdi_device_v2_0.h | 0 .../hdi_prepared_model_v1_0.cpp | 0 .../hdi_prepared_model_v1_0.h | 0 .../hdi_prepared_model_v2_0.cpp | 0 .../hdi_prepared_model_v2_0.h | 0 .../hdi_returncode_utils.h | 0 .../inner_model.cpp | 0 .../inner_model.h | 0 .../memory_manager.cpp | 0 .../memory_manager.h | 0 .../neural_network_runtime.cpp | 0 .../neural_network_runtime_compat.cpp | 0 .../nn_tensor.cpp | 0 .../{ => neural_network_runtime}/nn_tensor.h | 0 .../nnbackend.cpp | 0 .../{ => neural_network_runtime}/nnbackend.h | 0 .../nncompiled_cache.cpp | 0 .../nncompiled_cache.h | 0 .../nncompiler.cpp | 0 .../{ => neural_network_runtime}/nncompiler.h | 0 .../nnexecutor.cpp | 0 .../{ => neural_network_runtime}/nnexecutor.h | 0 .../{ => neural_network_runtime}/nntensor.cpp | 0 .../{ => neural_network_runtime}/nntensor.h | 0 .../ops/add_builder.cpp | 4 +- .../ops/add_builder.h | 4 +- .../ops/argmax_builder.cpp | 0 .../ops/argmax_builder.h | 4 +- .../ops/avgpool_builder.cpp | 0 .../ops/avgpool_builder.h | 2 +- .../ops/batch_to_space_nd_builder.cpp | 0 .../ops/batch_to_space_nd_builder.h | 4 +- .../ops/batchnorm_builder.cpp | 2 +- .../ops/batchnorm_builder.h | 2 +- .../ops/bias_add_builder.cpp | 0 .../ops/bias_add_builder.h | 4 +- .../ops/cast_builder.cpp | 4 +- .../ops/cast_builder.h | 4 +- .../ops/concat_builder.cpp | 0 .../ops/concat_builder.h | 4 +- .../ops/conv2d_builder.cpp | 4 +- .../ops/conv2d_builder.h | 4 +- .../ops/conv2d_transpose_builder.cpp | 4 +- .../ops/conv2d_transpose_builder.h | 4 +- .../ops/depthwise_conv2d_native_builder.cpp | 4 +- .../ops/depthwise_conv2d_native_builder.h | 4 +- .../ops/div_builder.cpp | 4 +- .../ops/div_builder.h | 4 +- .../ops/eltwise_builder.cpp | 0 .../ops/eltwise_builder.h | 4 +- .../ops/expandims_builder.cpp | 0 .../ops/expandims_builder.h | 4 +- .../ops/fill_builder.cpp | 2 +- .../ops/fill_builder.h | 2 +- .../ops/fullconnection_builder.cpp | 4 +- .../ops/fullconnection_builder.h | 4 +- .../ops/gather_builder.cpp | 2 +- .../ops/gather_builder.h | 2 +- .../ops/gelu_builder.cpp | 2 +- .../ops/gelu_builder.h | 2 +- .../ops/hswish_builder.cpp | 2 +- .../ops/hswish_builder.h | 2 +- .../ops/layernorm_builder.cpp | 2 +- .../ops/layernorm_builder.h | 2 +- .../ops/lessequal_builder.cpp | 2 +- .../ops/lessequal_builder.h | 2 +- .../ops/matmul_builder.cpp | 6 +- .../ops/matmul_builder.h | 2 +- .../ops/maximum_builder.cpp | 2 +- .../ops/maximum_builder.h | 2 +- .../ops/maxpool_builder.cpp | 0 .../ops/maxpool_builder.h | 2 +- .../ops/mul_builder.cpp | 6 +- .../ops/mul_builder.h | 2 +- .../ops/onehot_builder.cpp | 2 +- .../ops/onehot_builder.h | 2 +- .../ops/ops_validation.cpp | 0 .../ops/ops_validation.h | 0 .../ops/pad_builder.cpp | 2 +- .../ops/pad_builder.h | 2 +- .../ops/pooling_builder.cpp | 4 +- .../ops/pooling_builder.h | 2 +- .../ops/pow_builder.cpp | 2 +- .../ops/pow_builder.h | 2 +- .../ops/prelu_builder.cpp | 2 +- .../ops/prelu_builder.h | 2 +- .../ops/quant_dtype_cast_builder.cpp | 2 +- .../ops/quant_dtype_cast_builder.h | 2 +- .../ops/reduceall_builder.cpp | 2 +- .../ops/reduceall_builder.h | 2 +- .../ops/reducemean_builder.cpp | 2 +- .../ops/reducemean_builder.h | 2 +- .../ops/reduceprod_builder.cpp | 2 +- .../ops/reduceprod_builder.h | 2 +- .../ops/relu6_builder.cpp | 2 +- .../ops/relu6_builder.h | 2 +- .../ops/relu_builder.cpp | 2 +- .../ops/relu_builder.h | 2 +- .../ops/reshape_builder.cpp | 2 +- .../ops/reshape_builder.h | 2 +- .../ops/resize_bilinear_builder.cpp | 2 +- .../ops/resize_bilinear_builder.h | 2 +- .../ops/rsqrt_builder.cpp | 2 +- .../ops/rsqrt_builder.h | 2 +- .../ops/scale_builder.cpp | 6 +- .../ops/scale_builder.h | 2 +- .../ops/shape_builder.cpp | 2 +- .../ops/shape_builder.h | 2 +- .../ops/sigmoid_builder.cpp | 2 +- .../ops/sigmoid_builder.h | 2 +- .../ops/slice_builder.cpp | 0 .../ops/slice_builder.h | 4 +- .../ops/softmax_builder.cpp | 0 .../ops/softmax_builder.h | 4 +- .../ops/space_to_batch_nd_builder.cpp | 0 .../ops/space_to_batch_nd_builder.h | 4 +- .../ops/split_builder.cpp | 0 .../ops/split_builder.h | 4 +- .../ops/sqrt_builder.cpp | 0 .../ops/sqrt_builder.h | 4 +- .../ops/squared_difference_builder.cpp | 0 .../ops/squared_difference_builder.h | 4 +- .../ops/squeeze_builder.cpp | 0 .../ops/squeeze_builder.h | 4 +- .../ops/stack_builder.cpp | 0 .../ops/stack_builder.h | 4 +- .../ops/strided_slice_builder.cpp | 0 .../ops/strided_slice_builder.h | 4 +- .../ops/sub_builder.cpp | 4 +- .../ops/sub_builder.h | 4 +- .../ops/tanh_builder.cpp | 0 .../ops/tanh_builder.h | 4 +- .../ops/tile_builder.cpp | 0 .../ops/tile_builder.h | 4 +- .../ops/top_k_builder.cpp | 0 .../ops/top_k_builder.h | 4 +- .../ops/transpose_builder.cpp | 0 .../ops/transpose_builder.h | 4 +- .../ops/unsqueeze_builder.cpp | 0 .../ops/unsqueeze_builder.h | 4 +- .../ops_builder.cpp | 0 .../ops_builder.h | 0 .../ops_registry.cpp | 0 .../ops_registry.h | 0 .../prepared_model.h | 0 .../quant_param.cpp | 0 .../quant_param.h | 0 .../register_hdi_device_v1_0.cpp | 0 .../register_hdi_device_v2_0.cpp | 0 .../transform.cpp | 0 .../{ => neural_network_runtime}/transform.h | 0 test/system_test/BUILD.gn | 7 +- test/unittest/common/base_test.h | 2 +- .../common/v1_0/compilation_mock_idevice.cpp | 6 +- .../common/v1_0/executor_mock_device.cpp | 6 +- .../common/v1_0/inner_model_mock_device.cpp | 8 +- test/unittest/common/v1_0/mock_idevice.h | 6 +- .../common/v2_0/compilation_mock_idevice.cpp | 6 +- .../common/v2_0/executor_mock_device.cpp | 6 +- .../common/v2_0/inner_model_mock_device.cpp | 8 +- test/unittest/common/v2_0/mock_idevice.h | 6 +- test/unittest/components/BUILD.gn | 77 +++++--- .../memory_manager/memory_manager_test.cpp | 4 +- .../v1_0/compilation/compilation_test.h | 4 +- .../device_manager/device_manager_test.cpp | 4 +- .../device_registrar_test.cpp | 6 +- .../v1_0/executor/executor_test.cpp | 4 +- .../components/v1_0/executor/executor_test.h | 2 +- .../v1_0/hdi_device/hdi_device_test.cpp | 2 +- .../hdi_prepared_model_test.cpp | 6 +- .../v1_0/inner_model/inner_model_test.cpp | 4 +- .../v1_0/inner_model/nn_tensor_test.cpp | 4 +- .../v1_0/inner_model/nn_validation_test.cpp | 4 +- .../v1_0/inner_model/ops_registry_test.cpp | 8 +- .../neural_network_runtime_test.cpp | 6 +- .../neural_network_runtime_test.h | 4 +- .../v1_0/transform/transform_test.cpp | 4 +- .../v2_0/compilation/compilation_test.h | 4 +- .../device_manager/device_manager_test.cpp | 4 +- .../device_registrar_test.cpp | 6 +- .../v2_0/executor/executor_test.cpp | 4 +- .../components/v2_0/executor/executor_test.h | 2 +- .../v2_0/hdi_device/hdi_device_test.cpp | 2 +- .../hdi_prepared_model_test.cpp | 6 +- .../v2_0/inner_model/inner_model_test.cpp | 4 +- .../v2_0/inner_model/nn_tensor_test.cpp | 4 +- .../v2_0/inner_model/nn_validation_test.cpp | 4 +- .../v2_0/inner_model/ops_registry_test.cpp | 8 +- .../neural_network_runtime_test.cpp | 6 +- .../neural_network_runtime_test.h | 4 +- .../v2_0/transform/transform_test.cpp | 4 +- test/unittest/inner_kits/BUILD.gn | 7 +- .../neural_network_runtime_inner_test.cpp | 2 +- test/unittest/ops/BUILD.gn | 7 +- test/unittest/ops/add_test.cpp | 2 +- test/unittest/ops/argmax_test.cpp | 2 +- test/unittest/ops/avgpool_pad_test.cpp | 2 +- test/unittest/ops/avgpool_padmod_test.cpp | 2 +- test/unittest/ops/batch_to_space_nd_test.cpp | 2 +- test/unittest/ops/batchnorm_builder_test.cpp | 2 +- test/unittest/ops/biasadd_test.cpp | 2 +- test/unittest/ops/cast_test.cpp | 2 +- .../unittest/ops/concat_three_inputs_test.cpp | 2 +- test/unittest/ops/concat_two_inputs_test.cpp | 2 +- test/unittest/ops/conv2d_pad_test.cpp | 2 +- test/unittest/ops/conv2d_padmode_test.cpp | 2 +- .../ops/conv2d_tranpose_padmode_test.cpp | 2 +- .../ops/conv2d_transpose_pad_test.cpp | 2 +- .../ops/depthwise_conv2d_native_pad_test.cpp | 2 +- .../depthwise_conv2d_native_padmode_test.cpp | 2 +- test/unittest/ops/div_test.cpp | 2 +- test/unittest/ops/eltwise_test.cpp | 2 +- test/unittest/ops/expandims_test.cpp | 2 +- test/unittest/ops/fill_builder_test.cpp | 2 +- test/unittest/ops/fullconnection_test.cpp | 2 +- .../ops/fullconnection_with_axis_test.cpp | 2 +- test/unittest/ops/gather_builder_test.cpp | 2 +- test/unittest/ops/gelu_builder_test.cpp | 2 +- test/unittest/ops/hswish_builder_test.cpp | 2 +- test/unittest/ops/layernorm_builder_test.cpp | 2 +- test/unittest/ops/lessequal_builder_test.cpp | 2 +- test/unittest/ops/matmul_builder_test.cpp | 2 +- test/unittest/ops/maximum_builder_test.cpp | 2 +- test/unittest/ops/maxpool_pad_test.cpp | 2 +- test/unittest/ops/maxpool_padmode_test.cpp | 2 +- test/unittest/ops/mul_builder_test.cpp | 2 +- test/unittest/ops/onehot_builder_test.cpp | 2 +- test/unittest/ops/ops_test.h | 2 +- test/unittest/ops/pad_builder_test.cpp | 2 +- test/unittest/ops/pow_builder_test.cpp | 2 +- test/unittest/ops/prelu_builder_test.cpp | 2 +- .../ops/quant_dtype_cast_builder_test.cpp | 2 +- test/unittest/ops/reduce_all_builder_test.cpp | 2 +- .../unittest/ops/reduce_mean_builder_test.cpp | 2 +- .../unittest/ops/reduce_prod_builder_test.cpp | 2 +- test/unittest/ops/relu6_builder_test.cpp | 2 +- test/unittest/ops/relu_builder_test.cpp | 2 +- test/unittest/ops/reshape_builder_test.cpp | 2 +- .../ops/resize_bilinear_builder_test.cpp | 2 +- test/unittest/ops/rsqrt_builder_test.cpp | 2 +- test/unittest/ops/scale_builder_test.cpp | 2 +- test/unittest/ops/shape_builder_test.cpp | 2 +- test/unittest/ops/sigmoid_builder_test.cpp | 2 +- test/unittest/ops/slice_builder_test.cpp | 4 +- test/unittest/ops/softmax_builder_test.cpp | 4 +- .../ops/spacetobatchnd_builder_test.cpp | 4 +- test/unittest/ops/split_builder_test.cpp | 4 +- test/unittest/ops/sqrt_builder_test.cpp | 4 +- .../ops/squared_difference_builder_test.cpp | 4 +- test/unittest/ops/squeeze_builder_test.cpp | 4 +- test/unittest/ops/stack_builder_test.cpp | 4 +- .../ops/strided_slice_builder_test.cpp | 4 +- test/unittest/ops/sub_builder_test.cpp | 4 +- test/unittest/ops/tanh_builder_test.cpp | 4 +- test/unittest/ops/tile_builder_test.cpp | 4 +- test/unittest/ops/topk_builder_test.cpp | 4 +- test/unittest/ops/transpose_builder_test.cpp | 4 +- test/unittest/ops/unsqueeze_builder_test.cpp | 4 +- 283 files changed, 578 insertions(+), 514 deletions(-) delete mode 100644 frameworks/BUILD.gn create mode 100644 frameworks/native/neural_network_core/BUILD.gn rename frameworks/native/{ => neural_network_core}/backend.h (100%) rename frameworks/native/{ => neural_network_core}/backend_manager.cpp (100%) rename frameworks/native/{ => neural_network_core}/backend_manager.h (100%) rename frameworks/native/{ => neural_network_core}/backend_registrar.cpp (100%) rename frameworks/native/{ => neural_network_core}/backend_registrar.h (100%) rename frameworks/native/{ => neural_network_core}/compilation.h (100%) rename frameworks/native/{ => neural_network_core}/compiler.h (100%) rename frameworks/native/{ => neural_network_core}/cpp_type.h (100%) rename frameworks/native/{ => neural_network_core}/executor.h (100%) rename frameworks/native/{ => neural_network_core}/neural_network_core.cpp (100%) rename frameworks/native/{ => neural_network_core}/tensor.h (100%) rename frameworks/native/{ => neural_network_core}/tensor_desc.cpp (100%) rename frameworks/native/{ => neural_network_core}/tensor_desc.h (100%) rename frameworks/native/{ => neural_network_core}/utils.cpp (100%) rename frameworks/native/{ => neural_network_core}/validation.cpp (100%) rename frameworks/native/{ => neural_network_core}/validation.h (100%) create mode 100644 frameworks/native/neural_network_runtime/BUILD.gn rename frameworks/native/{ => neural_network_runtime}/device.h (100%) rename frameworks/native/{ => neural_network_runtime}/hdi_device_v1_0.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/hdi_device_v1_0.h (100%) rename frameworks/native/{ => neural_network_runtime}/hdi_device_v2_0.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/hdi_device_v2_0.h (100%) rename frameworks/native/{ => neural_network_runtime}/hdi_prepared_model_v1_0.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/hdi_prepared_model_v1_0.h (100%) rename frameworks/native/{ => neural_network_runtime}/hdi_prepared_model_v2_0.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/hdi_prepared_model_v2_0.h (100%) rename frameworks/native/{ => neural_network_runtime}/hdi_returncode_utils.h (100%) rename frameworks/native/{ => neural_network_runtime}/inner_model.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/inner_model.h (100%) rename frameworks/native/{ => neural_network_runtime}/memory_manager.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/memory_manager.h (100%) rename frameworks/native/{ => neural_network_runtime}/neural_network_runtime.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/neural_network_runtime_compat.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/nn_tensor.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/nn_tensor.h (100%) rename frameworks/native/{ => neural_network_runtime}/nnbackend.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/nnbackend.h (100%) rename frameworks/native/{ => neural_network_runtime}/nncompiled_cache.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/nncompiled_cache.h (100%) rename frameworks/native/{ => neural_network_runtime}/nncompiler.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/nncompiler.h (100%) rename frameworks/native/{ => neural_network_runtime}/nnexecutor.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/nnexecutor.h (100%) rename frameworks/native/{ => neural_network_runtime}/nntensor.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/nntensor.h (100%) rename frameworks/native/{ => neural_network_runtime}/ops/add_builder.cpp (97%) rename frameworks/native/{ => neural_network_runtime}/ops/add_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/argmax_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/argmax_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/avgpool_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/avgpool_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/batch_to_space_nd_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/batch_to_space_nd_builder.h (95%) rename frameworks/native/{ => neural_network_runtime}/ops/batchnorm_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/batchnorm_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/bias_add_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/bias_add_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/cast_builder.cpp (97%) rename frameworks/native/{ => neural_network_runtime}/ops/cast_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/concat_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/concat_builder.h (95%) rename frameworks/native/{ => neural_network_runtime}/ops/conv2d_builder.cpp (99%) rename frameworks/native/{ => neural_network_runtime}/ops/conv2d_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/conv2d_transpose_builder.cpp (99%) rename frameworks/native/{ => neural_network_runtime}/ops/conv2d_transpose_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/depthwise_conv2d_native_builder.cpp (99%) rename frameworks/native/{ => neural_network_runtime}/ops/depthwise_conv2d_native_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/div_builder.cpp (97%) rename frameworks/native/{ => neural_network_runtime}/ops/div_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/eltwise_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/eltwise_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/expandims_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/expandims_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/fill_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/fill_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/fullconnection_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/fullconnection_builder.h (95%) rename frameworks/native/{ => neural_network_runtime}/ops/gather_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/gather_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/gelu_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/gelu_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/hswish_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/hswish_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/layernorm_builder.cpp (99%) rename frameworks/native/{ => neural_network_runtime}/ops/layernorm_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/lessequal_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/lessequal_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/matmul_builder.cpp (97%) rename frameworks/native/{ => neural_network_runtime}/ops/matmul_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/maximum_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/maximum_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/maxpool_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/maxpool_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/mul_builder.cpp (97%) rename frameworks/native/{ => neural_network_runtime}/ops/mul_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/onehot_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/onehot_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/ops_validation.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/ops_validation.h (100%) rename frameworks/native/{ => neural_network_runtime}/ops/pad_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/pad_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/pooling_builder.cpp (99%) rename frameworks/native/{ => neural_network_runtime}/ops/pooling_builder.h (98%) rename frameworks/native/{ => neural_network_runtime}/ops/pow_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/pow_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/prelu_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/prelu_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/quant_dtype_cast_builder.cpp (99%) rename frameworks/native/{ => neural_network_runtime}/ops/quant_dtype_cast_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/reduceall_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/reduceall_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/reducemean_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/reducemean_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/reduceprod_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/reduceprod_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/relu6_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/relu6_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/relu_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/relu_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/reshape_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/reshape_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/resize_bilinear_builder.cpp (99%) rename frameworks/native/{ => neural_network_runtime}/ops/resize_bilinear_builder.h (98%) rename frameworks/native/{ => neural_network_runtime}/ops/rsqrt_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/rsqrt_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/scale_builder.cpp (97%) rename frameworks/native/{ => neural_network_runtime}/ops/scale_builder.h (97%) rename frameworks/native/{ => neural_network_runtime}/ops/shape_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/shape_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/sigmoid_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/sigmoid_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/slice_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/slice_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/softmax_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/softmax_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/space_to_batch_nd_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/space_to_batch_nd_builder.h (95%) rename frameworks/native/{ => neural_network_runtime}/ops/split_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/split_builder.h (95%) rename frameworks/native/{ => neural_network_runtime}/ops/sqrt_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/sqrt_builder.h (93%) rename frameworks/native/{ => neural_network_runtime}/ops/squared_difference_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/squared_difference_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/squeeze_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/squeeze_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/stack_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/stack_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/strided_slice_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/strided_slice_builder.h (96%) rename frameworks/native/{ => neural_network_runtime}/ops/sub_builder.cpp (98%) rename frameworks/native/{ => neural_network_runtime}/ops/sub_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/tanh_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/tanh_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/tile_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/tile_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/top_k_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/top_k_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/transpose_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/transpose_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops/unsqueeze_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops/unsqueeze_builder.h (94%) rename frameworks/native/{ => neural_network_runtime}/ops_builder.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops_builder.h (100%) rename frameworks/native/{ => neural_network_runtime}/ops_registry.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/ops_registry.h (100%) rename frameworks/native/{ => neural_network_runtime}/prepared_model.h (100%) rename frameworks/native/{ => neural_network_runtime}/quant_param.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/quant_param.h (100%) rename frameworks/native/{ => neural_network_runtime}/register_hdi_device_v1_0.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/register_hdi_device_v2_0.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/transform.cpp (100%) rename frameworks/native/{ => neural_network_runtime}/transform.h (100%) diff --git a/BUILD.gn b/BUILD.gn index 3244274..9b414f0 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -15,11 +15,15 @@ import("//build/ohos.gni") group("nnrt_target") { deps = [ - "frameworks:libneural_network_core", - "frameworks:libneural_network_runtime", + "frameworks/native/neural_network_core:libneural_network_core", + "frameworks/native/neural_network_runtime:libneural_network_runtime", ] } +group("nncore_target") { + deps = [ "frameworks/native/neural_network_core:libneural_network_core" ] +} + group("nnrt_test_target") { testonly = true deps = [ "test/unittest:unittest" ] diff --git a/bundle.json b/bundle.json index 558b2cb..055728e 100644 --- a/bundle.json +++ b/bundle.json @@ -44,6 +44,14 @@ "header_files": [], "header_base":"//foundation/ai/neural_network_runtime/interfaces/innerkits/c" } + }, + { + "type": "so", + "name": "//foundation/ai/neural_network_runtime:nncore_target", + "header": { + "header_files": [], + "header_base":"//foundation/ai/neural_network_runtime/interfaces/kits/c" + } } ], "test": [ diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn deleted file mode 100644 index d19cf9c..0000000 --- a/frameworks/BUILD.gn +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright (c) 2022 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") - -config("nnrt_config") { - cflags_cc = [ "-fexceptions" ] - include_dirs = [ - "..", - "../interfaces/innerkits/c", - ] -} - -nnrt_sources = [ - "native/hdi_device_v1_0.cpp", - "native/hdi_device_v2_0.cpp", - "native/hdi_prepared_model_v1_0.cpp", - "native/hdi_prepared_model_v2_0.cpp", - "native/inner_model.cpp", - "native/memory_manager.cpp", - "native/neural_network_runtime.cpp", - "native/neural_network_runtime_compat.cpp", - "native/nn_tensor.cpp", - "native/nnbackend.cpp", - "native/nncompiled_cache.cpp", - "native/nncompiler.cpp", - "native/nnexecutor.cpp", - "native/nntensor.cpp", - "native/ops_builder.cpp", - "native/ops_registry.cpp", - "native/quant_param.cpp", - "native/transform.cpp", - "native/validation.cpp", -] - -ops_sources = [ - "native/ops/add_builder.cpp", - "native/ops/argmax_builder.cpp", - "native/ops/avgpool_builder.cpp", - "native/ops/batch_to_space_nd_builder.cpp", - "native/ops/batchnorm_builder.cpp", - "native/ops/bias_add_builder.cpp", - "native/ops/cast_builder.cpp", - "native/ops/concat_builder.cpp", - "native/ops/conv2d_builder.cpp", - "native/ops/conv2d_transpose_builder.cpp", - "native/ops/depthwise_conv2d_native_builder.cpp", - "native/ops/div_builder.cpp", - "native/ops/eltwise_builder.cpp", - "native/ops/expandims_builder.cpp", - "native/ops/fill_builder.cpp", - "native/ops/fullconnection_builder.cpp", - "native/ops/gather_builder.cpp", - "native/ops/gelu_builder.cpp", - "native/ops/hswish_builder.cpp", - "native/ops/layernorm_builder.cpp", - "native/ops/lessequal_builder.cpp", - "native/ops/matmul_builder.cpp", - "native/ops/maximum_builder.cpp", - "native/ops/maxpool_builder.cpp", - "native/ops/mul_builder.cpp", - "native/ops/onehot_builder.cpp", - "native/ops/ops_validation.cpp", - "native/ops/pad_builder.cpp", - "native/ops/pooling_builder.cpp", - "native/ops/pow_builder.cpp", - "native/ops/prelu_builder.cpp", - "native/ops/quant_dtype_cast_builder.cpp", - "native/ops/reduceall_builder.cpp", - "native/ops/reducemean_builder.cpp", - "native/ops/reduceprod_builder.cpp", - "native/ops/relu6_builder.cpp", - "native/ops/relu_builder.cpp", - "native/ops/reshape_builder.cpp", - "native/ops/resize_bilinear_builder.cpp", - "native/ops/rsqrt_builder.cpp", - "native/ops/scale_builder.cpp", - "native/ops/shape_builder.cpp", - "native/ops/sigmoid_builder.cpp", - "native/ops/slice_builder.cpp", - "native/ops/softmax_builder.cpp", - "native/ops/space_to_batch_nd_builder.cpp", - "native/ops/split_builder.cpp", - "native/ops/sqrt_builder.cpp", - "native/ops/squared_difference_builder.cpp", - "native/ops/squeeze_builder.cpp", - "native/ops/stack_builder.cpp", - "native/ops/strided_slice_builder.cpp", - "native/ops/sub_builder.cpp", - "native/ops/tanh_builder.cpp", - "native/ops/tile_builder.cpp", - "native/ops/top_k_builder.cpp", - "native/ops/transpose_builder.cpp", - "native/ops/unsqueeze_builder.cpp", -] - -ohos_shared_library("libneural_network_runtime") { - sources = nnrt_sources - sources += ops_sources - output_extension = "so" - include_dirs = [ - "..", - "//third_party/mindspore/mindspore-src/source/mindspore/lite/mindir/include", - ] - - install_images = [ - "system", - "updater", - ] - - public_configs = [ ":nnrt_config" ] - all_dependent_configs = [ ":nnrt_config" ] - - external_deps = [ - "c_utils:utils", - "drivers_interface_nnrt:libnnrt_proxy_1.0", - "drivers_interface_nnrt:libnnrt_proxy_2.0", - "hdf_core:libhdf_utils", - "hilog:libhilog", - "hitrace:libhitracechain", - "mindspore:mindir", - ] - - deps = [ ":libneural_network_core" ] - - subsystem_name = "ai" - innerapi_tags = [ "ndk" ] - part_name = "neural_network_runtime" -} - -nnrt_core_sources = [ - "native/backend_manager.cpp", - "native/backend_registrar.cpp", - "native/neural_network_core.cpp", - "native/tensor_desc.cpp", - "native/utils.cpp", - "native/validation.cpp", -] - -ohos_shared_library("libneural_network_core") { - sources = nnrt_core_sources - output_extension = "so" - include_dirs = [ - "..", - "//third_party/mindspore/mindspore-src/source/mindspore/lite/mindir/include", - ] - - install_images = [ - "system", - "updater", - ] - - public_configs = [ ":nnrt_config" ] - all_dependent_configs = [ ":nnrt_config" ] - - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - "hitrace:libhitracechain", - ] - - subsystem_name = "ai" - innerapi_tags = [ "ndk" ] - part_name = "neural_network_runtime" -} diff --git a/frameworks/native/neural_network_core/BUILD.gn b/frameworks/native/neural_network_core/BUILD.gn new file mode 100644 index 0000000..2fb3695 --- /dev/null +++ b/frameworks/native/neural_network_core/BUILD.gn @@ -0,0 +1,55 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") + +config("nnrt_config") { + cflags = [ "-fstack-protector-all" ] + cflags_cc = [ "-fexceptions" ] + include_dirs = [ + "../../..", + "../neural_network_runtime", + "./", + "../../../interfaces/innerkits/c", + ] +} + +nnrt_core_sources = [ + "backend_manager.cpp", + "backend_registrar.cpp", + "neural_network_core.cpp", + "tensor_desc.cpp", + "utils.cpp", + "validation.cpp", +] + +ohos_shared_library("libneural_network_core") { + sources = nnrt_core_sources + output_extension = "so" + + install_images = [ + "system", + "updater", + ] + + public_configs = [ ":nnrt_config" ] + + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + ] + + subsystem_name = "ai" + innerapi_tags = [ "ndk" ] + part_name = "neural_network_runtime" +} diff --git a/frameworks/native/backend.h b/frameworks/native/neural_network_core/backend.h similarity index 100% rename from frameworks/native/backend.h rename to frameworks/native/neural_network_core/backend.h diff --git a/frameworks/native/backend_manager.cpp b/frameworks/native/neural_network_core/backend_manager.cpp similarity index 100% rename from frameworks/native/backend_manager.cpp rename to frameworks/native/neural_network_core/backend_manager.cpp diff --git a/frameworks/native/backend_manager.h b/frameworks/native/neural_network_core/backend_manager.h similarity index 100% rename from frameworks/native/backend_manager.h rename to frameworks/native/neural_network_core/backend_manager.h diff --git a/frameworks/native/backend_registrar.cpp b/frameworks/native/neural_network_core/backend_registrar.cpp similarity index 100% rename from frameworks/native/backend_registrar.cpp rename to frameworks/native/neural_network_core/backend_registrar.cpp diff --git a/frameworks/native/backend_registrar.h b/frameworks/native/neural_network_core/backend_registrar.h similarity index 100% rename from frameworks/native/backend_registrar.h rename to frameworks/native/neural_network_core/backend_registrar.h diff --git a/frameworks/native/compilation.h b/frameworks/native/neural_network_core/compilation.h similarity index 100% rename from frameworks/native/compilation.h rename to frameworks/native/neural_network_core/compilation.h diff --git a/frameworks/native/compiler.h b/frameworks/native/neural_network_core/compiler.h similarity index 100% rename from frameworks/native/compiler.h rename to frameworks/native/neural_network_core/compiler.h diff --git a/frameworks/native/cpp_type.h b/frameworks/native/neural_network_core/cpp_type.h similarity index 100% rename from frameworks/native/cpp_type.h rename to frameworks/native/neural_network_core/cpp_type.h diff --git a/frameworks/native/executor.h b/frameworks/native/neural_network_core/executor.h similarity index 100% rename from frameworks/native/executor.h rename to frameworks/native/neural_network_core/executor.h diff --git a/frameworks/native/neural_network_core.cpp b/frameworks/native/neural_network_core/neural_network_core.cpp similarity index 100% rename from frameworks/native/neural_network_core.cpp rename to frameworks/native/neural_network_core/neural_network_core.cpp diff --git a/frameworks/native/tensor.h b/frameworks/native/neural_network_core/tensor.h similarity index 100% rename from frameworks/native/tensor.h rename to frameworks/native/neural_network_core/tensor.h diff --git a/frameworks/native/tensor_desc.cpp b/frameworks/native/neural_network_core/tensor_desc.cpp similarity index 100% rename from frameworks/native/tensor_desc.cpp rename to frameworks/native/neural_network_core/tensor_desc.cpp diff --git a/frameworks/native/tensor_desc.h b/frameworks/native/neural_network_core/tensor_desc.h similarity index 100% rename from frameworks/native/tensor_desc.h rename to frameworks/native/neural_network_core/tensor_desc.h diff --git a/frameworks/native/utils.cpp b/frameworks/native/neural_network_core/utils.cpp similarity index 100% rename from frameworks/native/utils.cpp rename to frameworks/native/neural_network_core/utils.cpp diff --git a/frameworks/native/validation.cpp b/frameworks/native/neural_network_core/validation.cpp similarity index 100% rename from frameworks/native/validation.cpp rename to frameworks/native/neural_network_core/validation.cpp diff --git a/frameworks/native/validation.h b/frameworks/native/neural_network_core/validation.h similarity index 100% rename from frameworks/native/validation.h rename to frameworks/native/neural_network_core/validation.h diff --git a/frameworks/native/neural_network_runtime/BUILD.gn b/frameworks/native/neural_network_runtime/BUILD.gn new file mode 100644 index 0000000..2ef2e4a --- /dev/null +++ b/frameworks/native/neural_network_runtime/BUILD.gn @@ -0,0 +1,136 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") + +config("nnrt_config") { + cflags = [ "-fstack-protector-all" ] + cflags_cc = [ "-fexceptions" ] + include_dirs = [ + "../../..", + "./", + "../neural_network_core", + "../../../interfaces/innerkits/c", + ] +} + +nnrt_sources = [ + "hdi_device_v1_0.cpp", + "hdi_device_v2_0.cpp", + "hdi_prepared_model_v1_0.cpp", + "hdi_prepared_model_v2_0.cpp", + "inner_model.cpp", + "memory_manager.cpp", + "neural_network_runtime.cpp", + "neural_network_runtime_compat.cpp", + "nn_tensor.cpp", + "nnbackend.cpp", + "nncompiled_cache.cpp", + "nncompiler.cpp", + "nnexecutor.cpp", + "nntensor.cpp", + "ops_builder.cpp", + "ops_registry.cpp", + "quant_param.cpp", + "transform.cpp", +] + +ops_sources = [ + "ops/add_builder.cpp", + "ops/argmax_builder.cpp", + "ops/avgpool_builder.cpp", + "ops/batch_to_space_nd_builder.cpp", + "ops/batchnorm_builder.cpp", + "ops/bias_add_builder.cpp", + "ops/cast_builder.cpp", + "ops/concat_builder.cpp", + "ops/conv2d_builder.cpp", + "ops/conv2d_transpose_builder.cpp", + "ops/depthwise_conv2d_native_builder.cpp", + "ops/div_builder.cpp", + "ops/eltwise_builder.cpp", + "ops/expandims_builder.cpp", + "ops/fill_builder.cpp", + "ops/fullconnection_builder.cpp", + "ops/gather_builder.cpp", + "ops/gelu_builder.cpp", + "ops/hswish_builder.cpp", + "ops/layernorm_builder.cpp", + "ops/lessequal_builder.cpp", + "ops/matmul_builder.cpp", + "ops/maximum_builder.cpp", + "ops/maxpool_builder.cpp", + "ops/mul_builder.cpp", + "ops/onehot_builder.cpp", + "ops/ops_validation.cpp", + "ops/pad_builder.cpp", + "ops/pooling_builder.cpp", + "ops/pow_builder.cpp", + "ops/prelu_builder.cpp", + "ops/quant_dtype_cast_builder.cpp", + "ops/reduceall_builder.cpp", + "ops/reducemean_builder.cpp", + "ops/reduceprod_builder.cpp", + "ops/relu6_builder.cpp", + "ops/relu_builder.cpp", + "ops/reshape_builder.cpp", + "ops/resize_bilinear_builder.cpp", + "ops/rsqrt_builder.cpp", + "ops/scale_builder.cpp", + "ops/shape_builder.cpp", + "ops/sigmoid_builder.cpp", + "ops/slice_builder.cpp", + "ops/softmax_builder.cpp", + "ops/space_to_batch_nd_builder.cpp", + "ops/split_builder.cpp", + "ops/sqrt_builder.cpp", + "ops/squared_difference_builder.cpp", + "ops/squeeze_builder.cpp", + "ops/stack_builder.cpp", + "ops/strided_slice_builder.cpp", + "ops/sub_builder.cpp", + "ops/tanh_builder.cpp", + "ops/tile_builder.cpp", + "ops/top_k_builder.cpp", + "ops/transpose_builder.cpp", + "ops/unsqueeze_builder.cpp", +] + +ohos_shared_library("libneural_network_runtime") { + sources = nnrt_sources + sources += ops_sources + output_extension = "so" + + install_images = [ + "system", + "updater", + ] + + public_configs = [ ":nnrt_config" ] + + external_deps = [ + "c_utils:utils", + "drivers_interface_nnrt:libnnrt_proxy_1.0", + "drivers_interface_nnrt:libnnrt_proxy_2.0", + "hdf_core:libhdf_utils", + "hilog:libhilog", + "hitrace:libhitracechain", + "mindspore:mindir_lib", + ] + + deps = [ "../neural_network_core:libneural_network_core" ] + + subsystem_name = "ai" + innerapi_tags = [ "ndk" ] + part_name = "neural_network_runtime" +} diff --git a/frameworks/native/device.h b/frameworks/native/neural_network_runtime/device.h similarity index 100% rename from frameworks/native/device.h rename to frameworks/native/neural_network_runtime/device.h diff --git a/frameworks/native/hdi_device_v1_0.cpp b/frameworks/native/neural_network_runtime/hdi_device_v1_0.cpp similarity index 100% rename from frameworks/native/hdi_device_v1_0.cpp rename to frameworks/native/neural_network_runtime/hdi_device_v1_0.cpp diff --git a/frameworks/native/hdi_device_v1_0.h b/frameworks/native/neural_network_runtime/hdi_device_v1_0.h similarity index 100% rename from frameworks/native/hdi_device_v1_0.h rename to frameworks/native/neural_network_runtime/hdi_device_v1_0.h diff --git a/frameworks/native/hdi_device_v2_0.cpp b/frameworks/native/neural_network_runtime/hdi_device_v2_0.cpp similarity index 100% rename from frameworks/native/hdi_device_v2_0.cpp rename to frameworks/native/neural_network_runtime/hdi_device_v2_0.cpp diff --git a/frameworks/native/hdi_device_v2_0.h b/frameworks/native/neural_network_runtime/hdi_device_v2_0.h similarity index 100% rename from frameworks/native/hdi_device_v2_0.h rename to frameworks/native/neural_network_runtime/hdi_device_v2_0.h diff --git a/frameworks/native/hdi_prepared_model_v1_0.cpp b/frameworks/native/neural_network_runtime/hdi_prepared_model_v1_0.cpp similarity index 100% rename from frameworks/native/hdi_prepared_model_v1_0.cpp rename to frameworks/native/neural_network_runtime/hdi_prepared_model_v1_0.cpp diff --git a/frameworks/native/hdi_prepared_model_v1_0.h b/frameworks/native/neural_network_runtime/hdi_prepared_model_v1_0.h similarity index 100% rename from frameworks/native/hdi_prepared_model_v1_0.h rename to frameworks/native/neural_network_runtime/hdi_prepared_model_v1_0.h diff --git a/frameworks/native/hdi_prepared_model_v2_0.cpp b/frameworks/native/neural_network_runtime/hdi_prepared_model_v2_0.cpp similarity index 100% rename from frameworks/native/hdi_prepared_model_v2_0.cpp rename to frameworks/native/neural_network_runtime/hdi_prepared_model_v2_0.cpp diff --git a/frameworks/native/hdi_prepared_model_v2_0.h b/frameworks/native/neural_network_runtime/hdi_prepared_model_v2_0.h similarity index 100% rename from frameworks/native/hdi_prepared_model_v2_0.h rename to frameworks/native/neural_network_runtime/hdi_prepared_model_v2_0.h diff --git a/frameworks/native/hdi_returncode_utils.h b/frameworks/native/neural_network_runtime/hdi_returncode_utils.h similarity index 100% rename from frameworks/native/hdi_returncode_utils.h rename to frameworks/native/neural_network_runtime/hdi_returncode_utils.h diff --git a/frameworks/native/inner_model.cpp b/frameworks/native/neural_network_runtime/inner_model.cpp similarity index 100% rename from frameworks/native/inner_model.cpp rename to frameworks/native/neural_network_runtime/inner_model.cpp diff --git a/frameworks/native/inner_model.h b/frameworks/native/neural_network_runtime/inner_model.h similarity index 100% rename from frameworks/native/inner_model.h rename to frameworks/native/neural_network_runtime/inner_model.h diff --git a/frameworks/native/memory_manager.cpp b/frameworks/native/neural_network_runtime/memory_manager.cpp similarity index 100% rename from frameworks/native/memory_manager.cpp rename to frameworks/native/neural_network_runtime/memory_manager.cpp diff --git a/frameworks/native/memory_manager.h b/frameworks/native/neural_network_runtime/memory_manager.h similarity index 100% rename from frameworks/native/memory_manager.h rename to frameworks/native/neural_network_runtime/memory_manager.h diff --git a/frameworks/native/neural_network_runtime.cpp b/frameworks/native/neural_network_runtime/neural_network_runtime.cpp similarity index 100% rename from frameworks/native/neural_network_runtime.cpp rename to frameworks/native/neural_network_runtime/neural_network_runtime.cpp diff --git a/frameworks/native/neural_network_runtime_compat.cpp b/frameworks/native/neural_network_runtime/neural_network_runtime_compat.cpp similarity index 100% rename from frameworks/native/neural_network_runtime_compat.cpp rename to frameworks/native/neural_network_runtime/neural_network_runtime_compat.cpp diff --git a/frameworks/native/nn_tensor.cpp b/frameworks/native/neural_network_runtime/nn_tensor.cpp similarity index 100% rename from frameworks/native/nn_tensor.cpp rename to frameworks/native/neural_network_runtime/nn_tensor.cpp diff --git a/frameworks/native/nn_tensor.h b/frameworks/native/neural_network_runtime/nn_tensor.h similarity index 100% rename from frameworks/native/nn_tensor.h rename to frameworks/native/neural_network_runtime/nn_tensor.h diff --git a/frameworks/native/nnbackend.cpp b/frameworks/native/neural_network_runtime/nnbackend.cpp similarity index 100% rename from frameworks/native/nnbackend.cpp rename to frameworks/native/neural_network_runtime/nnbackend.cpp diff --git a/frameworks/native/nnbackend.h b/frameworks/native/neural_network_runtime/nnbackend.h similarity index 100% rename from frameworks/native/nnbackend.h rename to frameworks/native/neural_network_runtime/nnbackend.h diff --git a/frameworks/native/nncompiled_cache.cpp b/frameworks/native/neural_network_runtime/nncompiled_cache.cpp similarity index 100% rename from frameworks/native/nncompiled_cache.cpp rename to frameworks/native/neural_network_runtime/nncompiled_cache.cpp diff --git a/frameworks/native/nncompiled_cache.h b/frameworks/native/neural_network_runtime/nncompiled_cache.h similarity index 100% rename from frameworks/native/nncompiled_cache.h rename to frameworks/native/neural_network_runtime/nncompiled_cache.h diff --git a/frameworks/native/nncompiler.cpp b/frameworks/native/neural_network_runtime/nncompiler.cpp similarity index 100% rename from frameworks/native/nncompiler.cpp rename to frameworks/native/neural_network_runtime/nncompiler.cpp diff --git a/frameworks/native/nncompiler.h b/frameworks/native/neural_network_runtime/nncompiler.h similarity index 100% rename from frameworks/native/nncompiler.h rename to frameworks/native/neural_network_runtime/nncompiler.h diff --git a/frameworks/native/nnexecutor.cpp b/frameworks/native/neural_network_runtime/nnexecutor.cpp similarity index 100% rename from frameworks/native/nnexecutor.cpp rename to frameworks/native/neural_network_runtime/nnexecutor.cpp diff --git a/frameworks/native/nnexecutor.h b/frameworks/native/neural_network_runtime/nnexecutor.h similarity index 100% rename from frameworks/native/nnexecutor.h rename to frameworks/native/neural_network_runtime/nnexecutor.h diff --git a/frameworks/native/nntensor.cpp b/frameworks/native/neural_network_runtime/nntensor.cpp similarity index 100% rename from frameworks/native/nntensor.cpp rename to frameworks/native/neural_network_runtime/nntensor.cpp diff --git a/frameworks/native/nntensor.h b/frameworks/native/neural_network_runtime/nntensor.h similarity index 100% rename from frameworks/native/nntensor.h rename to frameworks/native/neural_network_runtime/nntensor.h diff --git a/frameworks/native/ops/add_builder.cpp b/frameworks/native/neural_network_runtime/ops/add_builder.cpp similarity index 97% rename from frameworks/native/ops/add_builder.cpp rename to frameworks/native/neural_network_runtime/ops/add_builder.cpp index 96dd295..b4ede0c 100644 --- a/frameworks/native/ops/add_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/add_builder.cpp @@ -15,8 +15,8 @@ #include "add_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" +#include "transform.h" +#include "validation.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/add_builder.h b/frameworks/native/neural_network_runtime/ops/add_builder.h similarity index 94% rename from frameworks/native/ops/add_builder.h rename to frameworks/native/neural_network_runtime/ops/add_builder.h index c08d4d9..58594b7 100644 --- a/frameworks/native/ops/add_builder.h +++ b/frameworks/native/neural_network_runtime/ops/add_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/argmax_builder.cpp b/frameworks/native/neural_network_runtime/ops/argmax_builder.cpp similarity index 100% rename from frameworks/native/ops/argmax_builder.cpp rename to frameworks/native/neural_network_runtime/ops/argmax_builder.cpp diff --git a/frameworks/native/ops/argmax_builder.h b/frameworks/native/neural_network_runtime/ops/argmax_builder.h similarity index 94% rename from frameworks/native/ops/argmax_builder.h rename to frameworks/native/neural_network_runtime/ops/argmax_builder.h index 73139e3..aedb9f2 100644 --- a/frameworks/native/ops/argmax_builder.h +++ b/frameworks/native/neural_network_runtime/ops/argmax_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/avgpool_builder.cpp b/frameworks/native/neural_network_runtime/ops/avgpool_builder.cpp similarity index 100% rename from frameworks/native/ops/avgpool_builder.cpp rename to frameworks/native/neural_network_runtime/ops/avgpool_builder.cpp diff --git a/frameworks/native/ops/avgpool_builder.h b/frameworks/native/neural_network_runtime/ops/avgpool_builder.h similarity index 96% rename from frameworks/native/ops/avgpool_builder.h rename to frameworks/native/neural_network_runtime/ops/avgpool_builder.h index fc58d41..37c8824 100644 --- a/frameworks/native/ops/avgpool_builder.h +++ b/frameworks/native/neural_network_runtime/ops/avgpool_builder.h @@ -17,7 +17,7 @@ #define NEURAL_NETWORK_AVGPOOL_BUILDER_H #include "pooling_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/batch_to_space_nd_builder.cpp b/frameworks/native/neural_network_runtime/ops/batch_to_space_nd_builder.cpp similarity index 100% rename from frameworks/native/ops/batch_to_space_nd_builder.cpp rename to frameworks/native/neural_network_runtime/ops/batch_to_space_nd_builder.cpp diff --git a/frameworks/native/ops/batch_to_space_nd_builder.h b/frameworks/native/neural_network_runtime/ops/batch_to_space_nd_builder.h similarity index 95% rename from frameworks/native/ops/batch_to_space_nd_builder.h rename to frameworks/native/neural_network_runtime/ops/batch_to_space_nd_builder.h index beab53a..1675c9b 100644 --- a/frameworks/native/ops/batch_to_space_nd_builder.h +++ b/frameworks/native/neural_network_runtime/ops/batch_to_space_nd_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/batchnorm_builder.cpp b/frameworks/native/neural_network_runtime/ops/batchnorm_builder.cpp similarity index 98% rename from frameworks/native/ops/batchnorm_builder.cpp rename to frameworks/native/neural_network_runtime/ops/batchnorm_builder.cpp index 1fd5997..0a013b4 100644 --- a/frameworks/native/ops/batchnorm_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/batchnorm_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/batchnorm_builder.h b/frameworks/native/neural_network_runtime/ops/batchnorm_builder.h similarity index 97% rename from frameworks/native/ops/batchnorm_builder.h rename to frameworks/native/neural_network_runtime/ops/batchnorm_builder.h index c8b4e9c..3c9916b 100644 --- a/frameworks/native/ops/batchnorm_builder.h +++ b/frameworks/native/neural_network_runtime/ops/batchnorm_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_BATHNORM_BUILDER_H #define NEURAL_NETWORK_RUNTIME_BATHNORM_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/bias_add_builder.cpp b/frameworks/native/neural_network_runtime/ops/bias_add_builder.cpp similarity index 100% rename from frameworks/native/ops/bias_add_builder.cpp rename to frameworks/native/neural_network_runtime/ops/bias_add_builder.cpp diff --git a/frameworks/native/ops/bias_add_builder.h b/frameworks/native/neural_network_runtime/ops/bias_add_builder.h similarity index 94% rename from frameworks/native/ops/bias_add_builder.h rename to frameworks/native/neural_network_runtime/ops/bias_add_builder.h index 410bfe8..7eb9448 100644 --- a/frameworks/native/ops/bias_add_builder.h +++ b/frameworks/native/neural_network_runtime/ops/bias_add_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/cast_builder.cpp b/frameworks/native/neural_network_runtime/ops/cast_builder.cpp similarity index 97% rename from frameworks/native/ops/cast_builder.cpp rename to frameworks/native/neural_network_runtime/ops/cast_builder.cpp index 6336926..baeb41f 100644 --- a/frameworks/native/ops/cast_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/cast_builder.cpp @@ -15,8 +15,8 @@ #include "cast_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" +#include "transform.h" +#include "validation.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/cast_builder.h b/frameworks/native/neural_network_runtime/ops/cast_builder.h similarity index 94% rename from frameworks/native/ops/cast_builder.h rename to frameworks/native/neural_network_runtime/ops/cast_builder.h index 09682db..1858eb9 100644 --- a/frameworks/native/ops/cast_builder.h +++ b/frameworks/native/neural_network_runtime/ops/cast_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/concat_builder.cpp b/frameworks/native/neural_network_runtime/ops/concat_builder.cpp similarity index 100% rename from frameworks/native/ops/concat_builder.cpp rename to frameworks/native/neural_network_runtime/ops/concat_builder.cpp diff --git a/frameworks/native/ops/concat_builder.h b/frameworks/native/neural_network_runtime/ops/concat_builder.h similarity index 95% rename from frameworks/native/ops/concat_builder.h rename to frameworks/native/neural_network_runtime/ops/concat_builder.h index c80a53a..7d36a04 100644 --- a/frameworks/native/ops/concat_builder.h +++ b/frameworks/native/neural_network_runtime/ops/concat_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/conv2d_builder.cpp b/frameworks/native/neural_network_runtime/ops/conv2d_builder.cpp similarity index 99% rename from frameworks/native/ops/conv2d_builder.cpp rename to frameworks/native/neural_network_runtime/ops/conv2d_builder.cpp index 1ba4d51..04f65bb 100644 --- a/frameworks/native/ops/conv2d_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/conv2d_builder.cpp @@ -15,8 +15,8 @@ #include "conv2d_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" +#include "transform.h" +#include "validation.h" #include "ops_validation.h" namespace OHOS { diff --git a/frameworks/native/ops/conv2d_builder.h b/frameworks/native/neural_network_runtime/ops/conv2d_builder.h similarity index 96% rename from frameworks/native/ops/conv2d_builder.h rename to frameworks/native/neural_network_runtime/ops/conv2d_builder.h index 412427e..4c942e8 100644 --- a/frameworks/native/ops/conv2d_builder.h +++ b/frameworks/native/neural_network_runtime/ops/conv2d_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_CONV2D_BUILDER_H #define NEURAL_NETWORK_RUNTIME_CONV2D_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" #include "mindir.h" namespace OHOS { diff --git a/frameworks/native/ops/conv2d_transpose_builder.cpp b/frameworks/native/neural_network_runtime/ops/conv2d_transpose_builder.cpp similarity index 99% rename from frameworks/native/ops/conv2d_transpose_builder.cpp rename to frameworks/native/neural_network_runtime/ops/conv2d_transpose_builder.cpp index 5318618..ae17160 100644 --- a/frameworks/native/ops/conv2d_transpose_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/conv2d_transpose_builder.cpp @@ -15,8 +15,8 @@ #include "conv2d_transpose_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" +#include "transform.h" +#include "validation.h" #include "ops_validation.h" namespace OHOS { diff --git a/frameworks/native/ops/conv2d_transpose_builder.h b/frameworks/native/neural_network_runtime/ops/conv2d_transpose_builder.h similarity index 96% rename from frameworks/native/ops/conv2d_transpose_builder.h rename to frameworks/native/neural_network_runtime/ops/conv2d_transpose_builder.h index f54cb50..2094b29 100644 --- a/frameworks/native/ops/conv2d_transpose_builder.h +++ b/frameworks/native/neural_network_runtime/ops/conv2d_transpose_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_CONV2DTRANSPOSE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_CONV2DTRANSPOSE_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" #include "mindir.h" namespace OHOS { diff --git a/frameworks/native/ops/depthwise_conv2d_native_builder.cpp b/frameworks/native/neural_network_runtime/ops/depthwise_conv2d_native_builder.cpp similarity index 99% rename from frameworks/native/ops/depthwise_conv2d_native_builder.cpp rename to frameworks/native/neural_network_runtime/ops/depthwise_conv2d_native_builder.cpp index f7d5f91..9c24d5c 100644 --- a/frameworks/native/ops/depthwise_conv2d_native_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/depthwise_conv2d_native_builder.cpp @@ -15,8 +15,8 @@ #include "depthwise_conv2d_native_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" +#include "transform.h" +#include "validation.h" #include "ops_validation.h" namespace OHOS { diff --git a/frameworks/native/ops/depthwise_conv2d_native_builder.h b/frameworks/native/neural_network_runtime/ops/depthwise_conv2d_native_builder.h similarity index 96% rename from frameworks/native/ops/depthwise_conv2d_native_builder.h rename to frameworks/native/neural_network_runtime/ops/depthwise_conv2d_native_builder.h index f1663f4..df8879d 100644 --- a/frameworks/native/ops/depthwise_conv2d_native_builder.h +++ b/frameworks/native/neural_network_runtime/ops/depthwise_conv2d_native_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_DEPTHWISE_CONV2D_NATIVE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_DEPTHWISE_CONV2D_NATIVE_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" #include "mindir.h" namespace OHOS { diff --git a/frameworks/native/ops/div_builder.cpp b/frameworks/native/neural_network_runtime/ops/div_builder.cpp similarity index 97% rename from frameworks/native/ops/div_builder.cpp rename to frameworks/native/neural_network_runtime/ops/div_builder.cpp index 17dd34e..6b3e62f 100644 --- a/frameworks/native/ops/div_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/div_builder.cpp @@ -15,8 +15,8 @@ #include "div_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" +#include "transform.h" +#include "validation.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/div_builder.h b/frameworks/native/neural_network_runtime/ops/div_builder.h similarity index 94% rename from frameworks/native/ops/div_builder.h rename to frameworks/native/neural_network_runtime/ops/div_builder.h index 3c0905c..ac85446 100644 --- a/frameworks/native/ops/div_builder.h +++ b/frameworks/native/neural_network_runtime/ops/div_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/eltwise_builder.cpp b/frameworks/native/neural_network_runtime/ops/eltwise_builder.cpp similarity index 100% rename from frameworks/native/ops/eltwise_builder.cpp rename to frameworks/native/neural_network_runtime/ops/eltwise_builder.cpp diff --git a/frameworks/native/ops/eltwise_builder.h b/frameworks/native/neural_network_runtime/ops/eltwise_builder.h similarity index 94% rename from frameworks/native/ops/eltwise_builder.h rename to frameworks/native/neural_network_runtime/ops/eltwise_builder.h index 09ff0d1..239a194 100644 --- a/frameworks/native/ops/eltwise_builder.h +++ b/frameworks/native/neural_network_runtime/ops/eltwise_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/expandims_builder.cpp b/frameworks/native/neural_network_runtime/ops/expandims_builder.cpp similarity index 100% rename from frameworks/native/ops/expandims_builder.cpp rename to frameworks/native/neural_network_runtime/ops/expandims_builder.cpp diff --git a/frameworks/native/ops/expandims_builder.h b/frameworks/native/neural_network_runtime/ops/expandims_builder.h similarity index 94% rename from frameworks/native/ops/expandims_builder.h rename to frameworks/native/neural_network_runtime/ops/expandims_builder.h index 4e16b9b..6a0e77b 100644 --- a/frameworks/native/ops/expandims_builder.h +++ b/frameworks/native/neural_network_runtime/ops/expandims_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/fill_builder.cpp b/frameworks/native/neural_network_runtime/ops/fill_builder.cpp similarity index 98% rename from frameworks/native/ops/fill_builder.cpp rename to frameworks/native/neural_network_runtime/ops/fill_builder.cpp index 83c085c..94c3f37 100644 --- a/frameworks/native/ops/fill_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/fill_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/fill_builder.h b/frameworks/native/neural_network_runtime/ops/fill_builder.h similarity index 96% rename from frameworks/native/ops/fill_builder.h rename to frameworks/native/neural_network_runtime/ops/fill_builder.h index 8e9f224..dfc4e13 100644 --- a/frameworks/native/ops/fill_builder.h +++ b/frameworks/native/neural_network_runtime/ops/fill_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_FILL_BUILDER_H #define NEURAL_NETWORK_RUNTIME_FILL_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/fullconnection_builder.cpp b/frameworks/native/neural_network_runtime/ops/fullconnection_builder.cpp similarity index 98% rename from frameworks/native/ops/fullconnection_builder.cpp rename to frameworks/native/neural_network_runtime/ops/fullconnection_builder.cpp index ce464a3..f78c1ea 100644 --- a/frameworks/native/ops/fullconnection_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/fullconnection_builder.cpp @@ -15,8 +15,8 @@ #include "fullconnection_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" +#include "transform.h" +#include "validation.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/fullconnection_builder.h b/frameworks/native/neural_network_runtime/ops/fullconnection_builder.h similarity index 95% rename from frameworks/native/ops/fullconnection_builder.h rename to frameworks/native/neural_network_runtime/ops/fullconnection_builder.h index 50eaa38..d775f9a 100644 --- a/frameworks/native/ops/fullconnection_builder.h +++ b/frameworks/native/neural_network_runtime/ops/fullconnection_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/gather_builder.cpp b/frameworks/native/neural_network_runtime/ops/gather_builder.cpp similarity index 98% rename from frameworks/native/ops/gather_builder.cpp rename to frameworks/native/neural_network_runtime/ops/gather_builder.cpp index aba0bfc..da10010 100644 --- a/frameworks/native/ops/gather_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/gather_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/gather_builder.h b/frameworks/native/neural_network_runtime/ops/gather_builder.h similarity index 96% rename from frameworks/native/ops/gather_builder.h rename to frameworks/native/neural_network_runtime/ops/gather_builder.h index 7fe35df..c44aea3 100644 --- a/frameworks/native/ops/gather_builder.h +++ b/frameworks/native/neural_network_runtime/ops/gather_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_GATHER_BUILDER_H #define NEURAL_NETWORK_RUNTIME_GATHER_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/gelu_builder.cpp b/frameworks/native/neural_network_runtime/ops/gelu_builder.cpp similarity index 98% rename from frameworks/native/ops/gelu_builder.cpp rename to frameworks/native/neural_network_runtime/ops/gelu_builder.cpp index 0f75922..b175b63 100644 --- a/frameworks/native/ops/gelu_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/gelu_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/gelu_builder.h b/frameworks/native/neural_network_runtime/ops/gelu_builder.h similarity index 96% rename from frameworks/native/ops/gelu_builder.h rename to frameworks/native/neural_network_runtime/ops/gelu_builder.h index 6f0346a..ca088de 100644 --- a/frameworks/native/ops/gelu_builder.h +++ b/frameworks/native/neural_network_runtime/ops/gelu_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_GELU_BUILDER_H #define NEURAL_NETWORK_RUNTIME_GELU_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/hswish_builder.cpp b/frameworks/native/neural_network_runtime/ops/hswish_builder.cpp similarity index 98% rename from frameworks/native/ops/hswish_builder.cpp rename to frameworks/native/neural_network_runtime/ops/hswish_builder.cpp index 3a9cae5..bb5796c 100644 --- a/frameworks/native/ops/hswish_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/hswish_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/hswish_builder.h b/frameworks/native/neural_network_runtime/ops/hswish_builder.h similarity index 96% rename from frameworks/native/ops/hswish_builder.h rename to frameworks/native/neural_network_runtime/ops/hswish_builder.h index 0d9a905..29fe087 100644 --- a/frameworks/native/ops/hswish_builder.h +++ b/frameworks/native/neural_network_runtime/ops/hswish_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_HSWISH_BUILDER_H #define NEURAL_NETWORK_RUNTIME_HSWISH_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/layernorm_builder.cpp b/frameworks/native/neural_network_runtime/ops/layernorm_builder.cpp similarity index 99% rename from frameworks/native/ops/layernorm_builder.cpp rename to frameworks/native/neural_network_runtime/ops/layernorm_builder.cpp index a8938ab..95240e8 100644 --- a/frameworks/native/ops/layernorm_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/layernorm_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/layernorm_builder.h b/frameworks/native/neural_network_runtime/ops/layernorm_builder.h similarity index 97% rename from frameworks/native/ops/layernorm_builder.h rename to frameworks/native/neural_network_runtime/ops/layernorm_builder.h index 68847b7..fd0e5bc 100644 --- a/frameworks/native/ops/layernorm_builder.h +++ b/frameworks/native/neural_network_runtime/ops/layernorm_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_LAYERNORM_BUILDER_H #define NEURAL_NETWORK_RUNTIME_LAYERNORM_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/lessequal_builder.cpp b/frameworks/native/neural_network_runtime/ops/lessequal_builder.cpp similarity index 98% rename from frameworks/native/ops/lessequal_builder.cpp rename to frameworks/native/neural_network_runtime/ops/lessequal_builder.cpp index a74445e..d0ef5fd 100644 --- a/frameworks/native/ops/lessequal_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/lessequal_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/lessequal_builder.h b/frameworks/native/neural_network_runtime/ops/lessequal_builder.h similarity index 96% rename from frameworks/native/ops/lessequal_builder.h rename to frameworks/native/neural_network_runtime/ops/lessequal_builder.h index 6933ffe..fcceee2 100644 --- a/frameworks/native/ops/lessequal_builder.h +++ b/frameworks/native/neural_network_runtime/ops/lessequal_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_LESSEQUAL_BUILDER_H #define NEURAL_NETWORK_RUNTIME_LESSEQUAL_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/matmul_builder.cpp b/frameworks/native/neural_network_runtime/ops/matmul_builder.cpp similarity index 97% rename from frameworks/native/ops/matmul_builder.cpp rename to frameworks/native/neural_network_runtime/ops/matmul_builder.cpp index 9b0440f..baa13a3 100644 --- a/frameworks/native/ops/matmul_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/matmul_builder.cpp @@ -15,9 +15,9 @@ #include "matmul_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" -#include "frameworks/native/ops_registry.h" +#include "transform.h" +#include "validation.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/matmul_builder.h b/frameworks/native/neural_network_runtime/ops/matmul_builder.h similarity index 97% rename from frameworks/native/ops/matmul_builder.h rename to frameworks/native/neural_network_runtime/ops/matmul_builder.h index 1efcdf1..3d39f20 100644 --- a/frameworks/native/ops/matmul_builder.h +++ b/frameworks/native/neural_network_runtime/ops/matmul_builder.h @@ -18,7 +18,7 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/maximum_builder.cpp b/frameworks/native/neural_network_runtime/ops/maximum_builder.cpp similarity index 98% rename from frameworks/native/ops/maximum_builder.cpp rename to frameworks/native/neural_network_runtime/ops/maximum_builder.cpp index b681ec1..a6e97e8 100644 --- a/frameworks/native/ops/maximum_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/maximum_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/maximum_builder.h b/frameworks/native/neural_network_runtime/ops/maximum_builder.h similarity index 96% rename from frameworks/native/ops/maximum_builder.h rename to frameworks/native/neural_network_runtime/ops/maximum_builder.h index 5308c5d..b93ddde 100644 --- a/frameworks/native/ops/maximum_builder.h +++ b/frameworks/native/neural_network_runtime/ops/maximum_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_MAXIMUM_BUILDER_H #define NEURAL_NETWORK_RUNTIME_MAXIMUM_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/maxpool_builder.cpp b/frameworks/native/neural_network_runtime/ops/maxpool_builder.cpp similarity index 100% rename from frameworks/native/ops/maxpool_builder.cpp rename to frameworks/native/neural_network_runtime/ops/maxpool_builder.cpp diff --git a/frameworks/native/ops/maxpool_builder.h b/frameworks/native/neural_network_runtime/ops/maxpool_builder.h similarity index 96% rename from frameworks/native/ops/maxpool_builder.h rename to frameworks/native/neural_network_runtime/ops/maxpool_builder.h index 2022b6e..790b608 100644 --- a/frameworks/native/ops/maxpool_builder.h +++ b/frameworks/native/neural_network_runtime/ops/maxpool_builder.h @@ -17,7 +17,7 @@ #define NEURAL_NETWORK_RUNTIME_MAXPOOL_BUILDER_H #include "pooling_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/mul_builder.cpp b/frameworks/native/neural_network_runtime/ops/mul_builder.cpp similarity index 97% rename from frameworks/native/ops/mul_builder.cpp rename to frameworks/native/neural_network_runtime/ops/mul_builder.cpp index f055d28..01b438a 100644 --- a/frameworks/native/ops/mul_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/mul_builder.cpp @@ -15,9 +15,9 @@ #include "mul_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" -#include "frameworks/native/ops_registry.h" +#include "transform.h" +#include "validation.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/mul_builder.h b/frameworks/native/neural_network_runtime/ops/mul_builder.h similarity index 97% rename from frameworks/native/ops/mul_builder.h rename to frameworks/native/neural_network_runtime/ops/mul_builder.h index 25cd5ac..62735cc 100644 --- a/frameworks/native/ops/mul_builder.h +++ b/frameworks/native/neural_network_runtime/ops/mul_builder.h @@ -18,7 +18,7 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/onehot_builder.cpp b/frameworks/native/neural_network_runtime/ops/onehot_builder.cpp similarity index 98% rename from frameworks/native/ops/onehot_builder.cpp rename to frameworks/native/neural_network_runtime/ops/onehot_builder.cpp index b068408..2d8bcdb 100644 --- a/frameworks/native/ops/onehot_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/onehot_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/onehot_builder.h b/frameworks/native/neural_network_runtime/ops/onehot_builder.h similarity index 97% rename from frameworks/native/ops/onehot_builder.h rename to frameworks/native/neural_network_runtime/ops/onehot_builder.h index 537855b..918185f 100644 --- a/frameworks/native/ops/onehot_builder.h +++ b/frameworks/native/neural_network_runtime/ops/onehot_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_ONEHOT_BUILDER_H #define NEURAL_NETWORK_RUNTIME_ONEHOT_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/ops_validation.cpp b/frameworks/native/neural_network_runtime/ops/ops_validation.cpp similarity index 100% rename from frameworks/native/ops/ops_validation.cpp rename to frameworks/native/neural_network_runtime/ops/ops_validation.cpp diff --git a/frameworks/native/ops/ops_validation.h b/frameworks/native/neural_network_runtime/ops/ops_validation.h similarity index 100% rename from frameworks/native/ops/ops_validation.h rename to frameworks/native/neural_network_runtime/ops/ops_validation.h diff --git a/frameworks/native/ops/pad_builder.cpp b/frameworks/native/neural_network_runtime/ops/pad_builder.cpp similarity index 98% rename from frameworks/native/ops/pad_builder.cpp rename to frameworks/native/neural_network_runtime/ops/pad_builder.cpp index b14d8a6..a2259f9 100644 --- a/frameworks/native/ops/pad_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/pad_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/pad_builder.h b/frameworks/native/neural_network_runtime/ops/pad_builder.h similarity index 97% rename from frameworks/native/ops/pad_builder.h rename to frameworks/native/neural_network_runtime/ops/pad_builder.h index a5968a4..7cc192c 100644 --- a/frameworks/native/ops/pad_builder.h +++ b/frameworks/native/neural_network_runtime/ops/pad_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_PAD_BUILDER_H #define NEURAL_NETWORK_RUNTIME_PAD_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/pooling_builder.cpp b/frameworks/native/neural_network_runtime/ops/pooling_builder.cpp similarity index 99% rename from frameworks/native/ops/pooling_builder.cpp rename to frameworks/native/neural_network_runtime/ops/pooling_builder.cpp index df25ea8..8321410 100644 --- a/frameworks/native/ops/pooling_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/pooling_builder.cpp @@ -15,8 +15,8 @@ #include "pooling_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" +#include "transform.h" +#include "validation.h" #include "ops_validation.h" namespace OHOS { diff --git a/frameworks/native/ops/pooling_builder.h b/frameworks/native/neural_network_runtime/ops/pooling_builder.h similarity index 98% rename from frameworks/native/ops/pooling_builder.h rename to frameworks/native/neural_network_runtime/ops/pooling_builder.h index 4a42b4a..d096346 100644 --- a/frameworks/native/ops/pooling_builder.h +++ b/frameworks/native/neural_network_runtime/ops/pooling_builder.h @@ -18,7 +18,7 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/pow_builder.cpp b/frameworks/native/neural_network_runtime/ops/pow_builder.cpp similarity index 98% rename from frameworks/native/ops/pow_builder.cpp rename to frameworks/native/neural_network_runtime/ops/pow_builder.cpp index 71e9df7..e0188a1 100644 --- a/frameworks/native/ops/pow_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/pow_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/pow_builder.h b/frameworks/native/neural_network_runtime/ops/pow_builder.h similarity index 96% rename from frameworks/native/ops/pow_builder.h rename to frameworks/native/neural_network_runtime/ops/pow_builder.h index 10ec727..e709c06 100644 --- a/frameworks/native/ops/pow_builder.h +++ b/frameworks/native/neural_network_runtime/ops/pow_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_POW_BUILDER_H #define NEURAL_NETWORK_RUNTIME_POW_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/prelu_builder.cpp b/frameworks/native/neural_network_runtime/ops/prelu_builder.cpp similarity index 98% rename from frameworks/native/ops/prelu_builder.cpp rename to frameworks/native/neural_network_runtime/ops/prelu_builder.cpp index d8fcc56..3e85985 100644 --- a/frameworks/native/ops/prelu_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/prelu_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/prelu_builder.h b/frameworks/native/neural_network_runtime/ops/prelu_builder.h similarity index 96% rename from frameworks/native/ops/prelu_builder.h rename to frameworks/native/neural_network_runtime/ops/prelu_builder.h index 117343c..65d0938 100644 --- a/frameworks/native/ops/prelu_builder.h +++ b/frameworks/native/neural_network_runtime/ops/prelu_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_PRELU_BUILDER_H #define NEURAL_NETWORK_RUNTIME_PRELU_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/quant_dtype_cast_builder.cpp b/frameworks/native/neural_network_runtime/ops/quant_dtype_cast_builder.cpp similarity index 99% rename from frameworks/native/ops/quant_dtype_cast_builder.cpp rename to frameworks/native/neural_network_runtime/ops/quant_dtype_cast_builder.cpp index 79ce59c..84d45ea 100644 --- a/frameworks/native/ops/quant_dtype_cast_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/quant_dtype_cast_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/quant_dtype_cast_builder.h b/frameworks/native/neural_network_runtime/ops/quant_dtype_cast_builder.h similarity index 97% rename from frameworks/native/ops/quant_dtype_cast_builder.h rename to frameworks/native/neural_network_runtime/ops/quant_dtype_cast_builder.h index bd4a1b3..6ddef1b 100644 --- a/frameworks/native/ops/quant_dtype_cast_builder.h +++ b/frameworks/native/neural_network_runtime/ops/quant_dtype_cast_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_QUANTDTYPECAST_BUILDER_H #define NEURAL_NETWORK_RUNTIME_QUANTDTYPECAST_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/reduceall_builder.cpp b/frameworks/native/neural_network_runtime/ops/reduceall_builder.cpp similarity index 98% rename from frameworks/native/ops/reduceall_builder.cpp rename to frameworks/native/neural_network_runtime/ops/reduceall_builder.cpp index fbf0406..fd5c22e 100644 --- a/frameworks/native/ops/reduceall_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/reduceall_builder.cpp @@ -15,7 +15,7 @@ #include "reduceall_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/reduceall_builder.h b/frameworks/native/neural_network_runtime/ops/reduceall_builder.h similarity index 97% rename from frameworks/native/ops/reduceall_builder.h rename to frameworks/native/neural_network_runtime/ops/reduceall_builder.h index 141d69b..176ecb3 100644 --- a/frameworks/native/ops/reduceall_builder.h +++ b/frameworks/native/neural_network_runtime/ops/reduceall_builder.h @@ -18,7 +18,7 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/reducemean_builder.cpp b/frameworks/native/neural_network_runtime/ops/reducemean_builder.cpp similarity index 98% rename from frameworks/native/ops/reducemean_builder.cpp rename to frameworks/native/neural_network_runtime/ops/reducemean_builder.cpp index 5f60e05..5783bea 100644 --- a/frameworks/native/ops/reducemean_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/reducemean_builder.cpp @@ -15,7 +15,7 @@ #include "reducemean_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/reducemean_builder.h b/frameworks/native/neural_network_runtime/ops/reducemean_builder.h similarity index 97% rename from frameworks/native/ops/reducemean_builder.h rename to frameworks/native/neural_network_runtime/ops/reducemean_builder.h index 7ddc3b3..b589fad 100644 --- a/frameworks/native/ops/reducemean_builder.h +++ b/frameworks/native/neural_network_runtime/ops/reducemean_builder.h @@ -18,7 +18,7 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/reduceprod_builder.cpp b/frameworks/native/neural_network_runtime/ops/reduceprod_builder.cpp similarity index 98% rename from frameworks/native/ops/reduceprod_builder.cpp rename to frameworks/native/neural_network_runtime/ops/reduceprod_builder.cpp index e22b2c5..bd8b62f 100644 --- a/frameworks/native/ops/reduceprod_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/reduceprod_builder.cpp @@ -15,7 +15,7 @@ #include "reduceprod_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/reduceprod_builder.h b/frameworks/native/neural_network_runtime/ops/reduceprod_builder.h similarity index 97% rename from frameworks/native/ops/reduceprod_builder.h rename to frameworks/native/neural_network_runtime/ops/reduceprod_builder.h index b1314aa..2dd2a94 100644 --- a/frameworks/native/ops/reduceprod_builder.h +++ b/frameworks/native/neural_network_runtime/ops/reduceprod_builder.h @@ -18,7 +18,7 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/relu6_builder.cpp b/frameworks/native/neural_network_runtime/ops/relu6_builder.cpp similarity index 98% rename from frameworks/native/ops/relu6_builder.cpp rename to frameworks/native/neural_network_runtime/ops/relu6_builder.cpp index eaa3474..04d48e2 100644 --- a/frameworks/native/ops/relu6_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/relu6_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/relu6_builder.h b/frameworks/native/neural_network_runtime/ops/relu6_builder.h similarity index 96% rename from frameworks/native/ops/relu6_builder.h rename to frameworks/native/neural_network_runtime/ops/relu6_builder.h index 71f6196..97b8e70 100644 --- a/frameworks/native/ops/relu6_builder.h +++ b/frameworks/native/neural_network_runtime/ops/relu6_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_RELU6_BUILDER_H #define NEURAL_NETWORK_RUNTIME_RELU6_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/relu_builder.cpp b/frameworks/native/neural_network_runtime/ops/relu_builder.cpp similarity index 98% rename from frameworks/native/ops/relu_builder.cpp rename to frameworks/native/neural_network_runtime/ops/relu_builder.cpp index 6f397fe..d1cf527 100644 --- a/frameworks/native/ops/relu_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/relu_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/relu_builder.h b/frameworks/native/neural_network_runtime/ops/relu_builder.h similarity index 96% rename from frameworks/native/ops/relu_builder.h rename to frameworks/native/neural_network_runtime/ops/relu_builder.h index 9c8b9d7..afd1c8b 100644 --- a/frameworks/native/ops/relu_builder.h +++ b/frameworks/native/neural_network_runtime/ops/relu_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_RELU_BUILDER_H #define NEURAL_NETWORK_RUNTIME_RELU_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/reshape_builder.cpp b/frameworks/native/neural_network_runtime/ops/reshape_builder.cpp similarity index 98% rename from frameworks/native/ops/reshape_builder.cpp rename to frameworks/native/neural_network_runtime/ops/reshape_builder.cpp index e1469bc..3375ff1 100644 --- a/frameworks/native/ops/reshape_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/reshape_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/reshape_builder.h b/frameworks/native/neural_network_runtime/ops/reshape_builder.h similarity index 96% rename from frameworks/native/ops/reshape_builder.h rename to frameworks/native/neural_network_runtime/ops/reshape_builder.h index ef24166..30583d9 100644 --- a/frameworks/native/ops/reshape_builder.h +++ b/frameworks/native/neural_network_runtime/ops/reshape_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_RESHAPE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_RESHAPE_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/resize_bilinear_builder.cpp b/frameworks/native/neural_network_runtime/ops/resize_bilinear_builder.cpp similarity index 99% rename from frameworks/native/ops/resize_bilinear_builder.cpp rename to frameworks/native/neural_network_runtime/ops/resize_bilinear_builder.cpp index 5c868f2..be84a86 100644 --- a/frameworks/native/ops/resize_bilinear_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/resize_bilinear_builder.cpp @@ -15,7 +15,7 @@ #include "resize_bilinear_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/resize_bilinear_builder.h b/frameworks/native/neural_network_runtime/ops/resize_bilinear_builder.h similarity index 98% rename from frameworks/native/ops/resize_bilinear_builder.h rename to frameworks/native/neural_network_runtime/ops/resize_bilinear_builder.h index ce8eb56..6503e77 100644 --- a/frameworks/native/ops/resize_bilinear_builder.h +++ b/frameworks/native/neural_network_runtime/ops/resize_bilinear_builder.h @@ -18,7 +18,7 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/rsqrt_builder.cpp b/frameworks/native/neural_network_runtime/ops/rsqrt_builder.cpp similarity index 98% rename from frameworks/native/ops/rsqrt_builder.cpp rename to frameworks/native/neural_network_runtime/ops/rsqrt_builder.cpp index b384005..4ca0b00 100644 --- a/frameworks/native/ops/rsqrt_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/rsqrt_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/rsqrt_builder.h b/frameworks/native/neural_network_runtime/ops/rsqrt_builder.h similarity index 96% rename from frameworks/native/ops/rsqrt_builder.h rename to frameworks/native/neural_network_runtime/ops/rsqrt_builder.h index 9d1f6c0..3177092 100644 --- a/frameworks/native/ops/rsqrt_builder.h +++ b/frameworks/native/neural_network_runtime/ops/rsqrt_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_RSQRT_BUILDER_H #define NEURAL_NETWORK_RUNTIME_RSQRT_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/scale_builder.cpp b/frameworks/native/neural_network_runtime/ops/scale_builder.cpp similarity index 97% rename from frameworks/native/ops/scale_builder.cpp rename to frameworks/native/neural_network_runtime/ops/scale_builder.cpp index defccf7..d9527ec 100644 --- a/frameworks/native/ops/scale_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/scale_builder.cpp @@ -15,9 +15,9 @@ #include "scale_builder.h" -#include "frameworks/native/ops_registry.h" -#include "frameworks/native/validation.h" -#include "frameworks/native/transform.h" +#include "ops_registry.h" +#include "validation.h" +#include "transform.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/scale_builder.h b/frameworks/native/neural_network_runtime/ops/scale_builder.h similarity index 97% rename from frameworks/native/ops/scale_builder.h rename to frameworks/native/neural_network_runtime/ops/scale_builder.h index 362f4ab..d9b011e 100644 --- a/frameworks/native/ops/scale_builder.h +++ b/frameworks/native/neural_network_runtime/ops/scale_builder.h @@ -18,7 +18,7 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/shape_builder.cpp b/frameworks/native/neural_network_runtime/ops/shape_builder.cpp similarity index 98% rename from frameworks/native/ops/shape_builder.cpp rename to frameworks/native/neural_network_runtime/ops/shape_builder.cpp index 9164b0e..3d2781a 100644 --- a/frameworks/native/ops/shape_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/shape_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/shape_builder.h b/frameworks/native/neural_network_runtime/ops/shape_builder.h similarity index 96% rename from frameworks/native/ops/shape_builder.h rename to frameworks/native/neural_network_runtime/ops/shape_builder.h index bd3d798..0c56e28 100644 --- a/frameworks/native/ops/shape_builder.h +++ b/frameworks/native/neural_network_runtime/ops/shape_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_SHAPE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_SHAPE_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/sigmoid_builder.cpp b/frameworks/native/neural_network_runtime/ops/sigmoid_builder.cpp similarity index 98% rename from frameworks/native/ops/sigmoid_builder.cpp rename to frameworks/native/neural_network_runtime/ops/sigmoid_builder.cpp index ae7df18..9a084d0 100644 --- a/frameworks/native/ops/sigmoid_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/sigmoid_builder.cpp @@ -17,7 +17,7 @@ #include "mindir.h" -#include "frameworks/native/ops_registry.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/sigmoid_builder.h b/frameworks/native/neural_network_runtime/ops/sigmoid_builder.h similarity index 96% rename from frameworks/native/ops/sigmoid_builder.h rename to frameworks/native/neural_network_runtime/ops/sigmoid_builder.h index 63d9c8e..2c6a220 100644 --- a/frameworks/native/ops/sigmoid_builder.h +++ b/frameworks/native/neural_network_runtime/ops/sigmoid_builder.h @@ -16,7 +16,7 @@ #ifndef NEURAL_NETWORK_RUNTIME_SIGMOID_BUILDER_H #define NEURAL_NETWORK_RUNTIME_SIGMOID_BUILDER_H -#include "frameworks/native/ops_builder.h" +#include "ops_builder.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/slice_builder.cpp b/frameworks/native/neural_network_runtime/ops/slice_builder.cpp similarity index 100% rename from frameworks/native/ops/slice_builder.cpp rename to frameworks/native/neural_network_runtime/ops/slice_builder.cpp diff --git a/frameworks/native/ops/slice_builder.h b/frameworks/native/neural_network_runtime/ops/slice_builder.h similarity index 94% rename from frameworks/native/ops/slice_builder.h rename to frameworks/native/neural_network_runtime/ops/slice_builder.h index 3494d6e..fba1b13 100644 --- a/frameworks/native/ops/slice_builder.h +++ b/frameworks/native/neural_network_runtime/ops/slice_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_SLICE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_SLICE_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/softmax_builder.cpp b/frameworks/native/neural_network_runtime/ops/softmax_builder.cpp similarity index 100% rename from frameworks/native/ops/softmax_builder.cpp rename to frameworks/native/neural_network_runtime/ops/softmax_builder.cpp diff --git a/frameworks/native/ops/softmax_builder.h b/frameworks/native/neural_network_runtime/ops/softmax_builder.h similarity index 94% rename from frameworks/native/ops/softmax_builder.h rename to frameworks/native/neural_network_runtime/ops/softmax_builder.h index 4a449b2..2b83133 100644 --- a/frameworks/native/ops/softmax_builder.h +++ b/frameworks/native/neural_network_runtime/ops/softmax_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_SOFTMAX_BUILDER_H #define NEURAL_NETWORK_RUNTIME_SOFTMAX_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/space_to_batch_nd_builder.cpp b/frameworks/native/neural_network_runtime/ops/space_to_batch_nd_builder.cpp similarity index 100% rename from frameworks/native/ops/space_to_batch_nd_builder.cpp rename to frameworks/native/neural_network_runtime/ops/space_to_batch_nd_builder.cpp diff --git a/frameworks/native/ops/space_to_batch_nd_builder.h b/frameworks/native/neural_network_runtime/ops/space_to_batch_nd_builder.h similarity index 95% rename from frameworks/native/ops/space_to_batch_nd_builder.h rename to frameworks/native/neural_network_runtime/ops/space_to_batch_nd_builder.h index 0944183..68f5ed7 100644 --- a/frameworks/native/ops/space_to_batch_nd_builder.h +++ b/frameworks/native/neural_network_runtime/ops/space_to_batch_nd_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_SPACETOBATCHND_BUILDER_H #define NEURAL_NETWORK_RUNTIME_SPACETOBATCHND_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/split_builder.cpp b/frameworks/native/neural_network_runtime/ops/split_builder.cpp similarity index 100% rename from frameworks/native/ops/split_builder.cpp rename to frameworks/native/neural_network_runtime/ops/split_builder.cpp diff --git a/frameworks/native/ops/split_builder.h b/frameworks/native/neural_network_runtime/ops/split_builder.h similarity index 95% rename from frameworks/native/ops/split_builder.h rename to frameworks/native/neural_network_runtime/ops/split_builder.h index 2ab4cf6..3ebee8d 100644 --- a/frameworks/native/ops/split_builder.h +++ b/frameworks/native/neural_network_runtime/ops/split_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/sqrt_builder.cpp b/frameworks/native/neural_network_runtime/ops/sqrt_builder.cpp similarity index 100% rename from frameworks/native/ops/sqrt_builder.cpp rename to frameworks/native/neural_network_runtime/ops/sqrt_builder.cpp diff --git a/frameworks/native/ops/sqrt_builder.h b/frameworks/native/neural_network_runtime/ops/sqrt_builder.h similarity index 93% rename from frameworks/native/ops/sqrt_builder.h rename to frameworks/native/neural_network_runtime/ops/sqrt_builder.h index ad835b8..16ccae6 100644 --- a/frameworks/native/ops/sqrt_builder.h +++ b/frameworks/native/neural_network_runtime/ops/sqrt_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_SQRT_BUILDER_H #define NEURAL_NETWORK_RUNTIME_SQRT_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/squared_difference_builder.cpp b/frameworks/native/neural_network_runtime/ops/squared_difference_builder.cpp similarity index 100% rename from frameworks/native/ops/squared_difference_builder.cpp rename to frameworks/native/neural_network_runtime/ops/squared_difference_builder.cpp diff --git a/frameworks/native/ops/squared_difference_builder.h b/frameworks/native/neural_network_runtime/ops/squared_difference_builder.h similarity index 94% rename from frameworks/native/ops/squared_difference_builder.h rename to frameworks/native/neural_network_runtime/ops/squared_difference_builder.h index d51847c..4cd21af 100644 --- a/frameworks/native/ops/squared_difference_builder.h +++ b/frameworks/native/neural_network_runtime/ops/squared_difference_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_SQUAREDDIFFERENCE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_SQUAREDDIFFERENCE_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/squeeze_builder.cpp b/frameworks/native/neural_network_runtime/ops/squeeze_builder.cpp similarity index 100% rename from frameworks/native/ops/squeeze_builder.cpp rename to frameworks/native/neural_network_runtime/ops/squeeze_builder.cpp diff --git a/frameworks/native/ops/squeeze_builder.h b/frameworks/native/neural_network_runtime/ops/squeeze_builder.h similarity index 94% rename from frameworks/native/ops/squeeze_builder.h rename to frameworks/native/neural_network_runtime/ops/squeeze_builder.h index 989caa1..f02ed38 100644 --- a/frameworks/native/ops/squeeze_builder.h +++ b/frameworks/native/neural_network_runtime/ops/squeeze_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_SQUEEZE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_SQUEEZE_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/stack_builder.cpp b/frameworks/native/neural_network_runtime/ops/stack_builder.cpp similarity index 100% rename from frameworks/native/ops/stack_builder.cpp rename to frameworks/native/neural_network_runtime/ops/stack_builder.cpp diff --git a/frameworks/native/ops/stack_builder.h b/frameworks/native/neural_network_runtime/ops/stack_builder.h similarity index 94% rename from frameworks/native/ops/stack_builder.h rename to frameworks/native/neural_network_runtime/ops/stack_builder.h index 1e80ecd..665fb16 100644 --- a/frameworks/native/ops/stack_builder.h +++ b/frameworks/native/neural_network_runtime/ops/stack_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_STACK_BUILDER_H #define NEURAL_NETWORK_RUNTIME_STACK_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/strided_slice_builder.cpp b/frameworks/native/neural_network_runtime/ops/strided_slice_builder.cpp similarity index 100% rename from frameworks/native/ops/strided_slice_builder.cpp rename to frameworks/native/neural_network_runtime/ops/strided_slice_builder.cpp diff --git a/frameworks/native/ops/strided_slice_builder.h b/frameworks/native/neural_network_runtime/ops/strided_slice_builder.h similarity index 96% rename from frameworks/native/ops/strided_slice_builder.h rename to frameworks/native/neural_network_runtime/ops/strided_slice_builder.h index 45637b0..06ccb65 100644 --- a/frameworks/native/ops/strided_slice_builder.h +++ b/frameworks/native/neural_network_runtime/ops/strided_slice_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_STRIDEDSLICE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_STRIDEDSLICE_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/sub_builder.cpp b/frameworks/native/neural_network_runtime/ops/sub_builder.cpp similarity index 98% rename from frameworks/native/ops/sub_builder.cpp rename to frameworks/native/neural_network_runtime/ops/sub_builder.cpp index 6021c17..85c06d9 100644 --- a/frameworks/native/ops/sub_builder.cpp +++ b/frameworks/native/neural_network_runtime/ops/sub_builder.cpp @@ -14,8 +14,8 @@ */ #include "sub_builder.h" -#include "frameworks/native/transform.h" -#include "frameworks/native/validation.h" +#include "transform.h" +#include "validation.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/sub_builder.h b/frameworks/native/neural_network_runtime/ops/sub_builder.h similarity index 94% rename from frameworks/native/ops/sub_builder.h rename to frameworks/native/neural_network_runtime/ops/sub_builder.h index 19dc8d2..1e65ec8 100644 --- a/frameworks/native/ops/sub_builder.h +++ b/frameworks/native/neural_network_runtime/ops/sub_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/tanh_builder.cpp b/frameworks/native/neural_network_runtime/ops/tanh_builder.cpp similarity index 100% rename from frameworks/native/ops/tanh_builder.cpp rename to frameworks/native/neural_network_runtime/ops/tanh_builder.cpp diff --git a/frameworks/native/ops/tanh_builder.h b/frameworks/native/neural_network_runtime/ops/tanh_builder.h similarity index 94% rename from frameworks/native/ops/tanh_builder.h rename to frameworks/native/neural_network_runtime/ops/tanh_builder.h index 32fd2a7..dfc6a1e 100644 --- a/frameworks/native/ops/tanh_builder.h +++ b/frameworks/native/neural_network_runtime/ops/tanh_builder.h @@ -18,8 +18,8 @@ #include "mindir.h" -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/tile_builder.cpp b/frameworks/native/neural_network_runtime/ops/tile_builder.cpp similarity index 100% rename from frameworks/native/ops/tile_builder.cpp rename to frameworks/native/neural_network_runtime/ops/tile_builder.cpp diff --git a/frameworks/native/ops/tile_builder.h b/frameworks/native/neural_network_runtime/ops/tile_builder.h similarity index 94% rename from frameworks/native/ops/tile_builder.h rename to frameworks/native/neural_network_runtime/ops/tile_builder.h index fc93212..e47e00b 100644 --- a/frameworks/native/ops/tile_builder.h +++ b/frameworks/native/neural_network_runtime/ops/tile_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_TILE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_TILE_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/top_k_builder.cpp b/frameworks/native/neural_network_runtime/ops/top_k_builder.cpp similarity index 100% rename from frameworks/native/ops/top_k_builder.cpp rename to frameworks/native/neural_network_runtime/ops/top_k_builder.cpp diff --git a/frameworks/native/ops/top_k_builder.h b/frameworks/native/neural_network_runtime/ops/top_k_builder.h similarity index 94% rename from frameworks/native/ops/top_k_builder.h rename to frameworks/native/neural_network_runtime/ops/top_k_builder.h index 69d5080..3535f57 100644 --- a/frameworks/native/ops/top_k_builder.h +++ b/frameworks/native/neural_network_runtime/ops/top_k_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_TOPK_BUILDER_H #define NEURAL_NETWORK_RUNTIME_TOPK_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/transpose_builder.cpp b/frameworks/native/neural_network_runtime/ops/transpose_builder.cpp similarity index 100% rename from frameworks/native/ops/transpose_builder.cpp rename to frameworks/native/neural_network_runtime/ops/transpose_builder.cpp diff --git a/frameworks/native/ops/transpose_builder.h b/frameworks/native/neural_network_runtime/ops/transpose_builder.h similarity index 94% rename from frameworks/native/ops/transpose_builder.h rename to frameworks/native/neural_network_runtime/ops/transpose_builder.h index 998d580..23d048d 100644 --- a/frameworks/native/ops/transpose_builder.h +++ b/frameworks/native/neural_network_runtime/ops/transpose_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_TRANSPOSE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_TRANSPOSE_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops/unsqueeze_builder.cpp b/frameworks/native/neural_network_runtime/ops/unsqueeze_builder.cpp similarity index 100% rename from frameworks/native/ops/unsqueeze_builder.cpp rename to frameworks/native/neural_network_runtime/ops/unsqueeze_builder.cpp diff --git a/frameworks/native/ops/unsqueeze_builder.h b/frameworks/native/neural_network_runtime/ops/unsqueeze_builder.h similarity index 94% rename from frameworks/native/ops/unsqueeze_builder.h rename to frameworks/native/neural_network_runtime/ops/unsqueeze_builder.h index 6633957..08a5ad2 100644 --- a/frameworks/native/ops/unsqueeze_builder.h +++ b/frameworks/native/neural_network_runtime/ops/unsqueeze_builder.h @@ -16,8 +16,8 @@ #ifndef NEURAL_NETWORK_RUNTIME_UNSQUEEZE_BUILDER_H #define NEURAL_NETWORK_RUNTIME_UNSQUEEZE_BUILDER_H -#include "frameworks/native/ops_builder.h" -#include "frameworks/native/ops_registry.h" +#include "ops_builder.h" +#include "ops_registry.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/ops_builder.cpp b/frameworks/native/neural_network_runtime/ops_builder.cpp similarity index 100% rename from frameworks/native/ops_builder.cpp rename to frameworks/native/neural_network_runtime/ops_builder.cpp diff --git a/frameworks/native/ops_builder.h b/frameworks/native/neural_network_runtime/ops_builder.h similarity index 100% rename from frameworks/native/ops_builder.h rename to frameworks/native/neural_network_runtime/ops_builder.h diff --git a/frameworks/native/ops_registry.cpp b/frameworks/native/neural_network_runtime/ops_registry.cpp similarity index 100% rename from frameworks/native/ops_registry.cpp rename to frameworks/native/neural_network_runtime/ops_registry.cpp diff --git a/frameworks/native/ops_registry.h b/frameworks/native/neural_network_runtime/ops_registry.h similarity index 100% rename from frameworks/native/ops_registry.h rename to frameworks/native/neural_network_runtime/ops_registry.h diff --git a/frameworks/native/prepared_model.h b/frameworks/native/neural_network_runtime/prepared_model.h similarity index 100% rename from frameworks/native/prepared_model.h rename to frameworks/native/neural_network_runtime/prepared_model.h diff --git a/frameworks/native/quant_param.cpp b/frameworks/native/neural_network_runtime/quant_param.cpp similarity index 100% rename from frameworks/native/quant_param.cpp rename to frameworks/native/neural_network_runtime/quant_param.cpp diff --git a/frameworks/native/quant_param.h b/frameworks/native/neural_network_runtime/quant_param.h similarity index 100% rename from frameworks/native/quant_param.h rename to frameworks/native/neural_network_runtime/quant_param.h diff --git a/frameworks/native/register_hdi_device_v1_0.cpp b/frameworks/native/neural_network_runtime/register_hdi_device_v1_0.cpp similarity index 100% rename from frameworks/native/register_hdi_device_v1_0.cpp rename to frameworks/native/neural_network_runtime/register_hdi_device_v1_0.cpp diff --git a/frameworks/native/register_hdi_device_v2_0.cpp b/frameworks/native/neural_network_runtime/register_hdi_device_v2_0.cpp similarity index 100% rename from frameworks/native/register_hdi_device_v2_0.cpp rename to frameworks/native/neural_network_runtime/register_hdi_device_v2_0.cpp diff --git a/frameworks/native/transform.cpp b/frameworks/native/neural_network_runtime/transform.cpp similarity index 100% rename from frameworks/native/transform.cpp rename to frameworks/native/neural_network_runtime/transform.cpp diff --git a/frameworks/native/transform.h b/frameworks/native/neural_network_runtime/transform.h similarity index 100% rename from frameworks/native/transform.h rename to frameworks/native/neural_network_runtime/transform.h diff --git a/test/system_test/BUILD.gn b/test/system_test/BUILD.gn index 95ef4a7..4a6d305 100644 --- a/test/system_test/BUILD.gn +++ b/test/system_test/BUILD.gn @@ -19,7 +19,9 @@ config("system_test_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/ai/neural_network_runtime", + "../..", + "../../frameworks/native/neural_network_runtime", + "../../frameworks/native/neural_network_core", "//third_party/mindspore/mindspore-src/source/mindspore/lite/mindir/include", ] @@ -60,7 +62,8 @@ ohos_systemtest("End2EndTest") { configs = [ ":system_test_config" ] deps = [ - "//foundation/ai/neural_network_runtime/frameworks:libneural_network_runtime", + "../../frameworks/native/neural_network_core:libneural_network_core", + "../../frameworks/native/neural_network_runtime:libneural_network_runtime", "//third_party/googletest:gtest_main", ] diff --git a/test/unittest/common/base_test.h b/test/unittest/common/base_test.h index b77a3b6..795c4f8 100644 --- a/test/unittest/common/base_test.h +++ b/test/unittest/common/base_test.h @@ -18,7 +18,7 @@ #include #include -#include "frameworks/native/ops_builder.h" +#include "ops_builder.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 663cde3..2af21f9 100644 --- a/test/unittest/common/v1_0/compilation_mock_idevice.cpp +++ b/test/unittest/common/v1_0/compilation_mock_idevice.cpp @@ -14,9 +14,9 @@ */ #include "common/utils.h" -#include "frameworks/native/device_manager.h" -#include "frameworks/native/hdi_device_v1_0.h" -#include "frameworks/native/nn_tensor.h" +#include "device_manager.h" +#include "hdi_device_v1_0.h" +#include "nn_tensor.h" #include "test/unittest/common/v1_0/mock_idevice.h" OH_NN_ReturnCode OHOS::HDI::Nnrt::V1_0::MockIPreparedModel::m_ExpectRetCode = OH_NN_OPERATION_FORBIDDEN; diff --git a/test/unittest/common/v1_0/executor_mock_device.cpp b/test/unittest/common/v1_0/executor_mock_device.cpp index 51b7950..c05e30c 100644 --- a/test/unittest/common/v1_0/executor_mock_device.cpp +++ b/test/unittest/common/v1_0/executor_mock_device.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include "frameworks/native/compilation.h" -#include "frameworks/native/execution_plan.h" -#include "frameworks/native/hdi_device_v1_0.h" +#include "compilation.h" +#include "execution_plan.h" +#include "hdi_device_v1_0.h" #include "test/unittest/common/v1_0/mock_idevice.h" OH_NN_ReturnCode OHOS::HDI::Nnrt::V1_0::MockIPreparedModel::m_ExpectRetCode = OH_NN_OPERATION_FORBIDDEN; 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 0702b96..594b1a7 100644 --- a/test/unittest/common/v1_0/inner_model_mock_device.cpp +++ b/test/unittest/common/v1_0/inner_model_mock_device.cpp @@ -17,10 +17,10 @@ #include #include "common/utils.h" -#include "frameworks/native/inner_model.h" -#include "frameworks/native/hdi_device_v1_0.h" -#include "frameworks/native/device_manager.h" -#include "frameworks/native/ops/div_builder.h" +#include "inner_model.h" +#include "hdi_device_v1_0.h" +#include "device_manager.h" +#include "ops/div_builder.h" #include "mock_idevice.h" namespace OHOS { diff --git a/test/unittest/common/v1_0/mock_idevice.h b/test/unittest/common/v1_0/mock_idevice.h index 2d871d6..0a16d18 100644 --- a/test/unittest/common/v1_0/mock_idevice.h +++ b/test/unittest/common/v1_0/mock_idevice.h @@ -18,9 +18,9 @@ #include -#include "frameworks/native/hdi_prepared_model_v1_0.h" -#include "frameworks/native/memory_manager.h" -#include "frameworks/native/transform.h" +#include "hdi_prepared_model_v1_0.h" +#include "memory_manager.h" +#include "transform.h" namespace OHOS { namespace HDI { diff --git a/test/unittest/common/v2_0/compilation_mock_idevice.cpp b/test/unittest/common/v2_0/compilation_mock_idevice.cpp index 58386f4..a08b78c 100644 --- a/test/unittest/common/v2_0/compilation_mock_idevice.cpp +++ b/test/unittest/common/v2_0/compilation_mock_idevice.cpp @@ -14,9 +14,9 @@ */ #include "common/utils.h" -#include "frameworks/native/device_manager.h" -#include "frameworks/native/hdi_device_v2_0.h" -#include "frameworks/native/nn_tensor.h" +#include "device_manager.h" +#include "hdi_device_v2_0.h" +#include "nn_tensor.h" #include "test/unittest/common/v2_0/mock_idevice.h" OH_NN_ReturnCode OHOS::HDI::Nnrt::V2_0::MockIPreparedModel::m_ExpectRetCode = OH_NN_OPERATION_FORBIDDEN; diff --git a/test/unittest/common/v2_0/executor_mock_device.cpp b/test/unittest/common/v2_0/executor_mock_device.cpp index d49222d..0b6bb30 100644 --- a/test/unittest/common/v2_0/executor_mock_device.cpp +++ b/test/unittest/common/v2_0/executor_mock_device.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include "frameworks/native/compilation.h" -#include "frameworks/native/execution_plan.h" -#include "frameworks/native/hdi_device_v2_0.h" +#include "compilation.h" +#include "execution_plan.h" +#include "hdi_device_v2_0.h" #include "test/unittest/common/v2_0/mock_idevice.h" OH_NN_ReturnCode OHOS::HDI::Nnrt::V2_0::MockIPreparedModel::m_ExpectRetCode = OH_NN_OPERATION_FORBIDDEN; 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 996ae63..bc083e1 100644 --- a/test/unittest/common/v2_0/inner_model_mock_device.cpp +++ b/test/unittest/common/v2_0/inner_model_mock_device.cpp @@ -17,10 +17,10 @@ #include #include "common/utils.h" -#include "frameworks/native/inner_model.h" -#include "frameworks/native/hdi_device_v2_0.h" -#include "frameworks/native/device_manager.h" -#include "frameworks/native/ops/div_builder.h" +#include "inner_model.h" +#include "hdi_device_v2_0.h" +#include "device_manager.h" +#include "ops/div_builder.h" #include "mock_idevice.h" namespace OHOS { diff --git a/test/unittest/common/v2_0/mock_idevice.h b/test/unittest/common/v2_0/mock_idevice.h index b7afbd2..2983094 100644 --- a/test/unittest/common/v2_0/mock_idevice.h +++ b/test/unittest/common/v2_0/mock_idevice.h @@ -18,9 +18,9 @@ #include -#include "frameworks/native/hdi_prepared_model_v2_0.h" -#include "frameworks/native/memory_manager.h" -#include "frameworks/native/transform.h" +#include "hdi_prepared_model_v2_0.h" +#include "memory_manager.h" +#include "transform.h" namespace OHOS { namespace HDI { diff --git a/test/unittest/components/BUILD.gn b/test/unittest/components/BUILD.gn index 13d982c..e90fbc8 100644 --- a/test/unittest/components/BUILD.gn +++ b/test/unittest/components/BUILD.gn @@ -21,6 +21,8 @@ config("module_private_config") { 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", ] @@ -34,7 +36,8 @@ ohos_unittest("CompilationV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -57,7 +60,8 @@ ohos_unittest("ExecutorV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -80,7 +84,8 @@ ohos_unittest("DeviceManagerV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -102,7 +107,8 @@ ohos_unittest("DeviceRegistrarV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -125,7 +131,8 @@ ohos_unittest("HDIDeviceV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -148,7 +155,8 @@ ohos_unittest("HDIPreparedModelV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -170,7 +178,8 @@ ohos_unittest("MemoryManagerTest") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -190,7 +199,8 @@ ohos_unittest("TransformV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -211,7 +221,8 @@ ohos_unittest("InnerModelV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -233,7 +244,8 @@ ohos_unittest("NnTensorV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -255,7 +267,8 @@ ohos_unittest("NnValidationV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -277,7 +290,8 @@ ohos_unittest("OpsRegistryV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -302,7 +316,8 @@ ohos_unittest("NeuralNetworkRuntimeV1_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -325,7 +340,8 @@ ohos_unittest("CompilationV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -348,7 +364,8 @@ ohos_unittest("ExecutorV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -371,7 +388,8 @@ ohos_unittest("DeviceManagerV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -393,7 +411,8 @@ ohos_unittest("DeviceRegistrarV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -416,7 +435,8 @@ ohos_unittest("HDIDeviceV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -439,7 +459,8 @@ ohos_unittest("HDIPreparedModelV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -460,7 +481,8 @@ ohos_unittest("TransformV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -481,7 +503,8 @@ ohos_unittest("InnerModelV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -503,7 +526,8 @@ ohos_unittest("NnTensorV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -525,7 +549,8 @@ ohos_unittest("NnValidationV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -547,7 +572,8 @@ ohos_unittest("OpsRegistryV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] @@ -572,7 +598,8 @@ ohos_unittest("NeuralNetworkRuntimeV2_0Test") { configs = [ ":module_private_config" ] deps = [ - "../../../frameworks:libneural_network_runtime", + "../../../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", ] diff --git a/test/unittest/components/memory_manager/memory_manager_test.cpp b/test/unittest/components/memory_manager/memory_manager_test.cpp index 293aca3..a82c865 100644 --- a/test/unittest/components/memory_manager/memory_manager_test.cpp +++ b/test/unittest/components/memory_manager/memory_manager_test.cpp @@ -22,8 +22,8 @@ #include -#include "frameworks/native/cpp_type.h" -#include "frameworks/native/memory_manager.h" +#include "cpp_type.h" +#include "memory_manager.h" #include "test/unittest/common/file_utils.h" using namespace testing; diff --git a/test/unittest/components/v1_0/compilation/compilation_test.h b/test/unittest/components/v1_0/compilation/compilation_test.h index a171d82..6965554 100644 --- a/test/unittest/components/v1_0/compilation/compilation_test.h +++ b/test/unittest/components/v1_0/compilation/compilation_test.h @@ -18,8 +18,8 @@ #include -#include "frameworks/native/compilation.h" -#include "frameworks/native/inner_model.h" +#include "compilation.h" +#include "inner_model.h" namespace OHOS { namespace NeuralNetworkRuntime { 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 9f83369..a6d28fd 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,8 +17,8 @@ #include #include "common/log.h" -#include "frameworks/native/device_manager.h" -#include "frameworks/native/hdi_device_v1_0.h" +#include "device_manager.h" +#include "hdi_device_v1_0.h" #include "test/unittest/common/v1_0/mock_idevice.h" using namespace testing; 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 c369f1b..8f8a835 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 @@ -20,9 +20,9 @@ #include #include "common/log.h" -#include "frameworks/native/device_registrar.h" -#include "frameworks/native/hdi_device_v1_0.h" -#include "frameworks/native/device_manager.h" +#include "device_registrar.h" +#include "hdi_device_v1_0.h" +#include "device_manager.h" #include "test/unittest/common/v1_0/mock_idevice.h" using namespace testing; diff --git a/test/unittest/components/v1_0/executor/executor_test.cpp b/test/unittest/components/v1_0/executor/executor_test.cpp index ddcbd49..4156954 100644 --- a/test/unittest/components/v1_0/executor/executor_test.cpp +++ b/test/unittest/components/v1_0/executor/executor_test.cpp @@ -16,8 +16,8 @@ #include "executor_test.h" #include "common/scoped_trace.h" -#include "frameworks/native/compilation.h" -#include "frameworks/native/inner_model.h" +#include "compilation.h" +#include "inner_model.h" #include "test/unittest/common/v1_0/mock_idevice.h" using namespace OHOS::NeuralNetworkRuntime; diff --git a/test/unittest/components/v1_0/executor/executor_test.h b/test/unittest/components/v1_0/executor/executor_test.h index 05837b5..cab7f21 100644 --- a/test/unittest/components/v1_0/executor/executor_test.h +++ b/test/unittest/components/v1_0/executor/executor_test.h @@ -20,7 +20,7 @@ #include "mindir.h" -#include "frameworks/native/executor.h" +#include "executor.h" namespace MSLITE = mindspore::lite; namespace OHOS { diff --git a/test/unittest/components/v1_0/hdi_device/hdi_device_test.cpp b/test/unittest/components/v1_0/hdi_device/hdi_device_test.cpp index 5ce08e8..c481d51 100644 --- a/test/unittest/components/v1_0/hdi_device/hdi_device_test.cpp +++ b/test/unittest/components/v1_0/hdi_device/hdi_device_test.cpp @@ -24,7 +24,7 @@ #include #include -#include "frameworks/native/hdi_device_v1_0.h" +#include "hdi_device_v1_0.h" #include "test/unittest/common/v1_0/mock_idevice.h" #include "test/unittest/common/file_utils.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 1173113..5fcde0e 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 @@ -21,9 +21,9 @@ #include #include "common/log.h" -#include "frameworks/native/hdi_prepared_model_v1_0.h" -#include "frameworks/native/memory_manager.h" -#include "frameworks/native/transform.h" +#include "hdi_prepared_model_v1_0.h" +#include "memory_manager.h" +#include "transform.h" #include "test/unittest/common/v1_0/mock_idevice.h" #include "test/unittest/common/file_utils.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 c51b6ae..5634924 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 @@ -18,8 +18,8 @@ #include "common/utils.h" #include "common/log.h" -#include "frameworks/native/nn_tensor.h" -#include "frameworks/native/inner_model.h" +#include "nn_tensor.h" +#include "inner_model.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/components/v1_0/inner_model/nn_tensor_test.cpp b/test/unittest/components/v1_0/inner_model/nn_tensor_test.cpp index 512194e..97e7b51 100644 --- a/test/unittest/components/v1_0/inner_model/nn_tensor_test.cpp +++ b/test/unittest/components/v1_0/inner_model/nn_tensor_test.cpp @@ -16,8 +16,8 @@ #include #include -#include "frameworks/native/validation.h" -#include "frameworks/native/nn_tensor.h" +#include "validation.h" +#include "nn_tensor.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/components/v1_0/inner_model/nn_validation_test.cpp b/test/unittest/components/v1_0/inner_model/nn_validation_test.cpp index 49a2e81..1fdff2f 100644 --- a/test/unittest/components/v1_0/inner_model/nn_validation_test.cpp +++ b/test/unittest/components/v1_0/inner_model/nn_validation_test.cpp @@ -15,8 +15,8 @@ #include -#include "frameworks/native/validation.h" -#include "frameworks/native/nn_tensor.h" +#include "validation.h" +#include "nn_tensor.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/components/v1_0/inner_model/ops_registry_test.cpp b/test/unittest/components/v1_0/inner_model/ops_registry_test.cpp index de3cc84..ab000d5 100644 --- a/test/unittest/components/v1_0/inner_model/ops_registry_test.cpp +++ b/test/unittest/components/v1_0/inner_model/ops_registry_test.cpp @@ -15,10 +15,10 @@ #include -#include "frameworks/native/validation.h" -#include "frameworks/native/ops_registry.h" -#include "frameworks/native/ops/add_builder.h" -#include "frameworks/native/ops/div_builder.h" +#include "validation.h" +#include "ops_registry.h" +#include "ops/add_builder.h" +#include "ops/div_builder.h" using namespace testing; using namespace testing::ext; 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 b869f13..b95187b 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 @@ -18,9 +18,9 @@ #include "mindir.h" #include "common/utils.h" -#include "frameworks/native/compilation.h" -#include "frameworks/native/device_manager.h" -#include "frameworks/native/hdi_device_v1_0.h" +#include "compilation.h" +#include "device_manager.h" +#include "hdi_device_v1_0.h" #include "test/unittest/common/v1_0/mock_idevice.h" namespace OHOS { 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 a79fb48..7bee0f4 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 @@ -19,8 +19,8 @@ #include #include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" -#include "frameworks/native/inner_model.h" -#include "frameworks/native/executor.h" +#include "inner_model.h" +#include "executor.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/test/unittest/components/v1_0/transform/transform_test.cpp b/test/unittest/components/v1_0/transform/transform_test.cpp index 05dd693..d76514b 100644 --- a/test/unittest/components/v1_0/transform/transform_test.cpp +++ b/test/unittest/components/v1_0/transform/transform_test.cpp @@ -15,8 +15,8 @@ #include -#include "frameworks/native/transform.h" -#include "frameworks/native/memory_manager.h" +#include "transform.h" +#include "memory_manager.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/components/v2_0/compilation/compilation_test.h b/test/unittest/components/v2_0/compilation/compilation_test.h index a171d82..6965554 100644 --- a/test/unittest/components/v2_0/compilation/compilation_test.h +++ b/test/unittest/components/v2_0/compilation/compilation_test.h @@ -18,8 +18,8 @@ #include -#include "frameworks/native/compilation.h" -#include "frameworks/native/inner_model.h" +#include "compilation.h" +#include "inner_model.h" namespace OHOS { namespace NeuralNetworkRuntime { 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 3e1040a..6d2dfff 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 @@ -17,8 +17,8 @@ #include #include "common/log.h" -#include "frameworks/native/device_manager.h" -#include "frameworks/native/hdi_device_v2_0.h" +#include "device_manager.h" +#include "hdi_device_v2_0.h" #include "test/unittest/common/v2_0/mock_idevice.h" using namespace testing; 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 0c2e6e1..2e33c28 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 @@ -20,9 +20,9 @@ #include #include "common/log.h" -#include "frameworks/native/device_registrar.h" -#include "frameworks/native/hdi_device_v2_0.h" -#include "frameworks/native/device_manager.h" +#include "device_registrar.h" +#include "hdi_device_v2_0.h" +#include "device_manager.h" #include "test/unittest/common/v2_0/mock_idevice.h" using namespace testing; diff --git a/test/unittest/components/v2_0/executor/executor_test.cpp b/test/unittest/components/v2_0/executor/executor_test.cpp index 8204026..5d6c44d 100644 --- a/test/unittest/components/v2_0/executor/executor_test.cpp +++ b/test/unittest/components/v2_0/executor/executor_test.cpp @@ -16,8 +16,8 @@ #include "executor_test.h" #include "common/scoped_trace.h" -#include "frameworks/native/compilation.h" -#include "frameworks/native/inner_model.h" +#include "compilation.h" +#include "inner_model.h" #include "test/unittest/common/v2_0/mock_idevice.h" using namespace OHOS::NeuralNetworkRuntime; diff --git a/test/unittest/components/v2_0/executor/executor_test.h b/test/unittest/components/v2_0/executor/executor_test.h index 05837b5..cab7f21 100644 --- a/test/unittest/components/v2_0/executor/executor_test.h +++ b/test/unittest/components/v2_0/executor/executor_test.h @@ -20,7 +20,7 @@ #include "mindir.h" -#include "frameworks/native/executor.h" +#include "executor.h" namespace MSLITE = mindspore::lite; namespace OHOS { 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 b98529b..8cdbd7c 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 @@ -24,7 +24,7 @@ #include #include -#include "frameworks/native/hdi_device_v2_0.h" +#include "hdi_device_v2_0.h" #include "test/unittest/common/v2_0/mock_idevice.h" #include "test/unittest/common/file_utils.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 a354e58..72889e4 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 @@ -21,9 +21,9 @@ #include #include "common/log.h" -#include "frameworks/native/hdi_prepared_model_v2_0.h" -#include "frameworks/native/memory_manager.h" -#include "frameworks/native/transform.h" +#include "hdi_prepared_model_v2_0.h" +#include "memory_manager.h" +#include "transform.h" #include "test/unittest/common/v2_0/mock_idevice.h" #include "test/unittest/common/file_utils.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 c51b6ae..5634924 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 @@ -18,8 +18,8 @@ #include "common/utils.h" #include "common/log.h" -#include "frameworks/native/nn_tensor.h" -#include "frameworks/native/inner_model.h" +#include "nn_tensor.h" +#include "inner_model.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/components/v2_0/inner_model/nn_tensor_test.cpp b/test/unittest/components/v2_0/inner_model/nn_tensor_test.cpp index 512194e..97e7b51 100644 --- a/test/unittest/components/v2_0/inner_model/nn_tensor_test.cpp +++ b/test/unittest/components/v2_0/inner_model/nn_tensor_test.cpp @@ -16,8 +16,8 @@ #include #include -#include "frameworks/native/validation.h" -#include "frameworks/native/nn_tensor.h" +#include "validation.h" +#include "nn_tensor.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/components/v2_0/inner_model/nn_validation_test.cpp b/test/unittest/components/v2_0/inner_model/nn_validation_test.cpp index 49a2e81..1fdff2f 100644 --- a/test/unittest/components/v2_0/inner_model/nn_validation_test.cpp +++ b/test/unittest/components/v2_0/inner_model/nn_validation_test.cpp @@ -15,8 +15,8 @@ #include -#include "frameworks/native/validation.h" -#include "frameworks/native/nn_tensor.h" +#include "validation.h" +#include "nn_tensor.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/components/v2_0/inner_model/ops_registry_test.cpp b/test/unittest/components/v2_0/inner_model/ops_registry_test.cpp index de3cc84..ab000d5 100644 --- a/test/unittest/components/v2_0/inner_model/ops_registry_test.cpp +++ b/test/unittest/components/v2_0/inner_model/ops_registry_test.cpp @@ -15,10 +15,10 @@ #include -#include "frameworks/native/validation.h" -#include "frameworks/native/ops_registry.h" -#include "frameworks/native/ops/add_builder.h" -#include "frameworks/native/ops/div_builder.h" +#include "validation.h" +#include "ops_registry.h" +#include "ops/add_builder.h" +#include "ops/div_builder.h" using namespace testing; using namespace testing::ext; 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 6c7d9f8..ac2d02b 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 @@ -18,9 +18,9 @@ #include "mindir.h" #include "common/utils.h" -#include "frameworks/native/compilation.h" -#include "frameworks/native/device_manager.h" -#include "frameworks/native/hdi_device_v2_0.h" +#include "compilation.h" +#include "device_manager.h" +#include "hdi_device_v2_0.h" #include "test/unittest/common/v2_0/mock_idevice.h" namespace OHOS { 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 a79fb48..7bee0f4 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 @@ -19,8 +19,8 @@ #include #include "interfaces/kits/c/neural_network_runtime/neural_network_runtime.h" -#include "frameworks/native/inner_model.h" -#include "frameworks/native/executor.h" +#include "inner_model.h" +#include "executor.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/test/unittest/components/v2_0/transform/transform_test.cpp b/test/unittest/components/v2_0/transform/transform_test.cpp index 05dd693..d76514b 100644 --- a/test/unittest/components/v2_0/transform/transform_test.cpp +++ b/test/unittest/components/v2_0/transform/transform_test.cpp @@ -15,8 +15,8 @@ #include -#include "frameworks/native/transform.h" -#include "frameworks/native/memory_manager.h" +#include "transform.h" +#include "memory_manager.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/inner_kits/BUILD.gn b/test/unittest/inner_kits/BUILD.gn index 68848df..9f90993 100644 --- a/test/unittest/inner_kits/BUILD.gn +++ b/test/unittest/inner_kits/BUILD.gn @@ -20,7 +20,9 @@ config("module_private_config") { include_dirs = [ "//third_party/googletest/googlemock/include", - "//foundation/ai/neural_network_runtime", + "../../..", + "../../../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", ] @@ -42,7 +44,8 @@ ohos_unittest("NeuralNetworkRuntimeInnerTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/ai/neural_network_runtime/frameworks:libneural_network_runtime", + "../../../frameworks/native/neural_network_core:libneural_network_core", + "../../../frameworks/native/neural_network_runtime:libneural_network_runtime", "//third_party/googletest:gtest_main", ] diff --git a/test/unittest/inner_kits/neural_network_runtime_inner_test.cpp b/test/unittest/inner_kits/neural_network_runtime_inner_test.cpp index 31fba4c..fcc78d8 100644 --- a/test/unittest/inner_kits/neural_network_runtime_inner_test.cpp +++ b/test/unittest/inner_kits/neural_network_runtime_inner_test.cpp @@ -16,7 +16,7 @@ #include "neural_network_runtime_inner_test.h" #include "mindir.h" -#include "frameworks/native/inner_model.h" +#include "inner_model.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/test/unittest/ops/BUILD.gn b/test/unittest/ops/BUILD.gn index 7f65e52..c10c11d 100644 --- a/test/unittest/ops/BUILD.gn +++ b/test/unittest/ops/BUILD.gn @@ -20,7 +20,9 @@ config("module_private_config") { include_dirs = [ "//third_party/googletest/googlemock/include", - "//foundation/ai/neural_network_runtime", + "../../..", + "../../../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", ] @@ -98,7 +100,8 @@ ohos_unittest("OpsUnittest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/ai/neural_network_runtime/frameworks:libneural_network_runtime", + "../../../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", ] diff --git a/test/unittest/ops/add_test.cpp b/test/unittest/ops/add_test.cpp index 8c1e955..dceaf2b 100644 --- a/test/unittest/ops/add_test.cpp +++ b/test/unittest/ops/add_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/add_builder.h" +#include "ops/add_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/argmax_test.cpp b/test/unittest/ops/argmax_test.cpp index 5a7ee65..e658bf7 100644 --- a/test/unittest/ops/argmax_test.cpp +++ b/test/unittest/ops/argmax_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/argmax_builder.h" +#include "ops/argmax_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/avgpool_pad_test.cpp b/test/unittest/ops/avgpool_pad_test.cpp index 665896a..15d6163 100644 --- a/test/unittest/ops/avgpool_pad_test.cpp +++ b/test/unittest/ops/avgpool_pad_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/avgpool_builder.h" +#include "ops/avgpool_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/avgpool_padmod_test.cpp b/test/unittest/ops/avgpool_padmod_test.cpp index 61fb147..18b3ebd 100644 --- a/test/unittest/ops/avgpool_padmod_test.cpp +++ b/test/unittest/ops/avgpool_padmod_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/avgpool_builder.h" +#include "ops/avgpool_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/batch_to_space_nd_test.cpp b/test/unittest/ops/batch_to_space_nd_test.cpp index df5897e..1f144db 100644 --- a/test/unittest/ops/batch_to_space_nd_test.cpp +++ b/test/unittest/ops/batch_to_space_nd_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/batch_to_space_nd_builder.h" +#include "ops/batch_to_space_nd_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/batchnorm_builder_test.cpp b/test/unittest/ops/batchnorm_builder_test.cpp index a8eb800..b545eea 100644 --- a/test/unittest/ops/batchnorm_builder_test.cpp +++ b/test/unittest/ops/batchnorm_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/batchnorm_builder.h" +#include "ops/batchnorm_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/biasadd_test.cpp b/test/unittest/ops/biasadd_test.cpp index 0c848c3..113b778 100644 --- a/test/unittest/ops/biasadd_test.cpp +++ b/test/unittest/ops/biasadd_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/bias_add_builder.h" +#include "ops/bias_add_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/cast_test.cpp b/test/unittest/ops/cast_test.cpp index fb52b4b..21e40da 100644 --- a/test/unittest/ops/cast_test.cpp +++ b/test/unittest/ops/cast_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/cast_builder.h" +#include "ops/cast_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/concat_three_inputs_test.cpp b/test/unittest/ops/concat_three_inputs_test.cpp index 093b1c5..7bda402 100644 --- a/test/unittest/ops/concat_three_inputs_test.cpp +++ b/test/unittest/ops/concat_three_inputs_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/concat_builder.h" +#include "ops/concat_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/concat_two_inputs_test.cpp b/test/unittest/ops/concat_two_inputs_test.cpp index 8fa81b0..fe000a9 100644 --- a/test/unittest/ops/concat_two_inputs_test.cpp +++ b/test/unittest/ops/concat_two_inputs_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/concat_builder.h" +#include "ops/concat_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/conv2d_pad_test.cpp b/test/unittest/ops/conv2d_pad_test.cpp index c19c402..c915e62 100644 --- a/test/unittest/ops/conv2d_pad_test.cpp +++ b/test/unittest/ops/conv2d_pad_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/conv2d_builder.h" +#include "ops/conv2d_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/conv2d_padmode_test.cpp b/test/unittest/ops/conv2d_padmode_test.cpp index 4250d44..7f17198 100644 --- a/test/unittest/ops/conv2d_padmode_test.cpp +++ b/test/unittest/ops/conv2d_padmode_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/conv2d_builder.h" +#include "ops/conv2d_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/conv2d_tranpose_padmode_test.cpp b/test/unittest/ops/conv2d_tranpose_padmode_test.cpp index eea61e9..a66b034 100644 --- a/test/unittest/ops/conv2d_tranpose_padmode_test.cpp +++ b/test/unittest/ops/conv2d_tranpose_padmode_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/conv2d_transpose_builder.h" +#include "ops/conv2d_transpose_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/conv2d_transpose_pad_test.cpp b/test/unittest/ops/conv2d_transpose_pad_test.cpp index a0a8179..f69fa78 100644 --- a/test/unittest/ops/conv2d_transpose_pad_test.cpp +++ b/test/unittest/ops/conv2d_transpose_pad_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/conv2d_transpose_builder.h" +#include "ops/conv2d_transpose_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/depthwise_conv2d_native_pad_test.cpp b/test/unittest/ops/depthwise_conv2d_native_pad_test.cpp index 0e4a6ae..8e90485 100644 --- a/test/unittest/ops/depthwise_conv2d_native_pad_test.cpp +++ b/test/unittest/ops/depthwise_conv2d_native_pad_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/depthwise_conv2d_native_builder.h" +#include "ops/depthwise_conv2d_native_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/depthwise_conv2d_native_padmode_test.cpp b/test/unittest/ops/depthwise_conv2d_native_padmode_test.cpp index 8181be2..0e9865c 100644 --- a/test/unittest/ops/depthwise_conv2d_native_padmode_test.cpp +++ b/test/unittest/ops/depthwise_conv2d_native_padmode_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/depthwise_conv2d_native_builder.h" +#include "ops/depthwise_conv2d_native_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/div_test.cpp b/test/unittest/ops/div_test.cpp index 31668cb..8868f16 100644 --- a/test/unittest/ops/div_test.cpp +++ b/test/unittest/ops/div_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/div_builder.h" +#include "ops/div_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/eltwise_test.cpp b/test/unittest/ops/eltwise_test.cpp index 3a44e47..8f15c12 100644 --- a/test/unittest/ops/eltwise_test.cpp +++ b/test/unittest/ops/eltwise_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/eltwise_builder.h" +#include "ops/eltwise_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/expandims_test.cpp b/test/unittest/ops/expandims_test.cpp index ad3c040..d11cc31 100644 --- a/test/unittest/ops/expandims_test.cpp +++ b/test/unittest/ops/expandims_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/expandims_builder.h" +#include "ops/expandims_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/fill_builder_test.cpp b/test/unittest/ops/fill_builder_test.cpp index 59bde45..6942c25 100644 --- a/test/unittest/ops/fill_builder_test.cpp +++ b/test/unittest/ops/fill_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/fill_builder.h" +#include "ops/fill_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/fullconnection_test.cpp b/test/unittest/ops/fullconnection_test.cpp index 0754a71..ef2394c 100644 --- a/test/unittest/ops/fullconnection_test.cpp +++ b/test/unittest/ops/fullconnection_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/fullconnection_builder.h" +#include "ops/fullconnection_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/fullconnection_with_axis_test.cpp b/test/unittest/ops/fullconnection_with_axis_test.cpp index 6f379e2..4b72a90 100644 --- a/test/unittest/ops/fullconnection_with_axis_test.cpp +++ b/test/unittest/ops/fullconnection_with_axis_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/fullconnection_builder.h" +#include "ops/fullconnection_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/gather_builder_test.cpp b/test/unittest/ops/gather_builder_test.cpp index 74a2a03..9f65217 100644 --- a/test/unittest/ops/gather_builder_test.cpp +++ b/test/unittest/ops/gather_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/gather_builder.h" +#include "ops/gather_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/gelu_builder_test.cpp b/test/unittest/ops/gelu_builder_test.cpp index e6b56b3..46deb77 100644 --- a/test/unittest/ops/gelu_builder_test.cpp +++ b/test/unittest/ops/gelu_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/gelu_builder.h" +#include "ops/gelu_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/hswish_builder_test.cpp b/test/unittest/ops/hswish_builder_test.cpp index a80a48b..12f5abc 100644 --- a/test/unittest/ops/hswish_builder_test.cpp +++ b/test/unittest/ops/hswish_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/hswish_builder.h" +#include "ops/hswish_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/layernorm_builder_test.cpp b/test/unittest/ops/layernorm_builder_test.cpp index 254909e..33f234d 100644 --- a/test/unittest/ops/layernorm_builder_test.cpp +++ b/test/unittest/ops/layernorm_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/layernorm_builder.h" +#include "ops/layernorm_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/lessequal_builder_test.cpp b/test/unittest/ops/lessequal_builder_test.cpp index 6389818..7847762 100644 --- a/test/unittest/ops/lessequal_builder_test.cpp +++ b/test/unittest/ops/lessequal_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/lessequal_builder.h" +#include "ops/lessequal_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/matmul_builder_test.cpp b/test/unittest/ops/matmul_builder_test.cpp index 4af6c95..89688ae 100644 --- a/test/unittest/ops/matmul_builder_test.cpp +++ b/test/unittest/ops/matmul_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/matmul_builder.h" +#include "ops/matmul_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/maximum_builder_test.cpp b/test/unittest/ops/maximum_builder_test.cpp index 1e038af..a3e45a2 100644 --- a/test/unittest/ops/maximum_builder_test.cpp +++ b/test/unittest/ops/maximum_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/maximum_builder.h" +#include "ops/maximum_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/maxpool_pad_test.cpp b/test/unittest/ops/maxpool_pad_test.cpp index a331abf..92e67be 100644 --- a/test/unittest/ops/maxpool_pad_test.cpp +++ b/test/unittest/ops/maxpool_pad_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/maxpool_builder.h" +#include "ops/maxpool_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/maxpool_padmode_test.cpp b/test/unittest/ops/maxpool_padmode_test.cpp index 799edca..34f0ae0 100644 --- a/test/unittest/ops/maxpool_padmode_test.cpp +++ b/test/unittest/ops/maxpool_padmode_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/maxpool_builder.h" +#include "ops/maxpool_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/mul_builder_test.cpp b/test/unittest/ops/mul_builder_test.cpp index de6c0e1..d84fbaf 100644 --- a/test/unittest/ops/mul_builder_test.cpp +++ b/test/unittest/ops/mul_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/mul_builder.h" +#include "ops/mul_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/onehot_builder_test.cpp b/test/unittest/ops/onehot_builder_test.cpp index 16832ff..50dfc72 100644 --- a/test/unittest/ops/onehot_builder_test.cpp +++ b/test/unittest/ops/onehot_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/onehot_builder.h" +#include "ops/onehot_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/ops_test.h b/test/unittest/ops/ops_test.h index a352218..f16cbea 100644 --- a/test/unittest/ops/ops_test.h +++ b/test/unittest/ops/ops_test.h @@ -20,7 +20,7 @@ #include "mindir.h" -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "test/unittest/common/base_test.h" namespace OHOS { diff --git a/test/unittest/ops/pad_builder_test.cpp b/test/unittest/ops/pad_builder_test.cpp index 402d545..2e3f847 100644 --- a/test/unittest/ops/pad_builder_test.cpp +++ b/test/unittest/ops/pad_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/pad_builder.h" +#include "ops/pad_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/pow_builder_test.cpp b/test/unittest/ops/pow_builder_test.cpp index 099e2bf..e8e3c4f 100644 --- a/test/unittest/ops/pow_builder_test.cpp +++ b/test/unittest/ops/pow_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/pow_builder.h" +#include "ops/pow_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/prelu_builder_test.cpp b/test/unittest/ops/prelu_builder_test.cpp index 030cd2b..6417995 100644 --- a/test/unittest/ops/prelu_builder_test.cpp +++ b/test/unittest/ops/prelu_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/prelu_builder.h" +#include "ops/prelu_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/quant_dtype_cast_builder_test.cpp b/test/unittest/ops/quant_dtype_cast_builder_test.cpp index 69a2d5d..55c71b8 100644 --- a/test/unittest/ops/quant_dtype_cast_builder_test.cpp +++ b/test/unittest/ops/quant_dtype_cast_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/quant_dtype_cast_builder.h" +#include "ops/quant_dtype_cast_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/reduce_all_builder_test.cpp b/test/unittest/ops/reduce_all_builder_test.cpp index ff661f5..768b645 100644 --- a/test/unittest/ops/reduce_all_builder_test.cpp +++ b/test/unittest/ops/reduce_all_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/reduceall_builder.h" +#include "ops/reduceall_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/reduce_mean_builder_test.cpp b/test/unittest/ops/reduce_mean_builder_test.cpp index 3f3f657..4909912 100644 --- a/test/unittest/ops/reduce_mean_builder_test.cpp +++ b/test/unittest/ops/reduce_mean_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/reducemean_builder.h" +#include "ops/reducemean_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/reduce_prod_builder_test.cpp b/test/unittest/ops/reduce_prod_builder_test.cpp index 5b160a8..4ab78f6 100644 --- a/test/unittest/ops/reduce_prod_builder_test.cpp +++ b/test/unittest/ops/reduce_prod_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/reduceprod_builder.h" +#include "ops/reduceprod_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/relu6_builder_test.cpp b/test/unittest/ops/relu6_builder_test.cpp index 4ce5c1e..f423d91 100644 --- a/test/unittest/ops/relu6_builder_test.cpp +++ b/test/unittest/ops/relu6_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/relu6_builder.h" +#include "ops/relu6_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/relu_builder_test.cpp b/test/unittest/ops/relu_builder_test.cpp index 5fabb49..5947b35 100644 --- a/test/unittest/ops/relu_builder_test.cpp +++ b/test/unittest/ops/relu_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/relu_builder.h" +#include "ops/relu_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/reshape_builder_test.cpp b/test/unittest/ops/reshape_builder_test.cpp index 6443b49..8e0b84f 100644 --- a/test/unittest/ops/reshape_builder_test.cpp +++ b/test/unittest/ops/reshape_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/reshape_builder.h" +#include "ops/reshape_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/resize_bilinear_builder_test.cpp b/test/unittest/ops/resize_bilinear_builder_test.cpp index 0ada3d9..75b8a3c 100644 --- a/test/unittest/ops/resize_bilinear_builder_test.cpp +++ b/test/unittest/ops/resize_bilinear_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/resize_bilinear_builder.h" +#include "ops/resize_bilinear_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/rsqrt_builder_test.cpp b/test/unittest/ops/rsqrt_builder_test.cpp index 62c98b3..2d85cdc 100644 --- a/test/unittest/ops/rsqrt_builder_test.cpp +++ b/test/unittest/ops/rsqrt_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/rsqrt_builder.h" +#include "ops/rsqrt_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/scale_builder_test.cpp b/test/unittest/ops/scale_builder_test.cpp index 5ab6946..2f0d7b2 100644 --- a/test/unittest/ops/scale_builder_test.cpp +++ b/test/unittest/ops/scale_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/scale_builder.h" +#include "ops/scale_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/shape_builder_test.cpp b/test/unittest/ops/shape_builder_test.cpp index b52f0db..12793a5 100644 --- a/test/unittest/ops/shape_builder_test.cpp +++ b/test/unittest/ops/shape_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/shape_builder.h" +#include "ops/shape_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/sigmoid_builder_test.cpp b/test/unittest/ops/sigmoid_builder_test.cpp index 0eb4dcc..486cc6c 100644 --- a/test/unittest/ops/sigmoid_builder_test.cpp +++ b/test/unittest/ops/sigmoid_builder_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "frameworks/native/ops/sigmoid_builder.h" +#include "ops/sigmoid_builder.h" #include "ops_test.h" diff --git a/test/unittest/ops/slice_builder_test.cpp b/test/unittest/ops/slice_builder_test.cpp index b1a2fcf..1cdbed9 100644 --- a/test/unittest/ops/slice_builder_test.cpp +++ b/test/unittest/ops/slice_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/slice_builder.h" +#include "ops/slice_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/softmax_builder_test.cpp b/test/unittest/ops/softmax_builder_test.cpp index 58ce833..cc0a599 100644 --- a/test/unittest/ops/softmax_builder_test.cpp +++ b/test/unittest/ops/softmax_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/softmax_builder.h" +#include "ops/softmax_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/spacetobatchnd_builder_test.cpp b/test/unittest/ops/spacetobatchnd_builder_test.cpp index 05c6317..f07ed79 100644 --- a/test/unittest/ops/spacetobatchnd_builder_test.cpp +++ b/test/unittest/ops/spacetobatchnd_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/space_to_batch_nd_builder.h" +#include "ops/space_to_batch_nd_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/split_builder_test.cpp b/test/unittest/ops/split_builder_test.cpp index d657265..9787434 100644 --- a/test/unittest/ops/split_builder_test.cpp +++ b/test/unittest/ops/split_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/split_builder.h" +#include "ops/split_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/sqrt_builder_test.cpp b/test/unittest/ops/sqrt_builder_test.cpp index 93a1367..e8938c0 100644 --- a/test/unittest/ops/sqrt_builder_test.cpp +++ b/test/unittest/ops/sqrt_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/sqrt_builder.h" +#include "ops/sqrt_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/squared_difference_builder_test.cpp b/test/unittest/ops/squared_difference_builder_test.cpp index c203592..fb91d5c 100644 --- a/test/unittest/ops/squared_difference_builder_test.cpp +++ b/test/unittest/ops/squared_difference_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/squared_difference_builder.h" +#include "ops/squared_difference_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/squeeze_builder_test.cpp b/test/unittest/ops/squeeze_builder_test.cpp index 2e39915..ef21957 100644 --- a/test/unittest/ops/squeeze_builder_test.cpp +++ b/test/unittest/ops/squeeze_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/squeeze_builder.h" +#include "ops/squeeze_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/stack_builder_test.cpp b/test/unittest/ops/stack_builder_test.cpp index 7dfc67e..b660c3f 100644 --- a/test/unittest/ops/stack_builder_test.cpp +++ b/test/unittest/ops/stack_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/stack_builder.h" +#include "ops/stack_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/strided_slice_builder_test.cpp b/test/unittest/ops/strided_slice_builder_test.cpp index 3014b75..249f20e 100644 --- a/test/unittest/ops/strided_slice_builder_test.cpp +++ b/test/unittest/ops/strided_slice_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/strided_slice_builder.h" +#include "ops/strided_slice_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/sub_builder_test.cpp b/test/unittest/ops/sub_builder_test.cpp index ee7f7a8..15ae2ce 100644 --- a/test/unittest/ops/sub_builder_test.cpp +++ b/test/unittest/ops/sub_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/sub_builder.h" +#include "ops/sub_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/tanh_builder_test.cpp b/test/unittest/ops/tanh_builder_test.cpp index 275ce20..8b14baa 100644 --- a/test/unittest/ops/tanh_builder_test.cpp +++ b/test/unittest/ops/tanh_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/tanh_builder.h" +#include "ops/tanh_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/tile_builder_test.cpp b/test/unittest/ops/tile_builder_test.cpp index f6b9808..e180dd9 100644 --- a/test/unittest/ops/tile_builder_test.cpp +++ b/test/unittest/ops/tile_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/tile_builder.h" +#include "ops/tile_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/topk_builder_test.cpp b/test/unittest/ops/topk_builder_test.cpp index 8237e92..2f16de2 100644 --- a/test/unittest/ops/topk_builder_test.cpp +++ b/test/unittest/ops/topk_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/top_k_builder.h" +#include "ops/top_k_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/transpose_builder_test.cpp b/test/unittest/ops/transpose_builder_test.cpp index a0a5095..63fed8f 100644 --- a/test/unittest/ops/transpose_builder_test.cpp +++ b/test/unittest/ops/transpose_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/transpose_builder.h" +#include "ops/transpose_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; diff --git a/test/unittest/ops/unsqueeze_builder_test.cpp b/test/unittest/ops/unsqueeze_builder_test.cpp index 512b4d2..78c913d 100644 --- a/test/unittest/ops/unsqueeze_builder_test.cpp +++ b/test/unittest/ops/unsqueeze_builder_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "frameworks/native/ops/unsqueeze_builder.h" +#include "ops/unsqueeze_builder.h" #include -#include "frameworks/native/nn_tensor.h" +#include "nn_tensor.h" #include "ops_test.h" using namespace testing; -- Gitee From fb9e3904dd3b89a2f7f0942c453cb1a01b63a52d Mon Sep 17 00:00:00 2001 From: wangchuanxia Date: Thu, 25 Jan 2024 11:21:32 +0800 Subject: [PATCH 2/2] nncore sep Signed-off-by: wangchuanxia --- bundle.json | 10 +++++++++- frameworks/native/neural_network_core/BUILD.gn | 6 ++++-- frameworks/native/neural_network_runtime/BUILD.gn | 6 ++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/bundle.json b/bundle.json index 055728e..8c4a123 100644 --- a/bundle.json +++ b/bundle.json @@ -47,7 +47,15 @@ }, { "type": "so", - "name": "//foundation/ai/neural_network_runtime:nncore_target", + "name": "//foundation/ai/neural_network_runtime/frameworks/native/neural_network_core:libneural_network_core", + "header": { + "header_files": [], + "header_base":"//foundation/ai/neural_network_runtime/interfaces/kits/c" + } + }, + { + "type": "so", + "name": "//foundation/ai/neural_network_runtime/frameworks/native/neural_network_runtime:libneural_network_runtime", "header": { "header_files": [], "header_base":"//foundation/ai/neural_network_runtime/interfaces/kits/c" diff --git a/frameworks/native/neural_network_core/BUILD.gn b/frameworks/native/neural_network_core/BUILD.gn index 2fb3695..13a3234 100644 --- a/frameworks/native/neural_network_core/BUILD.gn +++ b/frameworks/native/neural_network_core/BUILD.gn @@ -17,10 +17,10 @@ config("nnrt_config") { cflags = [ "-fstack-protector-all" ] cflags_cc = [ "-fexceptions" ] include_dirs = [ - "../../..", - "../neural_network_runtime", "./", + "../neural_network_runtime", "../../../interfaces/innerkits/c", + "../../../interfaces/kits/c", ] } @@ -42,6 +42,8 @@ ohos_shared_library("libneural_network_core") { "updater", ] + include_dirs = [ "../../.." ] + public_configs = [ ":nnrt_config" ] external_deps = [ diff --git a/frameworks/native/neural_network_runtime/BUILD.gn b/frameworks/native/neural_network_runtime/BUILD.gn index 2ef2e4a..8b8995a 100644 --- a/frameworks/native/neural_network_runtime/BUILD.gn +++ b/frameworks/native/neural_network_runtime/BUILD.gn @@ -17,10 +17,10 @@ config("nnrt_config") { cflags = [ "-fstack-protector-all" ] cflags_cc = [ "-fexceptions" ] include_dirs = [ - "../../..", "./", "../neural_network_core", "../../../interfaces/innerkits/c", + "../../../interfaces/kits/c", ] } @@ -116,6 +116,8 @@ ohos_shared_library("libneural_network_runtime") { "updater", ] + include_dirs = [ "../../.." ] + public_configs = [ ":nnrt_config" ] external_deps = [ @@ -125,7 +127,7 @@ ohos_shared_library("libneural_network_runtime") { "hdf_core:libhdf_utils", "hilog:libhilog", "hitrace:libhitracechain", - "mindspore:mindir_lib", + "mindspore:mindir", ] deps = [ "../neural_network_core:libneural_network_core" ] -- Gitee