From e70b0c2f14505012320f742ad1619b4f9b7ed6d7 Mon Sep 17 00:00:00 2001 From: jjfeing Date: Thu, 16 Oct 2025 14:32:37 +0800 Subject: [PATCH] add modify include/api --- .clang-format | 6 + .jenkins/check/config/filter_cpplint.txt | 2 +- cmake/package_lite.cmake | 18 +- include/{cxx_api => api}/allocator.h | 2 +- include/{cxx_api => api}/callback/callback.h | 6 +- .../{cxx_api => api}/callback/ckpt_saver.h | 4 +- .../{cxx_api => api}/callback/loss_monitor.h | 2 +- .../{cxx_api => api}/callback/lr_scheduler.h | 2 +- .../{cxx_api => api}/callback/time_monitor.h | 2 +- .../callback/train_accuracy.h | 4 +- include/{cxx_api => api}/cell.h | 6 +- include/{cxx_api => api}/cfg.h | 6 +- include/{cxx_api => api}/context.h | 4 +- include/{cxx_api => api}/data_type.h | 0 include/{cxx_api => api}/delegate.h | 4 +- include/{cxx_api => api}/delegate_api.h | 4 +- include/{cxx_api => api}/dual_abi_helper.h | 0 include/{cxx_api => api}/format.h | 0 include/{cxx_api => api}/graph.h | 4 +- include/{cxx_api => api}/kernel.h | 6 +- include/{cxx_api => api}/kernel_api.h | 4 +- include/{cxx_api => api}/metrics/accuracy.h | 2 +- include/{cxx_api => api}/metrics/metrics.h | 2 +- include/{cxx_api => api}/model.h | 16 +- include/{cxx_api => api}/model_group.h | 8 +- .../{cxx_api => api}/model_parallel_runner.h | 4 +- include/{cxx_api => api}/serialization.h | 10 +- include/{cxx_api => api}/status.h | 4 +- include/{cxx_api => api}/types.h | 8 +- include/{cxx_api => api}/visible.h | 0 mindspore-lite/cmake/file_list.cmake | 12 +- .../ascend_ge_distributed_cpp/main.cc | 8 +- .../ascend_model_group_cpp/main.cc | 10 +- .../cloud_infer/quick_start_cpp/main.cc | 8 +- .../quick_start_parallel_cpp/main.cc | 8 +- .../examples/cloud_infer/runtime_cpp/main.cc | 6 +- .../converter_extend/infer/custom_common.h | 4 +- .../examples/quick_start_cpp/main.cc | 16 +- mindspore-lite/examples/runtime_cpp/main.cc | 32 +- .../examples/runtime_extend/main.cc | 6 +- .../runtime_extend/src/custom_add_infer.cc | 2 +- .../runtime_extend/src/custom_common.h | 4 +- .../examples/runtime_gpu_extend/main.cc | 6 +- .../src/custom_add_kernel_gpu.cc | 2 +- .../runtime_gpu_extend/src/custom_common.h | 4 +- .../examples/train_lenet_cpp/src/inference.cc | 8 +- .../train_lenet_cpp/src/net_runner.cc | 16 +- .../examples/train_lenet_cpp/src/net_runner.h | 6 +- .../include/api/multi_model_runner.h | 8 +- mindspore-lite/include/converter.h | 6 +- mindspore-lite/include/kernel_interface.h | 4 +- mindspore-lite/include/model.h | 2 +- .../include/registry/converter_context.h | 4 +- .../include/registry/node_parser_registry.h | 2 +- .../include/registry/opencl_runtime_wrapper.h | 6 +- mindspore-lite/include/registry/pass_base.h | 2 +- .../include/registry/pass_registry.h | 4 +- .../include/registry/register_kernel.h | 10 +- .../include/train/train_loop_callback.h | 2 +- mindspore-lite/java/src/main/native/graph.cpp | 6 +- mindspore-lite/java/src/main/native/model.cpp | 4 +- .../src/main/native/model_parallel_runner.cpp | 4 +- .../java/src/main/native/ms_context.cpp | 2 +- .../java/src/main/native/ms_tensor.cpp | 2 +- .../java/src/main/native/runner_config.cpp | 2 +- .../java/src/main/native/train_config.cpp | 4 +- .../java/src/main/native/version.cpp | 2 +- .../minddata/dataset/api/data_helper.cc | 2 +- .../minddata/dataset/core/de_tensor.h | 4 +- .../minddata/dataset/core/device_resource.h | 6 +- .../minddata/dataset/core/device_tensor.h | 2 +- .../minddata/dataset/core/global_context.h | 2 +- mindspore-lite/minddata/dataset/core/types.cc | 2 +- .../engine/ir/cache/dataset_cache_impl.h | 2 +- .../source/samplers/distributed_sampler_ir.h | 2 +- .../source/samplers/pk_sampler_ir.h | 2 +- .../source/samplers/prebuilt_sampler_ir.h | 2 +- .../source/samplers/random_sampler_ir.h | 2 +- .../datasetops/source/samplers/samplers_ir.h | 2 +- .../source/samplers/sequential_sampler_ir.h | 2 +- .../samplers/skip_first_epoch_sampler_ir.h | 2 +- .../samplers/subset_random_sampler_ir.h | 2 +- .../source/samplers/subset_sampler_ir.h | 2 +- .../samplers/weighted_random_sampler_ir.h | 2 +- .../minddata/dataset/include/dataset/audio.h | 6 +- .../minddata/dataset/include/dataset/config.h | 4 +- .../dataset/include/dataset/constants.h | 2 +- .../dataset/include/dataset/data_helper.h | 4 +- .../dataset/include/dataset/datasets.h | 4 +- .../dataset/include/dataset/execute.h | 4 +- .../dataset/include/dataset/iterator.h | 6 +- .../dataset/include/dataset/samplers.h | 4 +- .../minddata/dataset/include/dataset/text.h | 4 +- .../dataset/include/dataset/transforms.h | 6 +- .../minddata/dataset/include/dataset/vision.h | 4 +- .../dataset/include/dataset/vision_ascend.h | 2 +- .../dataset/include/dataset/vision_lite.h | 2 +- .../dvpp/ascend310/dvpp_decode_video_op.cc | 2 +- .../dataset/kernels/image/lite_cv/lite_mat.h | 2 +- .../kernels/ir/vision/adjust_brightness_ir.h | 2 +- .../kernels/ir/vision/adjust_contrast_ir.h | 2 +- .../kernels/ir/vision/adjust_gamma_ir.h | 2 +- .../dataset/kernels/ir/vision/adjust_hue_ir.h | 2 +- .../kernels/ir/vision/adjust_saturation_ir.h | 2 +- .../kernels/ir/vision/adjust_sharpness_ir.h | 2 +- .../dataset/kernels/ir/vision/affine_ir.h | 2 +- .../kernels/ir/vision/ascend_vision_ir.h | 2 +- .../kernels/ir/vision/auto_augment_ir.h | 2 +- .../kernels/ir/vision/auto_contrast_ir.h | 2 +- .../ir/vision/bounding_box_augment_ir.h | 2 +- .../kernels/ir/vision/center_crop_ir.h | 2 +- .../kernels/ir/vision/convert_color_ir.h | 2 +- .../dataset/kernels/ir/vision/crop_ir.h | 2 +- .../kernels/ir/vision/cutmix_batch_ir.h | 2 +- .../dataset/kernels/ir/vision/cutout_ir.h | 2 +- .../dataset/kernels/ir/vision/decode_ir.h | 2 +- .../kernels/ir/vision/decode_video_ir.h | 2 +- .../dataset/kernels/ir/vision/equalize_ir.h | 2 +- .../dataset/kernels/ir/vision/erase_ir.h | 2 +- .../kernels/ir/vision/gaussian_blur_ir.h | 2 +- .../kernels/ir/vision/horizontal_flip_ir.h | 2 +- .../dataset/kernels/ir/vision/hwc_to_chw_ir.h | 2 +- .../dataset/kernels/ir/vision/invert_ir.h | 2 +- .../kernels/ir/vision/mixup_batch_ir.h | 2 +- .../dataset/kernels/ir/vision/normalize_ir.h | 2 +- .../kernels/ir/vision/normalize_pad_ir.h | 2 +- .../dataset/kernels/ir/vision/pad_ir.h | 2 +- .../kernels/ir/vision/perspective_ir.h | 2 +- .../dataset/kernels/ir/vision/posterize_ir.h | 2 +- .../kernels/ir/vision/rand_augment_ir.h | 2 +- .../ir/vision/random_adjust_sharpness_ir.h | 2 +- .../kernels/ir/vision/random_affine_ir.h | 2 +- .../ir/vision/random_auto_contrast_ir.h | 2 +- .../ir/vision/random_color_adjust_ir.h | 2 +- .../kernels/ir/vision/random_color_ir.h | 2 +- .../ir/vision/random_crop_decode_resize_ir.h | 2 +- .../kernels/ir/vision/random_crop_ir.h | 2 +- .../ir/vision/random_crop_with_bbox_ir.h | 2 +- .../kernels/ir/vision/random_equalize_ir.h | 2 +- .../ir/vision/random_horizontal_flip_ir.h | 2 +- .../random_horizontal_flip_with_bbox_ir.h | 2 +- .../kernels/ir/vision/random_invert_ir.h | 2 +- .../kernels/ir/vision/random_lighting_ir.h | 2 +- .../kernels/ir/vision/random_posterize_ir.h | 2 +- .../kernels/ir/vision/random_resize_ir.h | 2 +- .../ir/vision/random_resize_with_bbox_ir.h | 2 +- .../ir/vision/random_resized_crop_ir.h | 2 +- .../vision/random_resized_crop_with_bbox_ir.h | 2 +- .../kernels/ir/vision/random_rotation_ir.h | 2 +- .../ir/vision/random_select_subpolicy_ir.h | 2 +- .../kernels/ir/vision/random_sharpness_ir.h | 2 +- .../kernels/ir/vision/random_solarize_ir.h | 2 +- .../ir/vision/random_vertical_flip_ir.h | 2 +- .../random_vertical_flip_with_bbox_ir.h | 2 +- .../dataset/kernels/ir/vision/rescale_ir.h | 2 +- .../dataset/kernels/ir/vision/resize_ir.h | 2 +- .../kernels/ir/vision/resize_preserve_ar_ir.h | 2 +- .../kernels/ir/vision/resize_with_bbox_ir.h | 2 +- .../kernels/ir/vision/resized_crop_ir.h | 2 +- .../dataset/kernels/ir/vision/rgb_to_bgr_ir.h | 2 +- .../kernels/ir/vision/rgb_to_gray_ir.h | 2 +- .../kernels/ir/vision/rgba_to_bgr_ir.h | 2 +- .../kernels/ir/vision/rgba_to_rgb_ir.h | 2 +- .../dataset/kernels/ir/vision/rotate_ir.h | 2 +- .../kernels/ir/vision/slice_patches_ir.h | 2 +- .../dataset/kernels/ir/vision/solarize_ir.h | 2 +- .../kernels/ir/vision/swap_red_blue_ir.h | 2 +- .../dataset/kernels/ir/vision/to_tensor_ir.h | 2 +- .../ir/vision/trivial_augment_wide_ir.h | 2 +- .../kernels/ir/vision/uniform_aug_ir.h | 2 +- .../kernels/ir/vision/vertical_flip_ir.h | 2 +- .../dataset/liteapi/include/datasets.h | 4 +- .../minddata/dataset/util/md_log_adapter.h | 2 +- mindspore-lite/minddata/dataset/util/status.h | 2 +- mindspore-lite/minddata/example/testlenet.cpp | 2 +- .../minddata/example/testlitecv.cpp | 2 +- .../minddata/example/testresize.cpp | 2 +- mindspore-lite/minddata/wrapper/MDToDApi.cc | 2 +- .../providers/dpico/common/infer_util.h | 50 +++ .../dpico/manager/acl_model_helper.h | 53 ++++ .../dpico/manager/acl_model_manager.h | 92 ++++++ .../providers/dpico/src/custom_allocator.h | 76 +++++ .../providers/dpico/src/custom_fp32.cc | 297 ++++++++++++++++++ .../providers/dpico/src/custom_fp32.h | 59 ++++ .../providers/nnie/src/custom_allocator.h | 47 +++ .../providers/nnie/src/custom_fp32.h | 71 +++++ .../providers/nnie/src/custom_infer.cc | 166 ++++++++++ .../providers/nnie/src/nnie_cfg_parser.h | 57 ++++ .../providers/nnie/src/nnie_manager.h | 117 +++++++ .../providers/nnie_proposal/src/proposal.h | 93 ++++++ .../nnie_proposal/src/proposal_fp32.h | 50 +++ .../nnie_proposal/src/proposal_infer.cc | 72 +++++ mindspore-lite/python/src/common_pybind.h | 2 +- mindspore-lite/python/src/context_pybind.cc | 2 +- mindspore-lite/python/src/model_pybind.cc | 6 +- mindspore-lite/python/src/pybind_module.cc | 2 +- mindspore-lite/python/src/tensor_pybind.cc | 6 +- mindspore-lite/src/CMakeLists.txt | 2 +- mindspore-lite/src/common/config_infos.h | 2 +- mindspore-lite/src/common/context_util.h | 2 +- mindspore-lite/src/common/prim_util.h | 2 +- .../src/common/random_data_generator.h | 2 +- mindspore-lite/src/common/tensor_util.h | 2 +- mindspore-lite/src/common/thread_utils.h | 2 +- mindspore-lite/src/executor/kernel_exec.h | 4 +- .../src/extendrt/convert/runtime_convert.h | 2 +- mindspore-lite/src/extendrt/cxx_api/cell.cc | 6 +- .../src/extendrt/cxx_api/context.cc | 4 +- mindspore-lite/src/extendrt/cxx_api/context.h | 4 +- mindspore-lite/src/extendrt/cxx_api/dlutils.h | 2 +- .../src/extendrt/cxx_api/file_utils.h | 2 +- .../src/extendrt/cxx_api/graph/graph.cc | 2 +- .../src/extendrt/cxx_api/graph/graph_data.h | 4 +- .../src/extendrt/cxx_api/graph/graph_impl.h | 4 +- .../src/extendrt/cxx_api/model/model.cc | 4 +- .../src/extendrt/cxx_api/model/model_group.cc | 8 +- .../cxx_api/model/model_group_impl.cc | 4 +- .../extendrt/cxx_api/model/model_group_impl.h | 4 +- .../src/extendrt/cxx_api/model/model_impl.cc | 2 +- .../src/extendrt/cxx_api/model/model_impl.h | 10 +- .../cxx_api/model/multi_model_runner.cc | 6 +- .../model_pool/model_parallel_runner.cc | 2 +- .../model_pool/model_parallel_runner_impl.h | 2 +- .../extendrt/cxx_api/model_pool/model_pool.h | 6 +- .../cxx_api/model_pool/model_worker.h | 2 +- .../cxx_api/model_pool/predict_task_queue.h | 4 +- .../cxx_api/model_pool/resource_manager.cc | 2 +- .../cxx_api/model_pool/resource_manager.h | 2 +- .../cxx_api/model_pool/runner_config.h | 2 +- .../src/extendrt/cxx_api/serialization.cc | 2 +- .../delegate/ascend_acl/acl_allocator.h | 2 +- .../delegate/ascend_acl/acl_env_guard.h | 2 +- .../delegate/ascend_acl/acl_graph_executor.h | 6 +- .../delegate/ascend_acl/acl_plugin_impl.h | 2 +- .../ascend_acl/ascend_allocator_plugin.h | 2 +- .../delegate/ascend_acl/dyn_shape_process.h | 2 +- .../delegate/ascend_acl/model_infer.h | 2 +- .../delegate/ascend_acl/model_process.h | 4 +- .../delegate/ascend_ge/aoe_api_tune_process.h | 2 +- .../delegate/ascend_ge/ge_device_context.cc | 4 +- .../delegate/ascend_ge/ge_device_context.h | 4 +- .../delegate/ascend_ge/ge_dynamic_utils.h | 2 +- .../delegate/ascend_ge/ge_graph_executor.h | 2 +- .../delegate/ascend_ge/ge_plugin_impl.h | 2 +- .../src/extendrt/delegate/factory.h | 2 +- .../litert/func_graph_reuse_manager.h | 2 +- .../graph_executor/litert/graph_executor.h | 2 +- .../litert/litert_plugin_impl.h | 2 +- .../plugin/ascend_acl_executor_plugin.h | 4 +- .../plugin/ascend_ge_executor_plugin.h | 4 +- .../delegate/plugin/litert_executor_plugin.h | 2 +- .../src/extendrt/delegate_graph_executor.h | 2 +- .../src/extendrt/dynamic_mem_allocator.h | 2 +- mindspore-lite/src/extendrt/graph_scheduler.h | 8 +- mindspore-lite/src/extendrt/infer_session.h | 8 +- .../extendrt/mindir_loader/abstract_kernel.h | 2 +- .../mindir_loader/mindir_model/inner_kernel.h | 2 +- .../mindir_model/mindir_model_util.h | 2 +- .../extendrt/mock/lite_runtime/converters.h | 6 +- mindspore-lite/src/extendrt/model_manager.cc | 2 +- mindspore-lite/src/extendrt/model_manager.h | 2 +- mindspore-lite/src/extendrt/session/factory.h | 2 +- .../extendrt/session/lite_graph_executor.h | 4 +- .../src/extendrt/utils/func_graph_utils.h | 6 +- .../src/extendrt/utils/serialization.cc | 2 +- .../src/extendrt/utils/serialization.h | 10 +- .../src/extendrt/utils/tensor_default_impl.h | 2 +- .../src/extendrt/utils/tensor_utils.h | 2 +- mindspore-lite/src/infer/executor.h | 2 +- mindspore-lite/src/infer/graph_runtime.h | 2 +- mindspore-lite/src/litert/c_api/context_c.cc | 2 +- mindspore-lite/src/litert/c_api/model_c.cc | 6 +- mindspore-lite/src/litert/c_api/tensor_c.cc | 2 +- .../cxx_api/callback/callback_adapter.h | 2 +- .../src/litert/cxx_api/callback/ckpt_saver.cc | 2 +- .../litert/cxx_api/callback/loss_monitor.cc | 2 +- .../litert/cxx_api/callback/lr_scheduler.cc | 2 +- .../litert/cxx_api/callback/train_accuracy.cc | 2 +- mindspore-lite/src/litert/cxx_api/cell.cc | 6 +- mindspore-lite/src/litert/cxx_api/context.cc | 4 +- mindspore-lite/src/litert/cxx_api/context.h | 4 +- .../src/litert/cxx_api/converters.h | 6 +- .../src/litert/cxx_api/graph/graph.cc | 4 +- .../src/litert/cxx_api/graph/graph_data.h | 4 +- mindspore-lite/src/litert/cxx_api/kernel.cc | 2 +- .../kernel_executor/custom_om_infer.cc | 2 +- .../cxx_api/kernel_executor/kernel_executor.h | 6 +- .../cxx_api/kernel_executor/op_converter.h | 2 +- .../src/litert/cxx_api/metrics/accuracy.cc | 2 +- .../src/litert/cxx_api/metrics/metrics_impl.h | 2 +- .../src/litert/cxx_api/model/model.cc | 14 +- .../src/litert/cxx_api/model/model_group.cc | 8 +- .../litert/cxx_api/model/model_group_impl.cc | 4 +- .../litert/cxx_api/model/model_group_impl.h | 4 +- .../src/litert/cxx_api/model/model_impl.cc | 4 +- .../src/litert/cxx_api/model/model_impl.h | 6 +- .../src/litert/cxx_api/serialization.cc | 6 +- .../src/litert/cxx_api/tensor/tensor_impl.h | 4 +- .../src/litert/cxx_api/tensor_utils.h | 2 +- .../src/litert/cxx_api/train/converters.cc | 2 +- .../src/litert/cxx_api/train/model.cc | 6 +- .../src/litert/cxx_api/train/model_build.cc | 2 +- .../src/litert/cxx_api/train/model_impl.cc | 6 +- .../src/litert/cxx_api/train/train_support.cc | 10 +- mindspore-lite/src/litert/cxx_api/types.cc | 6 +- .../litert/delegate/coreml/coreml_delegate.h | 2 +- .../litert/delegate/coreml/coreml_executor.h | 49 +-- .../delegate/coreml/coreml_executor_wrapper.h | 2 +- .../src/litert/delegate/coreml/coreml_graph.h | 2 +- .../src/litert/delegate/coreml/op/coreml_op.h | 4 +- .../coreml/stub/coreml_delegate_stub.cc | 2 +- .../src/litert/delegate/delegate_utils.h | 2 +- .../litert/delegate/npu/npu_converter_utils.h | 4 +- .../src/litert/delegate/npu/npu_delegate.h | 2 +- .../src/litert/delegate/npu/npu_graph.h | 2 +- .../src/litert/delegate/npu/npu_subgraph.h | 2 +- .../src/litert/delegate/npu/op/npu_op.h | 4 +- .../litert/delegate/npu/transpose_kernel.h | 2 +- .../parameter_cache/cache_algorithm.h | 2 +- .../parameter_cache/embedding_cache.h | 6 +- .../parameter_cache/embedding_cache_manager.h | 6 +- .../parameter_cache/factory_mgr_base.h | 2 +- .../delegate/parameter_cache/lfu_cache.h | 2 +- .../parameter_cache/load_host_cache_model.h | 10 +- mindspore-lite/src/litert/infer_manager.h | 4 +- mindspore-lite/src/litert/inner_allocator.h | 2 +- .../cpu/base/group_convolution_creator.h | 2 +- mindspore-lite/src/litert/lite_kernel.h | 4 +- mindspore-lite/src/litert/lite_model.h | 2 +- mindspore-lite/src/litert/lite_session.h | 2 +- mindspore-lite/src/litert/runtime_allocator.h | 2 +- mindspore-lite/src/litert/runtime_convert.h | 2 +- mindspore-lite/src/litert/scheduler.h | 2 +- mindspore-lite/src/litert/thread_cost_model.h | 2 +- .../src/registry/kernel_interface_registry.cc | 2 +- mindspore-lite/src/tensor.h | 2 +- mindspore-lite/src/train/opt_allocator.h | 4 +- mindspore-lite/test/common/common_test.h | 2 +- .../st/cpp/check_deviceinfo_cpp/example.cc | 8 +- .../test/st/cpp/device_example_cpp/example.cc | 8 +- mindspore-lite/test/st/mix_data_type_test.cc | 2 +- .../test/st/multiple_device_test.cc | 2 +- .../test/ut/src/api/generic_api_test.cc | 4 +- .../test/ut/src/api/model_group_test.cc | 2 +- .../ut/src/api/model_parallel_runner_test.cc | 2 +- .../test/ut/src/dataset/eager_test.cc | 2 +- .../src/registry/registry_custom_op_test.cc | 4 +- .../registry/registry_gpu_custom_op_test.cc | 6 +- .../test/ut/src/registry/registry_test.cc | 4 +- .../runtime/kernel/arm/cxx_api/model_test.cc | 8 +- .../kernel/arm/cxx_api/serialization_test.cc | 2 +- .../runtime/kernel/dsp/custom/fft_tests.cc | 4 +- .../ut/src/runtime/runtime_convert_tests.cc | 4 +- .../tools/benchmark/benchmark_base.h | 4 +- .../tools/benchmark/benchmark_unified_api.h | 8 +- .../tools/benchmark_train/net_train.cc | 2 +- .../tools/benchmark_train/net_train.h | 8 +- .../tools/benchmark_train/net_train_base.cc | 2 +- .../tools/benchmark_train/net_train_base.h | 8 +- .../tools/benchmark_train/net_train_c_api.h | 8 +- .../tools/common/custom_ascend_utils.h | 6 +- mindspore-lite/tools/common/tensor_util.h | 2 +- .../converter/adapter/acl/common/acl_types.h | 4 +- .../adapter/acl/common/acl_types_utils.h | 4 +- .../acl/cxx_api_lite/cxx_api/any_utils.h | 4 +- .../acl/cxx_api_lite/cxx_api/context.cc | 2 +- .../acl/cxx_api_lite/cxx_api/dlutils.h | 2 +- .../graph/acl/acl_convert_init_adapter.h | 2 +- .../cxx_api_lite/cxx_api/graph/graph_data.h | 4 +- .../cxx_api/model/acl/acl_model_options.h | 6 +- .../cxx_api/model/acl/model_converter.h | 4 +- .../cxx_api/model/aoe/auto_tune_process.h | 2 +- .../acl/cxx_api_lite/cxx_api/serialization.cc | 2 +- .../converter/adapter/acl/src/acl_pass_impl.h | 2 +- .../adapter/dpico/common/format_utils.h | 2 +- .../adapter/dpico/common/infer_util.h | 2 +- .../adapter/dpico/mapper/bias_mapper.cc | 2 +- .../adapter/dpico/parser/parser_utils.h | 2 +- .../adapter/dpico/src/custom_creator.cc | 2 +- .../adapter/dpico/src/graph_split_api.cc | 2 +- .../adapter/dsp/infer/custom_common.h | 4 +- .../adapter/dsp/infer/custom_fft_infer.cc | 2 +- .../tools/converter/adapter/utils.cc | 4 +- mindspore-lite/tools/converter/converter.cc | 4 +- .../tools/converter/converter_funcgraph.cc | 2 +- .../converter_lite/converter_flags.h | 4 +- .../tools/converter/converter_lite/main.cc | 2 +- .../tools/converter/cxx_api/converter.cc | 2 +- .../converter/micro/coder/utils/type_cast.h | 2 +- .../converter/preprocess/image_preprocess.h | 2 +- .../tools/converter/quantizer/eigen_util.h | 2 +- .../tools/converter/quantizer/quantize_util.h | 2 +- .../tools/dataset/cropper/dependencies.txt | 2 +- .../tools/obfuscator/include/deobfuscator.h | 2 +- .../tools/optimizer/common/gllo_utils.h | 2 +- .../tools/optimizer/const_fold/fold_utils.h | 2 +- .../graph/input_data_type_trans_pass.h | 4 +- .../graph/specify_graph_input_format.h | 4 +- .../graph/specify_graph_output_format.h | 4 +- .../triton/backend/src/mslite_model_state.h | 4 +- .../triton/backend/src/mslite_utils.h | 2 +- 401 files changed, 1998 insertions(+), 691 deletions(-) rename include/{cxx_api => api}/allocator.h (98%) rename include/{cxx_api => api}/callback/callback.h (96%) rename include/{cxx_api => api}/callback/ckpt_saver.h (93%) rename include/{cxx_api => api}/callback/loss_monitor.h (95%) rename include/{cxx_api => api}/callback/lr_scheduler.h (97%) rename include/{cxx_api => api}/callback/time_monitor.h (96%) rename include/{cxx_api => api}/callback/train_accuracy.h (93%) rename include/{cxx_api => api}/cell.h (97%) rename include/{cxx_api => api}/cfg.h (96%) rename include/{cxx_api => api}/context.h (99%) rename include/{cxx_api => api}/data_type.h (100%) rename include/{cxx_api => api}/delegate.h (98%) rename include/{cxx_api => api}/delegate_api.h (97%) rename include/{cxx_api => api}/dual_abi_helper.h (100%) rename include/{cxx_api => api}/format.h (100%) rename include/{cxx_api => api}/graph.h (96%) rename include/{cxx_api => api}/kernel.h (95%) rename include/{cxx_api => api}/kernel_api.h (98%) rename include/{cxx_api => api}/metrics/accuracy.h (97%) rename include/{cxx_api => api}/metrics/metrics.h (97%) rename include/{cxx_api => api}/model.h (98%) rename include/{cxx_api => api}/model_group.h (95%) rename include/{cxx_api => api}/model_parallel_runner.h (99%) rename include/{cxx_api => api}/serialization.h (98%) rename include/{cxx_api => api}/status.h (99%) rename include/{cxx_api => api}/types.h (99%) rename include/{cxx_api => api}/visible.h (100%) create mode 100644 mindspore-lite/providers/dpico/common/infer_util.h create mode 100644 mindspore-lite/providers/dpico/manager/acl_model_helper.h create mode 100644 mindspore-lite/providers/dpico/manager/acl_model_manager.h create mode 100644 mindspore-lite/providers/dpico/src/custom_allocator.h create mode 100644 mindspore-lite/providers/dpico/src/custom_fp32.cc create mode 100644 mindspore-lite/providers/dpico/src/custom_fp32.h create mode 100644 mindspore-lite/providers/nnie/src/custom_allocator.h create mode 100644 mindspore-lite/providers/nnie/src/custom_fp32.h create mode 100644 mindspore-lite/providers/nnie/src/custom_infer.cc create mode 100644 mindspore-lite/providers/nnie/src/nnie_cfg_parser.h create mode 100644 mindspore-lite/providers/nnie/src/nnie_manager.h create mode 100644 mindspore-lite/providers/nnie_proposal/src/proposal.h create mode 100644 mindspore-lite/providers/nnie_proposal/src/proposal_fp32.h create mode 100644 mindspore-lite/providers/nnie_proposal/src/proposal_infer.cc diff --git a/.clang-format b/.clang-format index fb2799bc4..6bdaa7625 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,10 @@ --- +BasedOnStyle: LLVM +IndentWidth: 4 +--- +Language: ObjC +BasedOnStyle: LLVM +--- Language: Cpp # BasedOnStyle: Google AccessModifierOffset: -1 diff --git a/.jenkins/check/config/filter_cpplint.txt b/.jenkins/check/config/filter_cpplint.txt index 049574a3a..501b7f4d3 100644 --- a/.jenkins/check/config/filter_cpplint.txt +++ b/.jenkins/check/config/filter_cpplint.txt @@ -32,7 +32,7 @@ "mindspore-lite/mindspore-lite/src/litert/thread_pool.c" "runtime/int" "mindspore-lite/mindspore-lite/src/extendrt/delegate/ascend_acl/model_process.cc" "whitespace/newline" "mindspore-lite/mindspore-lite/src/extendrt/delegate/ascend_acl/model_infer.cc" "whitespace/indent_namespace" -"mindspore/mindspore/lite/src/litert/delegate/coreml/coreml_executor.h" "whitespace/parens" +"mindspore-lite/mindspore-lite/src/litert/delegate/coreml/coreml_executor.h" "whitespace/comments" # MindData "mindspore-lite/mindspore-lite/minddata/dataset/kernels/image/cutmix_batch_op.cc" "build/include_what_you_use" diff --git a/cmake/package_lite.cmake b/cmake/package_lite.cmake index 153c6272b..a7c5e91fb 100644 --- a/cmake/package_lite.cmake +++ b/cmake/package_lite.cmake @@ -401,7 +401,7 @@ if(PLATFORM_ARM64) install(FILES ${BUILD_DIR}/src/extendrt/delegate/tensorrt/libtensorrt_plugin.so DESTINATION ${RUNTIME_LIB_DIR} COMPONENT ${RUNTIME_COMPONENT_NAME}) endif() - install(DIRECTORY ${TOP_DIR}/mindspore-lite/include/cxx_api/ DESTINATION ${RUNTIME_INC_DIR}/cxx_api + install(DIRECTORY ${TOP_DIR}/mindspore-lite/include/api DESTINATION ${RUNTIME_INC_DIR}/api COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") else() install(FILES ${BUILD_DIR}/src/${MINDSPORE_LITE_LIB_NAME}.so DESTINATION ${RUNTIME_LIB_DIR} @@ -426,7 +426,7 @@ if(PLATFORM_ARM64) ${TOP_DIR}/mindspore/mindspore/core/include/mindapi/base/macros.h DESTINATION ${RUNTIME_INC_DIR}/mindapi/base COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(DIRECTORY ${TOP_DIR}/include/cxx_api/ DESTINATION ${RUNTIME_INC_DIR}/cxx_api + install(DIRECTORY ${TOP_DIR}/include/api/ DESTINATION ${RUNTIME_INC_DIR}/api COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "ops*" EXCLUDE) install(DIRECTORY ${TOP_DIR}/include/c_api/ DESTINATION ${RUNTIME_INC_DIR}/c_api COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") @@ -471,7 +471,7 @@ if(PLATFORM_ARM64) install(DIRECTORY ${TOP_DIR}/mindspore-lite/include/registry/ DESTINATION ${CONVERTER_ROOT_DIR}/include/registry COMPONENT ${RUNTIME_COMPONENT_NAME} PATTERN "opencl_runtime_wrapper.h" EXCLUDE) - install(FILES ${API_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/cxx_api + install(FILES ${API_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/api COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${MINDAPI_BASE_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/mindapi/base COMPONENT ${RUNTIME_COMPONENT_NAME}) @@ -680,7 +680,7 @@ elseif(PLATFORM_ARM32) ${TOP_DIR}/mindspore/mindspore/core/include/mindapi/base/macros.h DESTINATION ${RUNTIME_INC_DIR}/mindapi/base COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(DIRECTORY ${TOP_DIR}/include/cxx_api/ DESTINATION ${RUNTIME_INC_DIR}/cxx_api + install(DIRECTORY ${TOP_DIR}/include/api/ DESTINATION ${RUNTIME_INC_DIR}/api COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "ops*" EXCLUDE) install(DIRECTORY ${TOP_DIR}/include/c_api/ DESTINATION ${RUNTIME_INC_DIR}/c_api COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") @@ -778,7 +778,7 @@ elseif(WIN32) ${TOP_DIR}/mindspore/mindspore/core/include/mindapi/base/macros.h DESTINATION ${RUNTIME_INC_DIR}/mindapi/base COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(DIRECTORY ${TOP_DIR}/include/cxx_api/ DESTINATION ${RUNTIME_INC_DIR}/cxx_api + install(DIRECTORY ${TOP_DIR}/include/api/ DESTINATION ${RUNTIME_INC_DIR}/api COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "ops*" EXCLUDE) install(DIRECTORY ${TOP_DIR}/include/c_api/ DESTINATION ${RUNTIME_INC_DIR}/c_api COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") @@ -829,12 +829,12 @@ else() ${TOP_DIR}/mindspore/mindspore/core/include/mindapi/base/macros.h DESTINATION ${RUNTIME_INC_DIR}/mindapi/base COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(DIRECTORY ${TOP_DIR}/include/cxx_api/ DESTINATION ${RUNTIME_INC_DIR}/cxx_api + install(DIRECTORY ${TOP_DIR}/include/api/ DESTINATION ${RUNTIME_INC_DIR}/api COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "ops*" EXCLUDE) install(DIRECTORY ${TOP_DIR}/include/c_api/ DESTINATION ${RUNTIME_INC_DIR}/c_api COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") if(MSLITE_ENABLE_CLOUD_FUSION_INFERENCE OR MSLITE_ENABLE_CLOUD_INFERENCE) - install(DIRECTORY ${TOP_DIR}/mindspore-lite/include/cxx_api/ DESTINATION ${RUNTIME_INC_DIR}/cxx_api + install(DIRECTORY ${TOP_DIR}/mindspore-lite/include/api/ DESTINATION ${RUNTIME_INC_DIR}/api COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") install(FILES ${BUILD_DIR}/src/extendrt/${MINDSPORE_LITE_EXTENDRT_LIB_NAME}.so DESTINATION ${RUNTIME_LIB_DIR} COMPONENT ${RUNTIME_COMPONENT_NAME}) @@ -900,7 +900,7 @@ else() install(DIRECTORY ${TOP_DIR}/mindspore-lite/include/registry/ DESTINATION ${CONVERTER_ROOT_DIR}/include/registry COMPONENT ${RUNTIME_COMPONENT_NAME} PATTERN "opencl_runtime_wrapper.h" EXCLUDE) - install(FILES ${API_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/cxx_api + install(FILES ${API_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/api COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${MINDAPI_BASE_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/mindapi/base COMPONENT ${RUNTIME_COMPONENT_NAME}) @@ -1065,7 +1065,7 @@ if(MSLITE_ENABLE_KERNEL_EXECUTOR) DESTINATION ${RUNTIME_INC_DIR}/mindapi/ir COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${TOP_DIR}/mindspore-lite/src/litert/cxx_api/kernel_executor/kernel_executor.h DESTINATION - ${RUNTIME_INC_DIR}/cxx_api COMPONENT ${RUNTIME_COMPONENT_NAME}) + ${RUNTIME_INC_DIR}/api COMPONENT ${RUNTIME_COMPONENT_NAME}) install(TARGETS kernel_executor DESTINATION ${RUNTIME_LIB_DIR} COMPONENT ${RUNTIME_COMPONENT_NAME}) install(TARGETS mindspore_core mindspore_ops DESTINATION ${RUNTIME_LIB_DIR} COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${glog_LIBPATH}/${glog_name} DESTINATION ${RUNTIME_LIB_DIR} diff --git a/include/cxx_api/allocator.h b/include/api/allocator.h similarity index 98% rename from include/cxx_api/allocator.h rename to include/api/allocator.h index 5f82f43b1..ee0eb7920 100644 --- a/include/cxx_api/allocator.h +++ b/include/api/allocator.h @@ -18,7 +18,7 @@ #define MINDSPORE_INCLUDE_API_ALLOCATOR_H #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" namespace mindspore { /// \brief Allocator defined a memory pool for malloc memory and free memory dynamically. diff --git a/include/cxx_api/callback/callback.h b/include/api/callback/callback.h similarity index 96% rename from include/cxx_api/callback/callback.h rename to include/api/callback/callback.h index fc58d66dd..80bd4f46d 100644 --- a/include/cxx_api/callback/callback.h +++ b/include/api/callback/callback.h @@ -21,9 +21,9 @@ #include #include #include -#include "include/cxx_api/data_type.h" -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/types.h" +#include "include/api/data_type.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/types.h" namespace mindspore { class Model; diff --git a/include/cxx_api/callback/ckpt_saver.h b/include/api/callback/ckpt_saver.h similarity index 93% rename from include/cxx_api/callback/ckpt_saver.h rename to include/api/callback/ckpt_saver.h index 1840a2537..75cd8442b 100644 --- a/include/cxx_api/callback/ckpt_saver.h +++ b/include/api/callback/ckpt_saver.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/callback/callback.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/callback/callback.h" +#include "include/api/dual_abi_helper.h" namespace mindspore { diff --git a/include/cxx_api/callback/loss_monitor.h b/include/api/callback/loss_monitor.h similarity index 95% rename from include/cxx_api/callback/loss_monitor.h rename to include/api/callback/loss_monitor.h index ea65bf3e6..19b4cc7a0 100644 --- a/include/cxx_api/callback/loss_monitor.h +++ b/include/api/callback/loss_monitor.h @@ -19,7 +19,7 @@ #include #include #include -#include "include/cxx_api/callback/callback.h" +#include "include/api/callback/callback.h" namespace mindspore { diff --git a/include/cxx_api/callback/lr_scheduler.h b/include/api/callback/lr_scheduler.h similarity index 97% rename from include/cxx_api/callback/lr_scheduler.h rename to include/api/callback/lr_scheduler.h index 791f4d327..7456bfff3 100644 --- a/include/cxx_api/callback/lr_scheduler.h +++ b/include/api/callback/lr_scheduler.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/callback/callback.h" +#include "include/api/callback/callback.h" namespace mindspore { diff --git a/include/cxx_api/callback/time_monitor.h b/include/api/callback/time_monitor.h similarity index 96% rename from include/cxx_api/callback/time_monitor.h rename to include/api/callback/time_monitor.h index 8a2f60893..ebb1005b9 100644 --- a/include/cxx_api/callback/time_monitor.h +++ b/include/api/callback/time_monitor.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/callback/callback.h" +#include "include/api/callback/callback.h" namespace mindspore { diff --git a/include/cxx_api/callback/train_accuracy.h b/include/api/callback/train_accuracy.h similarity index 93% rename from include/cxx_api/callback/train_accuracy.h rename to include/api/callback/train_accuracy.h index b7a5b384c..506f738dc 100644 --- a/include/cxx_api/callback/train_accuracy.h +++ b/include/api/callback/train_accuracy.h @@ -21,8 +21,8 @@ #include #include #include -#include "include/cxx_api/callback/callback.h" -#include "include/cxx_api/metrics/accuracy.h" +#include "include/api/callback/callback.h" +#include "include/api/metrics/accuracy.h" namespace mindspore { diff --git a/include/cxx_api/cell.h b/include/api/cell.h similarity index 97% rename from include/cxx_api/cell.h rename to include/api/cell.h index b3e4412b2..1206565b7 100644 --- a/include/cxx_api/cell.h +++ b/include/api/cell.h @@ -19,9 +19,9 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/graph.h" +#include "include/api/status.h" +#include "include/api/types.h" +#include "include/api/graph.h" namespace mindspore { class InputAndOutput; diff --git a/include/cxx_api/cfg.h b/include/api/cfg.h similarity index 96% rename from include/cxx_api/cfg.h rename to include/api/cfg.h index 395680fe0..5bb8e9217 100644 --- a/include/cxx_api/cfg.h +++ b/include/api/cfg.h @@ -20,9 +20,9 @@ #include #include #include -#include "include/cxx_api/data_type.h" -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/types.h" +#include "include/api/data_type.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/types.h" namespace mindspore { constexpr int iter_th = 1000; diff --git a/include/cxx_api/context.h b/include/api/context.h similarity index 99% rename from include/cxx_api/context.h rename to include/api/context.h index 425fc87c6..0f10294c5 100644 --- a/include/cxx_api/context.h +++ b/include/api/context.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/types.h" +#include "include/api/dual_abi_helper.h" namespace mindspore { enum DelegateMode { diff --git a/include/cxx_api/data_type.h b/include/api/data_type.h similarity index 100% rename from include/cxx_api/data_type.h rename to include/api/data_type.h diff --git a/include/cxx_api/delegate.h b/include/api/delegate.h similarity index 98% rename from include/cxx_api/delegate.h rename to include/api/delegate.h index 2c87b9917..0794b45e1 100644 --- a/include/cxx_api/delegate.h +++ b/include/api/delegate.h @@ -23,8 +23,8 @@ #include #include #include "schema/model_generated.h" -#include "include/cxx_api/kernel.h" -#include "include/cxx_api/delegate_api.h" +#include "include/api/kernel.h" +#include "include/api/delegate_api.h" namespace mindspore { typedef enum { diff --git a/include/cxx_api/delegate_api.h b/include/api/delegate_api.h similarity index 97% rename from include/cxx_api/delegate_api.h rename to include/api/delegate_api.h index a8b3515cf..247d550d0 100644 --- a/include/cxx_api/delegate_api.h +++ b/include/api/delegate_api.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/status.h" +#include "include/api/types.h" namespace mindspore { class AbstractDelegate { public: diff --git a/include/cxx_api/dual_abi_helper.h b/include/api/dual_abi_helper.h similarity index 100% rename from include/cxx_api/dual_abi_helper.h rename to include/api/dual_abi_helper.h diff --git a/include/cxx_api/format.h b/include/api/format.h similarity index 100% rename from include/cxx_api/format.h rename to include/api/format.h diff --git a/include/cxx_api/graph.h b/include/api/graph.h similarity index 96% rename from include/cxx_api/graph.h rename to include/api/graph.h index 542e7cbee..7a9079e2e 100644 --- a/include/cxx_api/graph.h +++ b/include/api/graph.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/status.h" +#include "include/api/types.h" namespace mindspore { class MS_API Graph { diff --git a/include/cxx_api/kernel.h b/include/api/kernel.h similarity index 95% rename from include/cxx_api/kernel.h rename to include/api/kernel.h index 93daf7673..f66c577e1 100644 --- a/include/cxx_api/kernel.h +++ b/include/api/kernel.h @@ -21,9 +21,9 @@ #include #include #include "schema/model_generated.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/kernel_api.h" +#include "include/api/types.h" +#include "include/api/context.h" +#include "include/api/kernel_api.h" namespace mindspore::kernel { class MS_API Kernel : public IKernel { diff --git a/include/cxx_api/kernel_api.h b/include/api/kernel_api.h similarity index 98% rename from include/cxx_api/kernel_api.h rename to include/api/kernel_api.h index 35b463c16..88ce9081c 100644 --- a/include/cxx_api/kernel_api.h +++ b/include/api/kernel_api.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" +#include "include/api/types.h" +#include "include/api/status.h" namespace mindspore { class Context; namespace kernel { diff --git a/include/cxx_api/metrics/accuracy.h b/include/api/metrics/accuracy.h similarity index 97% rename from include/cxx_api/metrics/accuracy.h rename to include/api/metrics/accuracy.h index 7ad46ea8e..eed9dd42e 100644 --- a/include/cxx_api/metrics/accuracy.h +++ b/include/api/metrics/accuracy.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_INCLUDE_API_METRICS_ACCURACY_H #define MINDSPORE_INCLUDE_API_METRICS_ACCURACY_H #include -#include "include/cxx_api/metrics/metrics.h" +#include "include/api/metrics/metrics.h" namespace mindspore { diff --git a/include/cxx_api/metrics/metrics.h b/include/api/metrics/metrics.h similarity index 97% rename from include/cxx_api/metrics/metrics.h rename to include/api/metrics/metrics.h index 61f718528..fcc59d731 100644 --- a/include/cxx_api/metrics/metrics.h +++ b/include/api/metrics/metrics.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_INCLUDE_API_METRICS_METRICS_H #define MINDSPORE_INCLUDE_API_METRICS_METRICS_H #include -#include "include/cxx_api/model.h" +#include "include/api/model.h" namespace mindspore { diff --git a/include/cxx_api/model.h b/include/api/model.h similarity index 98% rename from include/cxx_api/model.h rename to include/api/model.h index 458a766b1..d92c04b37 100644 --- a/include/cxx_api/model.h +++ b/include/api/model.h @@ -21,14 +21,14 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/graph.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/callback/callback.h" -#include "include/cxx_api/cell.h" -#include "include/cxx_api/cfg.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/status.h" +#include "include/api/types.h" +#include "include/api/graph.h" +#include "include/api/context.h" +#include "include/api/callback/callback.h" +#include "include/api/cell.h" +#include "include/api/cfg.h" +#include "include/api/dual_abi_helper.h" namespace mindspore { class ModelImpl; diff --git a/include/cxx_api/model_group.h b/include/api/model_group.h similarity index 95% rename from include/cxx_api/model_group.h rename to include/api/model_group.h index 3347f7bd4..ddfafe4f0 100755 --- a/include/cxx_api/model_group.h +++ b/include/api/model_group.h @@ -21,10 +21,10 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" +#include "include/api/model.h" +#include "include/api/status.h" +#include "include/api/types.h" +#include "include/api/context.h" namespace mindspore { class ModelGroupImpl; diff --git a/include/cxx_api/model_parallel_runner.h b/include/api/model_parallel_runner.h similarity index 99% rename from include/cxx_api/model_parallel_runner.h rename to include/api/model_parallel_runner.h index 05ba3702d..3c3c2a3cf 100644 --- a/include/cxx_api/model_parallel_runner.h +++ b/include/api/model_parallel_runner.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/context.h" +#include "include/api/status.h" +#include "include/api/context.h" namespace mindspore { /// \brief The RunnerConfig class is used to store environment variables during execution /// management. diff --git a/include/cxx_api/serialization.h b/include/api/serialization.h similarity index 98% rename from include/cxx_api/serialization.h rename to include/api/serialization.h index e534e834b..7045003ff 100644 --- a/include/cxx_api/serialization.h +++ b/include/api/serialization.h @@ -20,11 +20,11 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/graph.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/status.h" +#include "include/api/types.h" +#include "include/api/model.h" +#include "include/api/graph.h" +#include "include/api/dual_abi_helper.h" namespace mindspore { /// \brief The Serialization class is used to summarize methods for reading and writing model files. diff --git a/include/cxx_api/status.h b/include/api/status.h similarity index 99% rename from include/cxx_api/status.h rename to include/api/status.h index 7730b734c..c20094ff1 100644 --- a/include/cxx_api/status.h +++ b/include/api/status.h @@ -21,8 +21,8 @@ #include #include #include -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/visible.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/visible.h" namespace mindspore { enum CompCode : uint32_t { kCore = 0x00000000u, diff --git a/include/cxx_api/types.h b/include/api/types.h similarity index 99% rename from include/cxx_api/types.h rename to include/api/types.h index 7fde23ce8..25eb1ebff 100644 --- a/include/cxx_api/types.h +++ b/include/api/types.h @@ -21,10 +21,10 @@ #include #include #include -#include "include/cxx_api/data_type.h" -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/format.h" -#include "include/cxx_api/visible.h" +#include "include/api/data_type.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/format.h" +#include "include/api/visible.h" namespace mindspore { enum ModelType : uint32_t { diff --git a/include/cxx_api/visible.h b/include/api/visible.h similarity index 100% rename from include/cxx_api/visible.h rename to include/api/visible.h diff --git a/mindspore-lite/cmake/file_list.cmake b/mindspore-lite/cmake/file_list.cmake index 929fe9411..2031aa7f9 100644 --- a/mindspore-lite/cmake/file_list.cmake +++ b/mindspore-lite/cmake/file_list.cmake @@ -1,10 +1,10 @@ set(API_HEADER - ${TOP_DIR}/include/cxx_api/data_type.h - ${TOP_DIR}/include/cxx_api/dual_abi_helper.h - ${TOP_DIR}/include/cxx_api/format.h - ${TOP_DIR}/include/cxx_api/status.h - ${TOP_DIR}/include/cxx_api/types.h - ${TOP_DIR}/include/cxx_api/visible.h + ${TOP_DIR}/include/api/data_type.h + ${TOP_DIR}/include/api/dual_abi_helper.h + ${TOP_DIR}/include/api/format.h + ${TOP_DIR}/include/api/status.h + ${TOP_DIR}/include/api/types.h + ${TOP_DIR}/include/api/visible.h ) set(ABSTRACT_HEADER diff --git a/mindspore-lite/examples/cloud_infer/ascend_ge_distributed_cpp/main.cc b/mindspore-lite/examples/cloud_infer/ascend_ge_distributed_cpp/main.cc index 6830e11eb..528b75788 100644 --- a/mindspore-lite/examples/cloud_infer/ascend_ge_distributed_cpp/main.cc +++ b/mindspore-lite/examples/cloud_infer/ascend_ge_distributed_cpp/main.cc @@ -20,10 +20,10 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/types.h" constexpr int kMaxDeviceNum = 7; diff --git a/mindspore-lite/examples/cloud_infer/ascend_model_group_cpp/main.cc b/mindspore-lite/examples/cloud_infer/ascend_model_group_cpp/main.cc index ed5d8df85..c3a5826f6 100644 --- a/mindspore-lite/examples/cloud_infer/ascend_model_group_cpp/main.cc +++ b/mindspore-lite/examples/cloud_infer/ascend_model_group_cpp/main.cc @@ -22,11 +22,11 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/model_group.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/types.h" +#include "include/api/model_group.h" struct ThreadArgs { std::vector model_paths; diff --git a/mindspore-lite/examples/cloud_infer/quick_start_cpp/main.cc b/mindspore-lite/examples/cloud_infer/quick_start_cpp/main.cc index 0dd7189f0..3edfd82de 100644 --- a/mindspore-lite/examples/cloud_infer/quick_start_cpp/main.cc +++ b/mindspore-lite/examples/cloud_infer/quick_start_cpp/main.cc @@ -20,10 +20,10 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/types.h" template void GenerateRandomData(int size, void *data, Distribution distribution) { diff --git a/mindspore-lite/examples/cloud_infer/quick_start_parallel_cpp/main.cc b/mindspore-lite/examples/cloud_infer/quick_start_parallel_cpp/main.cc index c62f60a41..8d357c603 100644 --- a/mindspore-lite/examples/cloud_infer/quick_start_parallel_cpp/main.cc +++ b/mindspore-lite/examples/cloud_infer/quick_start_parallel_cpp/main.cc @@ -20,10 +20,10 @@ #include #include #include -#include "include/cxx_api/model_parallel_runner.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/model_parallel_runner.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/types.h" namespace { constexpr int kNumPrintOfOutData = 50; constexpr int kNumWorkers = 2; diff --git a/mindspore-lite/examples/cloud_infer/runtime_cpp/main.cc b/mindspore-lite/examples/cloud_infer/runtime_cpp/main.cc index 009ba6a61..574118f5f 100644 --- a/mindspore-lite/examples/cloud_infer/runtime_cpp/main.cc +++ b/mindspore-lite/examples/cloud_infer/runtime_cpp/main.cc @@ -22,9 +22,9 @@ #include #include #include "./flags.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/types.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/types.h" void Usage() { std::cerr << "Usage: ./runtime_cpp --model_path=[model_path] --device_type=[device_type] --device_id=[device_id]" diff --git a/mindspore-lite/examples/converter_extend/infer/custom_common.h b/mindspore-lite/examples/converter_extend/infer/custom_common.h index 37caca175..5f78622b0 100644 --- a/mindspore-lite/examples/converter_extend/infer/custom_common.h +++ b/mindspore-lite/examples/converter_extend/infer/custom_common.h @@ -18,8 +18,8 @@ #define MINDSPORE_LITE_EXAMPLES_CONVERTER_EXTEND_INFER_CUSTOM_COMMON_H #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" +#include "include/api/types.h" +#include "include/api/status.h" namespace mindspore { namespace common { diff --git a/mindspore-lite/examples/quick_start_cpp/main.cc b/mindspore-lite/examples/quick_start_cpp/main.cc index 8b1f111f8..fe07393d7 100644 --- a/mindspore-lite/examples/quick_start_cpp/main.cc +++ b/mindspore-lite/examples/quick_start_cpp/main.cc @@ -20,10 +20,10 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/types.h" namespace { constexpr int kNumPrintOfOutData = 50; } @@ -129,14 +129,14 @@ int QuickStart(int argc, const char **argv) { // Create and init context, add CPU device info auto context = std::make_shared(); if (context == nullptr) { - delete[](model_buf); + delete[] (model_buf); std::cerr << "New context failed." << std::endl; return -1; } auto &device_list = context->MutableDeviceInfo(); auto device_info = std::make_shared(); if (device_info == nullptr) { - delete[](model_buf); + delete[] (model_buf); std::cerr << "New CPUDeviceInfo failed." << std::endl; return -1; } @@ -145,13 +145,13 @@ int QuickStart(int argc, const char **argv) { // Create model auto model = new (std::nothrow) mindspore::Model(); if (model == nullptr) { - delete[](model_buf); + delete[] (model_buf); std::cerr << "New Model failed." << std::endl; return -1; } // Build model auto build_ret = model->Build(model_buf, size, mindspore::kMindIR, context); - delete[](model_buf); + delete[] (model_buf); if (build_ret != mindspore::kSuccess) { delete model; std::cerr << "Build model error " << build_ret << std::endl; diff --git a/mindspore-lite/examples/runtime_cpp/main.cc b/mindspore-lite/examples/runtime_cpp/main.cc index 5ab51047f..d0d93847f 100644 --- a/mindspore-lite/examples/runtime_cpp/main.cc +++ b/mindspore-lite/examples/runtime_cpp/main.cc @@ -20,11 +20,11 @@ #include #include #include -#include "include/cxx_api/allocator.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/serialization.h" +#include "include/api/allocator.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/types.h" +#include "include/api/serialization.h" std::string RealPath(const char *path) { const size_t max = 4096; @@ -337,7 +337,7 @@ int Run(const char *model_path) { // Create and Build MindSpore model. auto model = CreateAndBuildModel(model_buf, size); - delete[](model_buf); + delete[] (model_buf); if (model == nullptr) { std::cerr << "Create and build model failed." << std::endl; return -1; @@ -381,7 +381,7 @@ int RunResize(const char *model_path) { // Create and Build MindSpore model. auto model = CreateAndBuildModel(model_buf, size); - delete[](model_buf); + delete[] (model_buf); if (model == nullptr) { std::cerr << "Create and build model failed." << std::endl; return -1; @@ -433,7 +433,7 @@ int RunCreateModelComplicated(const char *model_path) { // Create and Build MindSpore model. auto model = CreateAndBuildModelComplicated(model_buf, size); - delete[](model_buf); + delete[] (model_buf); if (model == nullptr) { std::cerr << "Create and build model failed." << std::endl; return -1; @@ -478,7 +478,7 @@ int RunModelParallel(const char *model_path) { // Create and Build MindSpore model. auto model1 = CreateAndBuildModel(model_buf, size); auto model2 = CreateAndBuildModel(model_buf, size); - delete[](model_buf); + delete[] (model_buf); if (model1 == nullptr || model2 == nullptr) { std::cerr << "Create and build model failed." << std::endl; return -1; @@ -558,13 +558,13 @@ int RunWithSharedMemoryPool(const char *model_path) { auto model1 = new (std::nothrow) mindspore::Model(); if (model1 == nullptr) { - delete[](model_buf); + delete[] (model_buf); std::cerr << "New Model failed." << std::endl; return -1; } auto build_ret = model1->Build(model_buf, size, mindspore::kMindIR, context1); if (build_ret != mindspore::kSuccess) { - delete[](model_buf); + delete[] (model_buf); delete model1; std::cerr << "Build model failed." << std::endl; return -1; @@ -572,7 +572,7 @@ int RunWithSharedMemoryPool(const char *model_path) { auto context2 = std::make_shared(); if (context2 == nullptr) { - delete[](model_buf); + delete[] (model_buf); delete model1; std::cerr << "New context failed." << std::endl; return -1; @@ -580,7 +580,7 @@ int RunWithSharedMemoryPool(const char *model_path) { auto &device_list2 = context2->MutableDeviceInfo(); auto device_info2 = CreateCPUDeviceInfo(); if (device_info2 == nullptr) { - delete[](model_buf); + delete[] (model_buf); delete model1; std::cerr << "Create CPUDeviceInfo failed." << std::endl; return -1; @@ -591,13 +591,13 @@ int RunWithSharedMemoryPool(const char *model_path) { auto model2 = new (std::nothrow) mindspore::Model(); if (model2 == nullptr) { - delete[](model_buf); + delete[] (model_buf); delete model1; std::cerr << "New Model failed." << std::endl; return -1; } build_ret = model2->Build(model_buf, size, mindspore::kMindIR, context2); - delete[](model_buf); + delete[] (model_buf); if (build_ret != mindspore::kSuccess) { delete model1; delete model2; @@ -652,7 +652,7 @@ int RunCallback(const char *model_path) { // Create and Build MindSpore model. auto model = CreateAndBuildModel(model_buf, size); - delete[](model_buf); + delete[] (model_buf); if (model == nullptr) { delete model; std::cerr << "Create model failed." << std::endl; diff --git a/mindspore-lite/examples/runtime_extend/main.cc b/mindspore-lite/examples/runtime_extend/main.cc index 567f7199a..c83684301 100644 --- a/mindspore-lite/examples/runtime_extend/main.cc +++ b/mindspore-lite/examples/runtime_extend/main.cc @@ -20,9 +20,9 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/model.h" +#include "include/api/status.h" +#include "include/api/context.h" +#include "include/api/model.h" namespace mindspore { namespace lite { diff --git a/mindspore-lite/examples/runtime_extend/src/custom_add_infer.cc b/mindspore-lite/examples/runtime_extend/src/custom_add_infer.cc index 04990f3ea..d61489a37 100644 --- a/mindspore-lite/examples/runtime_extend/src/custom_add_infer.cc +++ b/mindspore-lite/examples/runtime_extend/src/custom_add_infer.cc @@ -15,7 +15,7 @@ */ #include "src/custom_common.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "include/registry/register_kernel_interface.h" namespace mindspore { diff --git a/mindspore-lite/examples/runtime_extend/src/custom_common.h b/mindspore-lite/examples/runtime_extend/src/custom_common.h index 1e1d36b3b..77c408cbf 100644 --- a/mindspore-lite/examples/runtime_extend/src/custom_common.h +++ b/mindspore-lite/examples/runtime_extend/src/custom_common.h @@ -18,8 +18,8 @@ #define MINDSPORE_LITE_EXAMPLES_RUNTIME_EXTEND_SRC_CUSTOM_COMMON_H #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" +#include "include/api/types.h" +#include "include/api/status.h" namespace mindspore { namespace common { diff --git a/mindspore-lite/examples/runtime_gpu_extend/main.cc b/mindspore-lite/examples/runtime_gpu_extend/main.cc index 032673e16..6717f5e84 100644 --- a/mindspore-lite/examples/runtime_gpu_extend/main.cc +++ b/mindspore-lite/examples/runtime_gpu_extend/main.cc @@ -24,8 +24,8 @@ #include #include "include/errorcode.h" #include "include/context.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/model.h" +#include "include/api/types.h" +#include "include/api/model.h" namespace mindspore { namespace lite { @@ -143,7 +143,7 @@ int CompileAndRun(int argc, const char **argv) { return RET_ERROR; } auto ret = ms_model.Build(model_buf, size, kMindIR, context); - delete[](model_buf); + delete[] (model_buf); if (ret != kSuccess) { std::cerr << "ms_model.Build failed." << std::endl; return RET_ERROR; diff --git a/mindspore-lite/examples/runtime_gpu_extend/src/custom_add_kernel_gpu.cc b/mindspore-lite/examples/runtime_gpu_extend/src/custom_add_kernel_gpu.cc index 3b950cb10..904a11f5b 100644 --- a/mindspore-lite/examples/runtime_gpu_extend/src/custom_add_kernel_gpu.cc +++ b/mindspore-lite/examples/runtime_gpu_extend/src/custom_add_kernel_gpu.cc @@ -25,7 +25,7 @@ #include "include/registry/register_kernel.h" #include "include/registry/opencl_runtime_wrapper.h" #include "src/cl/arithmetic.cl.inc" -#include "include/cxx_api/data_type.h" +#include "include/api/data_type.h" #include "include/schema/ops_generated.h" #define UP_ROUND(x, y) (((x) + (y) - (1)) / (y) * (y)) diff --git a/mindspore-lite/examples/runtime_gpu_extend/src/custom_common.h b/mindspore-lite/examples/runtime_gpu_extend/src/custom_common.h index d2c981b35..00c1d2fa3 100644 --- a/mindspore-lite/examples/runtime_gpu_extend/src/custom_common.h +++ b/mindspore-lite/examples/runtime_gpu_extend/src/custom_common.h @@ -20,9 +20,9 @@ #include #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "include/errorcode.h" -#include "include/cxx_api/data_type.h" +#include "include/api/data_type.h" #include "include/registry/opencl_runtime_wrapper.h" #define UP_DIV(x, y) (((x) + (y) - (1)) / (y)) diff --git a/mindspore-lite/examples/train_lenet_cpp/src/inference.cc b/mindspore-lite/examples/train_lenet_cpp/src/inference.cc index 5d27a4839..3cb234696 100644 --- a/mindspore-lite/examples/train_lenet_cpp/src/inference.cc +++ b/mindspore-lite/examples/train_lenet_cpp/src/inference.cc @@ -19,10 +19,10 @@ #include #include #include "src/utils.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/graph.h" -#include "include/cxx_api/serialization.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/graph.h" +#include "include/api/serialization.h" static void Usage() { std::cout << "Usage: infer -f <.ms model file>" << std::endl; } diff --git a/mindspore-lite/examples/train_lenet_cpp/src/net_runner.cc b/mindspore-lite/examples/train_lenet_cpp/src/net_runner.cc index 1a5c51cf4..87687c161 100644 --- a/mindspore-lite/examples/train_lenet_cpp/src/net_runner.cc +++ b/mindspore-lite/examples/train_lenet_cpp/src/net_runner.cc @@ -25,14 +25,14 @@ #include #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/serialization.h" -#include "include/cxx_api/callback/loss_monitor.h" -#include "include/cxx_api/metrics/accuracy.h" -#include "include/cxx_api/callback/ckpt_saver.h" -#include "include/cxx_api/callback/train_accuracy.h" -#include "include/cxx_api/callback/lr_scheduler.h" +#include "include/api/context.h" +#include "include/api/types.h" +#include "include/api/serialization.h" +#include "include/api/callback/loss_monitor.h" +#include "include/api/metrics/accuracy.h" +#include "include/api/callback/ckpt_saver.h" +#include "include/api/callback/train_accuracy.h" +#include "include/api/callback/lr_scheduler.h" #include "src/utils.h" #include "include/dataset/datasets.h" #include "include/dataset/vision_lite.h" diff --git a/mindspore-lite/examples/train_lenet_cpp/src/net_runner.h b/mindspore-lite/examples/train_lenet_cpp/src/net_runner.h index 3eb192758..2de0cc8c7 100644 --- a/mindspore-lite/examples/train_lenet_cpp/src/net_runner.h +++ b/mindspore-lite/examples/train_lenet_cpp/src/net_runner.h @@ -23,9 +23,9 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/graph.h" -#include "include/cxx_api/metrics/accuracy.h" +#include "include/api/model.h" +#include "include/api/graph.h" +#include "include/api/metrics/accuracy.h" #include "include/dataset/datasets.h" using mindspore::AccuracyMetrics; diff --git a/mindspore-lite/include/api/multi_model_runner.h b/mindspore-lite/include/api/multi_model_runner.h index 0798d42a0..14bdeaf62 100644 --- a/mindspore-lite/include/api/multi_model_runner.h +++ b/mindspore-lite/include/api/multi_model_runner.h @@ -20,10 +20,10 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/status.h" +#include "include/api/types.h" +#include "include/api/context.h" +#include "include/api/dual_abi_helper.h" namespace mindspore { using ConfigInfos = std::map>; diff --git a/mindspore-lite/include/converter.h b/mindspore-lite/include/converter.h index ab0dbadf5..39f80fa10 100644 --- a/mindspore-lite/include/converter.h +++ b/mindspore-lite/include/converter.h @@ -20,10 +20,10 @@ #include #include #include -#include "include/cxx_api/format.h" -#include "include/cxx_api/status.h" +#include "include/api/format.h" +#include "include/api/status.h" #include "include/registry/converter_context.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/dual_abi_helper.h" namespace mindspore { struct ConverterPara; diff --git a/mindspore-lite/include/kernel_interface.h b/mindspore-lite/include/kernel_interface.h index 9744b6a86..127e2a2a0 100644 --- a/mindspore-lite/include/kernel_interface.h +++ b/mindspore-lite/include/kernel_interface.h @@ -18,8 +18,8 @@ #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" +#include "include/api/types.h" +#include "include/api/status.h" #include "schema/model_generated.h" namespace mindspore { diff --git a/mindspore-lite/include/model.h b/mindspore-lite/include/model.h index 9010d6b8b..a72b19c68 100644 --- a/mindspore-lite/include/model.h +++ b/mindspore-lite/include/model.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/visible.h" +#include "include/api/visible.h" namespace mindspore { namespace schema { diff --git a/mindspore-lite/include/registry/converter_context.h b/mindspore-lite/include/registry/converter_context.h index 507e2d5bc..3ed267415 100644 --- a/mindspore-lite/include/registry/converter_context.h +++ b/mindspore-lite/include/registry/converter_context.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/types.h" +#include "include/api/dual_abi_helper.h" namespace mindspore { namespace converter { diff --git a/mindspore-lite/include/registry/node_parser_registry.h b/mindspore-lite/include/registry/node_parser_registry.h index 9d6b7d0a2..2ae17d77c 100644 --- a/mindspore-lite/include/registry/node_parser_registry.h +++ b/mindspore-lite/include/registry/node_parser_registry.h @@ -20,7 +20,7 @@ #include #include #include "include/registry/node_parser.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/dual_abi_helper.h" namespace mindspore { namespace registry { diff --git a/mindspore-lite/include/registry/opencl_runtime_wrapper.h b/mindspore-lite/include/registry/opencl_runtime_wrapper.h index dadb7d523..e19753f86 100644 --- a/mindspore-lite/include/registry/opencl_runtime_wrapper.h +++ b/mindspore-lite/include/registry/opencl_runtime_wrapper.h @@ -25,9 +25,9 @@ #include #include #include "CL/cl2.hpp" -#include "include/cxx_api/allocator.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/allocator.h" +#include "include/api/status.h" +#include "include/api/dual_abi_helper.h" namespace mindspore::registry::opencl { class MS_API OpenCLRuntimeWrapper { diff --git a/mindspore-lite/include/registry/pass_base.h b/mindspore-lite/include/registry/pass_base.h index ce6ca4205..ec4e88bee 100644 --- a/mindspore-lite/include/registry/pass_base.h +++ b/mindspore-lite/include/registry/pass_base.h @@ -19,7 +19,7 @@ #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "mindapi/ir/func_graph.h" namespace mindspore { diff --git a/mindspore-lite/include/registry/pass_registry.h b/mindspore-lite/include/registry/pass_registry.h index ef9a6ce61..38049513f 100644 --- a/mindspore-lite/include/registry/pass_registry.h +++ b/mindspore-lite/include/registry/pass_registry.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/types.h" +#include "include/api/dual_abi_helper.h" namespace mindspore { namespace registry { diff --git a/mindspore-lite/include/registry/register_kernel.h b/mindspore-lite/include/registry/register_kernel.h index 9d0a22099..764675b8b 100644 --- a/mindspore-lite/include/registry/register_kernel.h +++ b/mindspore-lite/include/registry/register_kernel.h @@ -22,11 +22,11 @@ #include #include #include "schema/model_generated.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/kernel.h" -#include "include/cxx_api/data_type.h" -#include "include/cxx_api/status.h" +#include "include/api/context.h" +#include "include/api/types.h" +#include "include/api/kernel.h" +#include "include/api/data_type.h" +#include "include/api/status.h" namespace mindspore { namespace registry { diff --git a/mindspore-lite/include/train/train_loop_callback.h b/mindspore-lite/include/train/train_loop_callback.h index ab9d80f12..412d623c7 100644 --- a/mindspore-lite/include/train/train_loop_callback.h +++ b/mindspore-lite/include/train/train_loop_callback.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/callback/callback.h" +#include "include/api/callback/callback.h" namespace mindspore { namespace lite { diff --git a/mindspore-lite/java/src/main/native/graph.cpp b/mindspore-lite/java/src/main/native/graph.cpp index a762f270a..012ba3253 100644 --- a/mindspore-lite/java/src/main/native/graph.cpp +++ b/mindspore-lite/java/src/main/native/graph.cpp @@ -16,9 +16,9 @@ #include #include "common/log_adapter.h" -#include "include/cxx_api/graph.h" -#include "include/cxx_api/serialization.h" -#include "include/cxx_api/types.h" +#include "include/api/graph.h" +#include "include/api/serialization.h" +#include "include/api/types.h" extern "C" JNIEXPORT jlong JNICALL Java_com_mindspore_Graph_loadModel(JNIEnv *env, jobject thiz, jstring ms_file) { auto graph = new (std::nothrow) mindspore::Graph(); diff --git a/mindspore-lite/java/src/main/native/model.cpp b/mindspore-lite/java/src/main/native/model.cpp index 15bcf3421..75a798777 100644 --- a/mindspore-lite/java/src/main/native/model.cpp +++ b/mindspore-lite/java/src/main/native/model.cpp @@ -16,9 +16,9 @@ #include #include -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "common/log_adapter.h" -#include "include/cxx_api/serialization.h" +#include "include/api/serialization.h" extern "C" JNIEXPORT jlong JNICALL Java_com_mindspore_Model_createModel(JNIEnv *env, jobject thiz) { auto model = new (std::nothrow) mindspore::Model(); diff --git a/mindspore-lite/java/src/main/native/model_parallel_runner.cpp b/mindspore-lite/java/src/main/native/model_parallel_runner.cpp index 9a4be279c..45fb64915 100644 --- a/mindspore-lite/java/src/main/native/model_parallel_runner.cpp +++ b/mindspore-lite/java/src/main/native/model_parallel_runner.cpp @@ -16,8 +16,8 @@ #include #include "common/log_adapter.h" -#include "include/cxx_api/model_parallel_runner.h" -#include "include/cxx_api/context.h" +#include "include/api/model_parallel_runner.h" +#include "include/api/context.h" extern "C" JNIEXPORT jlong JNICALL Java_com_mindspore_ModelParallelRunner_init(JNIEnv *env, jobject thiz, jstring model_path, diff --git a/mindspore-lite/java/src/main/native/ms_context.cpp b/mindspore-lite/java/src/main/native/ms_context.cpp index 42b0677ce..65c52f2bd 100644 --- a/mindspore-lite/java/src/main/native/ms_context.cpp +++ b/mindspore-lite/java/src/main/native/ms_context.cpp @@ -16,7 +16,7 @@ #include #include "common/log_adapter.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "common/jni_utils.h" constexpr const int kCpuDevice = 0; diff --git a/mindspore-lite/java/src/main/native/ms_tensor.cpp b/mindspore-lite/java/src/main/native/ms_tensor.cpp index 00626efd5..2f44ad4f3 100644 --- a/mindspore-lite/java/src/main/native/ms_tensor.cpp +++ b/mindspore-lite/java/src/main/native/ms_tensor.cpp @@ -17,7 +17,7 @@ #include #include #include "common/log_adapter.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "common/jni_utils.h" extern "C" JNIEXPORT jintArray JNICALL Java_com_mindspore_MSTensor_getShape(JNIEnv *env, jobject thiz, diff --git a/mindspore-lite/java/src/main/native/runner_config.cpp b/mindspore-lite/java/src/main/native/runner_config.cpp index 1ded8a263..e471ec556 100644 --- a/mindspore-lite/java/src/main/native/runner_config.cpp +++ b/mindspore-lite/java/src/main/native/runner_config.cpp @@ -16,7 +16,7 @@ #include #include "common/log_adapter.h" -#include "include/cxx_api/model_parallel_runner.h" +#include "include/api/model_parallel_runner.h" #include "common/jni_utils.h" extern "C" JNIEXPORT jlong JNICALL Java_com_mindspore_config_RunnerConfig_createRunnerConfig(JNIEnv *env, diff --git a/mindspore-lite/java/src/main/native/train_config.cpp b/mindspore-lite/java/src/main/native/train_config.cpp index baf4fa404..5ff409a14 100644 --- a/mindspore-lite/java/src/main/native/train_config.cpp +++ b/mindspore-lite/java/src/main/native/train_config.cpp @@ -16,8 +16,8 @@ #include #include "common/log_adapter.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/cfg.h" +#include "include/api/types.h" +#include "include/api/cfg.h" constexpr const int kOLKeepBatchNorm = 2; constexpr const int kOLNotKeepBatchNorm = 3; diff --git a/mindspore-lite/java/src/main/native/version.cpp b/mindspore-lite/java/src/main/native/version.cpp index 6b3549802..0be901fdd 100644 --- a/mindspore-lite/java/src/main/native/version.cpp +++ b/mindspore-lite/java/src/main/native/version.cpp @@ -15,7 +15,7 @@ */ #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" extern "C" JNIEXPORT jstring JNICALL Java_com_mindspore_config_Version_version(JNIEnv *env, jclass thiz) { return env->NewStringUTF(mindspore::Version().c_str()); diff --git a/mindspore-lite/minddata/dataset/api/data_helper.cc b/mindspore-lite/minddata/dataset/api/data_helper.cc index ef5e68652..fbe7bd12d 100644 --- a/mindspore-lite/minddata/dataset/api/data_helper.cc +++ b/mindspore-lite/minddata/dataset/api/data_helper.cc @@ -16,7 +16,7 @@ #include "mindspore-lite/minddata/dataset/include/dataset/data_helper.h" #include "mindspore-lite/minddata/dataset/util/json_helper.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore-lite/minddata/dataset/core/de_tensor.h b/mindspore-lite/minddata/dataset/core/de_tensor.h index fb9cb17cb..b90c30c3d 100644 --- a/mindspore-lite/minddata/dataset/core/de_tensor.h +++ b/mindspore-lite/minddata/dataset/core/de_tensor.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/visible.h" +#include "include/api/status.h" +#include "include/api/visible.h" #include "ir/api_tensor_impl.h" namespace mindspore { diff --git a/mindspore-lite/minddata/dataset/core/device_resource.h b/mindspore-lite/minddata/dataset/core/device_resource.h index b61dea4ad..013bdc508 100644 --- a/mindspore-lite/minddata/dataset/core/device_resource.h +++ b/mindspore-lite/minddata/dataset/core/device_resource.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_MINDDATA_DATASET_CORE_DEVICE_RESOURCE_H_ #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/visible.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/visible.h" #include "mindspore-lite/minddata/dataset/core/device_tensor.h" #include "mindspore-lite/minddata/dataset/core/tensor.h" diff --git a/mindspore-lite/minddata/dataset/core/device_tensor.h b/mindspore-lite/minddata/dataset/core/device_tensor.h index d5ecd981e..cbe9e01cf 100644 --- a/mindspore-lite/minddata/dataset/core/device_tensor.h +++ b/mindspore-lite/minddata/dataset/core/device_tensor.h @@ -19,7 +19,7 @@ #include #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/core/data_type.h" #include "mindspore-lite/minddata/dataset/core/tensor.h" diff --git a/mindspore-lite/minddata/dataset/core/global_context.h b/mindspore-lite/minddata/dataset/core/global_context.h index 729d7fd6d..0fb9f9313 100644 --- a/mindspore-lite/minddata/dataset/core/global_context.h +++ b/mindspore-lite/minddata/dataset/core/global_context.h @@ -19,7 +19,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/core/config_manager.h" #include "mindspore-lite/minddata/dataset/engine/perf/profiling.h" diff --git a/mindspore-lite/minddata/dataset/core/types.cc b/mindspore-lite/minddata/dataset/core/types.cc index 25c012255..ffcc564d8 100644 --- a/mindspore-lite/minddata/dataset/core/types.cc +++ b/mindspore-lite/minddata/dataset/core/types.cc @@ -15,7 +15,7 @@ */ #ifndef BUILDING_DLL #define BUILDING_DLL -#include "include/cxx_api/types.h" +#include "include/api/types.h" #undef BUILDING_DLL #endif diff --git a/mindspore-lite/minddata/dataset/engine/ir/cache/dataset_cache_impl.h b/mindspore-lite/minddata/dataset/engine/ir/cache/dataset_cache_impl.h index 8d85d01aa..e337fe6a6 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/cache/dataset_cache_impl.h +++ b/mindspore-lite/minddata/dataset/engine/ir/cache/dataset_cache_impl.h @@ -21,7 +21,7 @@ #include #include #include -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/dual_abi_helper.h" #include "mindspore-lite/minddata/dataset/engine/cache/cache_client.h" #include "mindspore-lite/minddata/dataset/engine/datasetops/cache_op.h" #include "mindspore-lite/minddata/dataset/engine/ir/cache/dataset_cache.h" diff --git a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/distributed_sampler_ir.h b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/distributed_sampler_ir.h index 32615c78c..4242acc85 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/distributed_sampler_ir.h +++ b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/distributed_sampler_ir.h @@ -22,7 +22,7 @@ #include #include "mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #ifndef ENABLE_ANDROID #include "minddata/mindrecord/include/shard_operator.h" #endif diff --git a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/pk_sampler_ir.h b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/pk_sampler_ir.h index 777392f30..9f2ac5f7a 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/pk_sampler_ir.h +++ b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/pk_sampler_ir.h @@ -22,7 +22,7 @@ #include #include "mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #ifndef ENABLE_ANDROID #include "minddata/mindrecord/include/shard_operator.h" #endif diff --git a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/prebuilt_sampler_ir.h b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/prebuilt_sampler_ir.h index 1e92e3891..6d1ddce7e 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/prebuilt_sampler_ir.h +++ b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/prebuilt_sampler_ir.h @@ -21,7 +21,7 @@ #include #include "mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #ifndef ENABLE_ANDROID #include "minddata/mindrecord/include/shard_operator.h" #endif diff --git a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/random_sampler_ir.h b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/random_sampler_ir.h index 886b4e573..b7b9b65f0 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/random_sampler_ir.h +++ b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/random_sampler_ir.h @@ -22,7 +22,7 @@ #include #include "mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #ifndef ENABLE_ANDROID #include "minddata/mindrecord/include/shard_operator.h" #endif diff --git a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h index e315ff9e9..b00f397d7 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h +++ b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/util/validators.h" #ifndef ENABLE_ANDROID #include "minddata/mindrecord/include/shard_operator.h" diff --git a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/sequential_sampler_ir.h b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/sequential_sampler_ir.h index 8f3ae83cf..00928f04b 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/sequential_sampler_ir.h +++ b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/sequential_sampler_ir.h @@ -22,7 +22,7 @@ #include #include "mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #ifndef ENABLE_ANDROID #include "minddata/mindrecord/include/shard_operator.h" #endif diff --git a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/skip_first_epoch_sampler_ir.h b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/skip_first_epoch_sampler_ir.h index e093a0f5f..ddc4949ea 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/skip_first_epoch_sampler_ir.h +++ b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/skip_first_epoch_sampler_ir.h @@ -21,7 +21,7 @@ #include #include "mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/sequential_sampler_ir.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/subset_random_sampler_ir.h b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/subset_random_sampler_ir.h index 4f4b9b497..87605dc9d 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/subset_random_sampler_ir.h +++ b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/subset_random_sampler_ir.h @@ -24,7 +24,7 @@ #include "mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h" #include "mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/subset_sampler_ir.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #ifndef ENABLE_ANDROID #include "minddata/mindrecord/include/shard_operator.h" #endif diff --git a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/subset_sampler_ir.h b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/subset_sampler_ir.h index 65be77cba..b3dfd18ec 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/subset_sampler_ir.h +++ b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/subset_sampler_ir.h @@ -23,7 +23,7 @@ #include #include "mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #ifndef ENABLE_ANDROID #include "minddata/mindrecord/include/shard_operator.h" #endif diff --git a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/weighted_random_sampler_ir.h b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/weighted_random_sampler_ir.h index ceeb5c8ea..837e069a3 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/weighted_random_sampler_ir.h +++ b/mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/weighted_random_sampler_ir.h @@ -23,7 +23,7 @@ #include #include "mindspore-lite/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #ifndef ENABLE_ANDROID #include "minddata/mindrecord/include/shard_operator.h" #endif diff --git a/mindspore-lite/minddata/dataset/include/dataset/audio.h b/mindspore-lite/minddata/dataset/include/dataset/audio.h index 1c5f3cd78..ddf2315a3 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/audio.h +++ b/mindspore-lite/minddata/dataset/include/dataset/audio.h @@ -24,9 +24,9 @@ #include #include -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/visible.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/status.h" +#include "include/api/visible.h" #include "include/dataset/constants.h" #include "include/dataset/transforms.h" diff --git a/mindspore-lite/minddata/dataset/include/dataset/config.h b/mindspore-lite/minddata/dataset/include/dataset/config.h index c05219080..47d12903e 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/config.h +++ b/mindspore-lite/minddata/dataset/include/dataset/config.h @@ -21,8 +21,8 @@ #include #include -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/visible.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/visible.h" namespace mindspore { namespace dataset { diff --git a/mindspore-lite/minddata/dataset/include/dataset/constants.h b/mindspore-lite/minddata/dataset/include/dataset/constants.h index 193035c5c..e2b760bb4 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/constants.h +++ b/mindspore-lite/minddata/dataset/include/dataset/constants.h @@ -20,7 +20,7 @@ #include #include -#include "include/cxx_api/visible.h" +#include "include/api/visible.h" namespace mindspore { namespace dataset { diff --git a/mindspore-lite/minddata/dataset/include/dataset/data_helper.h b/mindspore-lite/minddata/dataset/include/dataset/data_helper.h index 4ce503b0e..138a06e07 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/data_helper.h +++ b/mindspore-lite/minddata/dataset/include/dataset/data_helper.h @@ -34,8 +34,8 @@ #include #include -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/status.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore-lite/minddata/dataset/include/dataset/datasets.h b/mindspore-lite/minddata/dataset/include/dataset/datasets.h index d13b8bfb8..ad3981733 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/datasets.h +++ b/mindspore-lite/minddata/dataset/include/dataset/datasets.h @@ -30,8 +30,8 @@ #include "nlohmann/json_fwd.hpp" -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/visible.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/visible.h" #include "include/dataset/iterator.h" #include "include/dataset/samplers.h" #include "include/dataset/text.h" diff --git a/mindspore-lite/minddata/dataset/include/dataset/execute.h b/mindspore-lite/minddata/dataset/include/dataset/execute.h index 7bfd96ca8..a21888077 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/execute.h +++ b/mindspore-lite/minddata/dataset/include/dataset/execute.h @@ -22,8 +22,8 @@ #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/visible.h" +#include "include/api/context.h" +#include "include/api/visible.h" #include "include/dataset/constants.h" #include "include/dataset/transforms.h" #if !defined(BUILD_LITE) && defined(ENABLE_D) diff --git a/mindspore-lite/minddata/dataset/include/dataset/iterator.h b/mindspore-lite/minddata/dataset/include/dataset/iterator.h index 3c76746a6..3dce9d911 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/iterator.h +++ b/mindspore-lite/minddata/dataset/include/dataset/iterator.h @@ -23,9 +23,9 @@ #include #include -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/status.h" +#include "include/api/types.h" namespace mindspore { namespace dataset { diff --git a/mindspore-lite/minddata/dataset/include/dataset/samplers.h b/mindspore-lite/minddata/dataset/include/dataset/samplers.h index 6a83fbb7c..d0061f97e 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/samplers.h +++ b/mindspore-lite/minddata/dataset/include/dataset/samplers.h @@ -20,8 +20,8 @@ #include #include -#include "include/cxx_api/visible.h" -#include "include/cxx_api/status.h" +#include "include/api/visible.h" +#include "include/api/status.h" #include "include/dataset/constants.h" namespace mindspore { diff --git a/mindspore-lite/minddata/dataset/include/dataset/text.h b/mindspore-lite/minddata/dataset/include/dataset/text.h index 60d597000..244770b0a 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/text.h +++ b/mindspore-lite/minddata/dataset/include/dataset/text.h @@ -24,8 +24,8 @@ #include #include -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/status.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/status.h" #include "include/dataset/constants.h" #include "include/dataset/transforms.h" diff --git a/mindspore-lite/minddata/dataset/include/dataset/transforms.h b/mindspore-lite/minddata/dataset/include/dataset/transforms.h index 0ec3137b5..24242834c 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/transforms.h +++ b/mindspore-lite/minddata/dataset/include/dataset/transforms.h @@ -22,9 +22,9 @@ #include #include -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/status.h" +#include "include/api/types.h" #include "include/dataset/constants.h" namespace mindspore { diff --git a/mindspore-lite/minddata/dataset/include/dataset/vision.h b/mindspore-lite/minddata/dataset/include/dataset/vision.h index d9c1a8888..10e00e544 100755 --- a/mindspore-lite/minddata/dataset/include/dataset/vision.h +++ b/mindspore-lite/minddata/dataset/include/dataset/vision.h @@ -24,8 +24,8 @@ #include #include -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/status.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/status.h" #include "include/dataset/constants.h" #include "include/dataset/transforms.h" #include "include/dataset/vision_lite.h" diff --git a/mindspore-lite/minddata/dataset/include/dataset/vision_ascend.h b/mindspore-lite/minddata/dataset/include/dataset/vision_ascend.h index 384bb25a9..5093ad598 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/vision_ascend.h +++ b/mindspore-lite/minddata/dataset/include/dataset/vision_ascend.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "include/dataset/constants.h" #include "include/dataset/transforms.h" diff --git a/mindspore-lite/minddata/dataset/include/dataset/vision_lite.h b/mindspore-lite/minddata/dataset/include/dataset/vision_lite.h index 9bf9a6b43..1fafb68cb 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/vision_lite.h +++ b/mindspore-lite/minddata/dataset/include/dataset/vision_lite.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "include/dataset/constants.h" #include "include/dataset/transforms.h" diff --git a/mindspore-lite/minddata/dataset/kernels/image/dvpp/ascend310/dvpp_decode_video_op.cc b/mindspore-lite/minddata/dataset/kernels/image/dvpp/ascend310/dvpp_decode_video_op.cc index 5b54b466b..46b3031a4 100644 --- a/mindspore-lite/minddata/dataset/kernels/image/dvpp/ascend310/dvpp_decode_video_op.cc +++ b/mindspore-lite/minddata/dataset/kernels/image/dvpp/ascend310/dvpp_decode_video_op.cc @@ -16,7 +16,7 @@ #include "mindspore-lite/minddata/dataset/kernels/image/dvpp/ascend310/dvpp_decode_video_op.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "mindspore-lite/minddata/dataset/core/cv_tensor.h" #include "mindspore-lite/minddata/dataset/core/data_type.h" #include "mindspore-lite/minddata/dataset/core/device_tensor.h" diff --git a/mindspore-lite/minddata/dataset/kernels/image/lite_cv/lite_mat.h b/mindspore-lite/minddata/dataset/kernels/image/lite_cv/lite_mat.h index 326f19566..782d9bfb9 100644 --- a/mindspore-lite/minddata/dataset/kernels/image/lite_cv/lite_mat.h +++ b/mindspore-lite/minddata/dataset/kernels/image/lite_cv/lite_mat.h @@ -20,7 +20,7 @@ #include #include -#include "include/cxx_api/visible.h" +#include "include/api/visible.h" namespace mindspore { namespace dataset { diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_brightness_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_brightness_ir.h index 260c8f4cb..86c3f5f3f 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_brightness_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_brightness_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_contrast_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_contrast_ir.h index 8697d1755..7ea701966 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_contrast_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_contrast_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_gamma_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_gamma_ir.h index 6171770f9..ae111b20b 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_gamma_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_gamma_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_hue_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_hue_ir.h index 4f49d1a73..00ca68a9d 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_hue_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_hue_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_saturation_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_saturation_ir.h index 1d990a09c..4f72e6774 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_saturation_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_saturation_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_sharpness_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_sharpness_ir.h index 9fa08a06a..b7f6bb072 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_sharpness_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/adjust_sharpness_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/affine_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/affine_ir.h index 406618363..fbc3f42ad 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/affine_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/affine_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/ascend_vision_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/ascend_vision_ir.h index 907f42871..55628936a 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/ascend_vision_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/ascend_vision_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/auto_augment_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/auto_augment_ir.h index c4ee87e0a..0b17ca523 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/auto_augment_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/auto_augment_ir.h @@ -24,7 +24,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/auto_contrast_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/auto_contrast_ir.h index 9d4fe5e4c..0301ba424 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/auto_contrast_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/auto_contrast_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/bounding_box_augment_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/bounding_box_augment_ir.h index 95f56bdff..dc01f7a1b 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/bounding_box_augment_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/bounding_box_augment_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/center_crop_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/center_crop_ir.h index 3d20ef20e..72c97c67b 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/center_crop_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/center_crop_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/core/tensor.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/convert_color_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/convert_color_ir.h index cf89157e5..3761ad4fa 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/convert_color_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/convert_color_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/crop_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/crop_ir.h index 5b4d26306..bd394bfec 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/crop_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/crop_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/cutmix_batch_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/cutmix_batch_ir.h index fd84fb49e..fceb7be43 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/cutmix_batch_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/cutmix_batch_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/cutout_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/cutout_ir.h index c83006f8e..d0ba9d1f7 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/cutout_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/cutout_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/decode_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/decode_ir.h index e967f9a88..a8cc61f34 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/decode_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/decode_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/decode_video_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/decode_video_ir.h index 053dc2007..567a02aaa 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/decode_video_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/decode_video_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/equalize_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/equalize_ir.h index e276d33fe..604772643 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/equalize_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/equalize_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/erase_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/erase_ir.h index 2fd3c600b..c4571cb30 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/erase_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/erase_ir.h @@ -24,7 +24,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/gaussian_blur_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/gaussian_blur_ir.h index ee1c80e63..ce1930e95 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/gaussian_blur_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/gaussian_blur_ir.h @@ -20,7 +20,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/horizontal_flip_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/horizontal_flip_ir.h index 725ac1b15..f1591b8ea 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/horizontal_flip_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/horizontal_flip_ir.h @@ -20,7 +20,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/hwc_to_chw_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/hwc_to_chw_ir.h index 9032c0fdc..237e0aee7 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/hwc_to_chw_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/hwc_to_chw_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/invert_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/invert_ir.h index 34f66a785..95f6f48a4 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/invert_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/invert_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/mixup_batch_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/mixup_batch_ir.h index 243c89023..afb00777d 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/mixup_batch_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/mixup_batch_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/normalize_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/normalize_ir.h index e7a23e9f2..7b01db6f9 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/normalize_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/normalize_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/normalize_pad_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/normalize_pad_ir.h index adfcda682..76bd0598f 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/normalize_pad_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/normalize_pad_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/pad_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/pad_ir.h index f6336efb3..86bb415bb 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/pad_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/pad_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/perspective_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/perspective_ir.h index 21bafa533..c32bff05f 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/perspective_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/perspective_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/posterize_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/posterize_ir.h index cef4d2ac7..728bafb1e 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/posterize_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/posterize_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/rand_augment_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/rand_augment_ir.h index 2a183e508..116755b7c 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/rand_augment_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/rand_augment_ir.h @@ -24,7 +24,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_adjust_sharpness_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_adjust_sharpness_ir.h index 7735d4336..8813d1b67 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_adjust_sharpness_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_adjust_sharpness_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_affine_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_affine_ir.h index 26a158138..08f398b4e 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_affine_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_affine_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_auto_contrast_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_auto_contrast_ir.h index c350f5ab0..636c8d84e 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_auto_contrast_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_auto_contrast_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_color_adjust_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_color_adjust_ir.h index d433fa5b9..25ef6231f 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_color_adjust_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_color_adjust_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_color_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_color_ir.h index e07f4c204..80ddabe38 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_color_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_color_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_decode_resize_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_decode_resize_ir.h index e27dc1533..7c79b46dd 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_decode_resize_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_decode_resize_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_ir.h index 8deebdfa1..f4edfe4e1 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_with_bbox_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_with_bbox_ir.h index cb36ec678..ee80b613e 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_with_bbox_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_crop_with_bbox_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_equalize_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_equalize_ir.h index 6318ff6d3..edf31282b 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_equalize_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_equalize_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_horizontal_flip_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_horizontal_flip_ir.h index cc83fe368..2a528d314 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_horizontal_flip_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_horizontal_flip_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_horizontal_flip_with_bbox_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_horizontal_flip_with_bbox_ir.h index 722464dc0..5cb86247c 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_horizontal_flip_with_bbox_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_horizontal_flip_with_bbox_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_invert_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_invert_ir.h index 6c929c13f..841cf1b3c 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_invert_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_invert_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_lighting_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_lighting_ir.h index 1e7613b26..da7cee060 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_lighting_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_lighting_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_posterize_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_posterize_ir.h index de2d7f573..ad24fb801 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_posterize_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_posterize_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resize_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resize_ir.h index 00cc31d57..be21f9b93 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resize_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resize_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resize_with_bbox_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resize_with_bbox_ir.h index 96c4be9ca..cdce4e0c1 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resize_with_bbox_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resize_with_bbox_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resized_crop_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resized_crop_ir.h index dc7c556ea..388f730fe 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resized_crop_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resized_crop_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resized_crop_with_bbox_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resized_crop_with_bbox_ir.h index 7bfb35138..a76136057 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resized_crop_with_bbox_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_resized_crop_with_bbox_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_rotation_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_rotation_ir.h index 10bce7fc1..f3821f0db 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_rotation_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_rotation_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_select_subpolicy_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_select_subpolicy_ir.h index d5615dbe7..6fd37c1eb 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_select_subpolicy_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_select_subpolicy_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_sharpness_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_sharpness_ir.h index 7013353d9..f5e8d6d84 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_sharpness_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_sharpness_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_solarize_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_solarize_ir.h index 0af556d15..faa8a8549 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_solarize_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_solarize_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_vertical_flip_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_vertical_flip_ir.h index 3d487674c..a900b701e 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_vertical_flip_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_vertical_flip_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_vertical_flip_with_bbox_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_vertical_flip_with_bbox_ir.h index 612a9e129..ab6756e8c 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/random_vertical_flip_with_bbox_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/random_vertical_flip_with_bbox_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/rescale_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/rescale_ir.h index 521803c11..1f5edf07d 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/rescale_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/rescale_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_ir.h index 939e53aa4..4eb4b4f70 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_preserve_ar_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_preserve_ar_ir.h index eaeefa8a6..79185f4fb 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_preserve_ar_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_preserve_ar_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_with_bbox_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_with_bbox_ir.h index e3c41ef79..37552ed3e 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_with_bbox_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/resize_with_bbox_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/resized_crop_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/resized_crop_ir.h index 713d052ae..d35b2a010 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/resized_crop_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/resized_crop_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/rgb_to_bgr_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/rgb_to_bgr_ir.h index 7e52f7d7d..6167a579b 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/rgb_to_bgr_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/rgb_to_bgr_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.h index ced486548..b9d7fdac4 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/rgba_to_bgr_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/rgba_to_bgr_ir.h index 0da73d5ee..d63abf169 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/rgba_to_bgr_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/rgba_to_bgr_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/rgba_to_rgb_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/rgba_to_rgb_ir.h index e1ed06e41..3228db135 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/rgba_to_rgb_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/rgba_to_rgb_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/rotate_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/rotate_ir.h index 3891fb87e..a6215b3e1 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/rotate_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/rotate_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/slice_patches_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/slice_patches_ir.h index 5ab317043..d02effed7 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/slice_patches_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/slice_patches_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/solarize_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/solarize_ir.h index e7c4dd886..6a6ce22ce 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/solarize_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/solarize_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/swap_red_blue_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/swap_red_blue_ir.h index e5416e0c1..f39835e28 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/swap_red_blue_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/swap_red_blue_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/to_tensor_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/to_tensor_ir.h index 630a203d1..588f23424 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/to_tensor_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/to_tensor_ir.h @@ -21,7 +21,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/trivial_augment_wide_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/trivial_augment_wide_ir.h index 069e4bf99..cc97e75e8 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/trivial_augment_wide_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/trivial_augment_wide_ir.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/uniform_aug_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/uniform_aug_ir.h index 5f26c8087..8437bbb32 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/uniform_aug_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/uniform_aug_ir.h @@ -22,7 +22,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/kernels/ir/vision/vertical_flip_ir.h b/mindspore-lite/minddata/dataset/kernels/ir/vision/vertical_flip_ir.h index 43188102f..14bc07cbc 100644 --- a/mindspore-lite/minddata/dataset/kernels/ir/vision/vertical_flip_ir.h +++ b/mindspore-lite/minddata/dataset/kernels/ir/vision/vertical_flip_ir.h @@ -20,7 +20,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/include/dataset/constants.h" #include "mindspore-lite/minddata/dataset/include/dataset/transforms.h" #include "mindspore-lite/minddata/dataset/kernels/ir/tensor_operation.h" diff --git a/mindspore-lite/minddata/dataset/liteapi/include/datasets.h b/mindspore-lite/minddata/dataset/liteapi/include/datasets.h index d0d667d12..b8b201a41 100644 --- a/mindspore-lite/minddata/dataset/liteapi/include/datasets.h +++ b/mindspore-lite/minddata/dataset/liteapi/include/datasets.h @@ -30,8 +30,8 @@ #include #include -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/visible.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/visible.h" #include "include/dataset/iterator.h" #include "include/dataset/samplers.h" #include "include/dataset/transforms.h" diff --git a/mindspore-lite/minddata/dataset/util/md_log_adapter.h b/mindspore-lite/minddata/dataset/util/md_log_adapter.h index 80651c1e2..d93ecd782 100644 --- a/mindspore-lite/minddata/dataset/util/md_log_adapter.h +++ b/mindspore-lite/minddata/dataset/util/md_log_adapter.h @@ -20,7 +20,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore-lite/minddata/dataset/util/status.h b/mindspore-lite/minddata/dataset/util/status.h index 8efb625f7..cb5f9aa52 100644 --- a/mindspore-lite/minddata/dataset/util/status.h +++ b/mindspore-lite/minddata/dataset/util/status.h @@ -29,7 +29,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "mindspore-lite/minddata/dataset/util/log_adapter.h" namespace mindspore { diff --git a/mindspore-lite/minddata/example/testlenet.cpp b/mindspore-lite/minddata/example/testlenet.cpp index d2657466f..a26f92a02 100644 --- a/mindspore-lite/minddata/example/testlenet.cpp +++ b/mindspore-lite/minddata/example/testlenet.cpp @@ -28,7 +28,7 @@ #include "include/dataset/iterator.h" #include "include/dataset/vision_lite.h" #include "include/dataset/transforms.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" using mindspore::dataset::Dataset; using mindspore::dataset::Iterator; diff --git a/mindspore-lite/minddata/example/testlitecv.cpp b/mindspore-lite/minddata/example/testlitecv.cpp index 86d10af7e..757a22bad 100644 --- a/mindspore-lite/minddata/example/testlitecv.cpp +++ b/mindspore-lite/minddata/example/testlitecv.cpp @@ -26,7 +26,7 @@ #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "include/dataset/lite_cv/lite_mat.h" #include "include/dataset/lite_cv/image_process.h" #include "include/dataset/vision_lite.h" diff --git a/mindspore-lite/minddata/example/testresize.cpp b/mindspore-lite/minddata/example/testresize.cpp index 3291c6e36..907ccc88a 100644 --- a/mindspore-lite/minddata/example/testresize.cpp +++ b/mindspore-lite/minddata/example/testresize.cpp @@ -30,7 +30,7 @@ #include "include/dataset/iterator.h" #include "include/dataset/vision_lite.h" #include "include/dataset/transforms.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" using mindspore::dataset::Album; using mindspore::dataset::Dataset; diff --git a/mindspore-lite/minddata/wrapper/MDToDApi.cc b/mindspore-lite/minddata/wrapper/MDToDApi.cc index dba8677bc..62c9d2f5f 100644 --- a/mindspore-lite/minddata/wrapper/MDToDApi.cc +++ b/mindspore-lite/minddata/wrapper/MDToDApi.cc @@ -32,7 +32,7 @@ #include "minddata/dataset/include/dataset/vision.h" #include "minddata/dataset/include/dataset/data_helper.h" #include "minddata/dataset/core/de_tensor.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" #if defined(__ANDROID__) || defined(ANDROID) #include #include diff --git a/mindspore-lite/providers/dpico/common/infer_util.h b/mindspore-lite/providers/dpico/common/infer_util.h new file mode 100644 index 000000000..81f4cb6b3 --- /dev/null +++ b/mindspore-lite/providers/dpico/common/infer_util.h @@ -0,0 +1,50 @@ +/** + * Copyright 2022 Huawei Technologies 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. + */ + +#ifndef MINDSPORE_LITE_PROVIDERS_DPICO_COMMON_INFER_UTIL_H_ +#define MINDSPORE_LITE_PROVIDERS_DPICO_COMMON_INFER_UTIL_H_ + +#include +#include +#include +#include +#include "include/api/status.h" +#include "include/api/types.h" +#include "schema/model_generated.h" + +namespace mindspore { +namespace lite { +Status FetchAttrs(const schema::Primitive &primitive, std::map *attrs); +int CheckCustomInputOutput(const std::vector *inputs, + const std::vector *outputs, const schema::Primitive *primitive); +int CheckCustomParam(const schema::Custom *param, const std::string ¶m_name); +class DpicoAicpuThreadManager { + public: + DpicoAicpuThreadManager() = default; + ~DpicoAicpuThreadManager() = default; + int CreateAicpuThread(uint32_t model_id); + int DestroyAicpuThread(); + bool g_threadExitFlag_{true}; + + private: + uint32_t all_aicpu_task_num_{0}; + bool is_aicpu_thread_activity_{false}; + std::thread aicpu_thread_; +}; +} // namespace lite +} // namespace mindspore + +#endif // MINDSPORE_LITE_PROVIDERS_DPICO_COMMON_INFER_UTIL_H_ diff --git a/mindspore-lite/providers/dpico/manager/acl_model_helper.h b/mindspore-lite/providers/dpico/manager/acl_model_helper.h new file mode 100644 index 000000000..15b9ae0dc --- /dev/null +++ b/mindspore-lite/providers/dpico/manager/acl_model_helper.h @@ -0,0 +1,53 @@ +/** + * Copyright 2022 Huawei Technologies 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. + */ + +#ifndef MINDSPORE_LITE_PROVIDERS_DPICO_MANAGER_ACL_MODEL_HELPER_H_ +#define MINDSPORE_LITE_PROVIDERS_DPICO_MANAGER_ACL_MODEL_HELPER_H_ + +#include +#include +#include "include/svp_acl_mdl.h" +#include "include/api/types.h" +#include "include/schema/model_generated.h" +#include "common/custom_enum.h" +#include "include/lite_types.h" + +namespace mindspore { +namespace lite { +struct AclDataInfo { + enum DataMode { Input = 0, Output = 1 }; + DataMode data_mode{Input}; + size_t stride{0}; + size_t data_size{0}; + svp_acl_mdl_io_dims dim_info{}; + explicit AclDataInfo(DataMode input_mode) : data_mode(input_mode) {} +}; +int GetAclModelType(const schema::Primitive *primitive, AclModelType *acl_model_type); +int GetAclDataInfo(struct AclDataInfo *acl_data_info, svp_acl_mdl_desc *acl_mdl_desc, int index); +int AddDatasetBuffer(svp_acl_mdl_dataset *acl_mdl_dataset, size_t data_buffer_size, size_t stride, void *data); +int DestroyAclDataset(svp_acl_mdl_dataset **acl_mdl_dataset, + const std::unordered_map &mem_managed_by_tensor, const AllocatorPtr &allocator_ptr); +size_t GetDataTypeSize(svp_acl_mdl_desc *acl_mdl_desc, size_t index, AclDataInfo::DataMode data_mode); +int ComputeValidDetectBoxes(svp_acl_mdl_desc *acl_mdl_desc, svp_acl_mdl_dataset *acl_outputs, + std::vector> *boxes); +int WriteDetBoxesToTensorData(const std::vector> &det_boxes, + mindspore::MSTensor *detect_boxes_tensor); + +int AclMalloc(void **buf, size_t size); +int AclFree(void **buf); +} // namespace lite +} // namespace mindspore +#endif // MINDSPORE_LITE_PROVIDERS_DPICO_MANAGER_ACL_MODEL_HELPER_H_ diff --git a/mindspore-lite/providers/dpico/manager/acl_model_manager.h b/mindspore-lite/providers/dpico/manager/acl_model_manager.h new file mode 100644 index 000000000..84661dfcb --- /dev/null +++ b/mindspore-lite/providers/dpico/manager/acl_model_manager.h @@ -0,0 +1,92 @@ +/** + * Copyright 2022 Huawei Technologies 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. + */ + +#ifndef MINDSPORE_LITE_PROVIDERS_DPICO_MANAGER_ACL_MODEL_MANAGER_H_ +#define MINDSPORE_LITE_PROVIDERS_DPICO_MANAGER_ACL_MODEL_MANAGER_H_ + +#include +#include +#include +#include +#include +#include "include/api/types.h" +#include "include/svp_acl_base.h" +#include "include/svp_acl_mdl.h" +#include "manager/acl_context_manager.h" +#include "manager/custom_config_manager.h" +#include "common/custom_enum.h" +#include "include/schema/model_generated.h" +#include "include/lite_types.h" + +namespace mindspore { +namespace lite { +class AclModelManager { + public: + AclModelManager() = default; + ~AclModelManager(); + + int Init(const std::map &dpico_config, + const std::map &model_share_config, const schema::Primitive *primitive, + const std::vector &input_tensors, + const std::vector &output_tensors); + int UpdateBatchSize(const std::vector &input_tensors); + int PrepareAclInputs(std::vector *input_tensors); + int PrepareAclOutputs(std::vector *output_tensors); + int UpdateKernelConfig(const std::map &dpico_config); + int UpdateAclInputs(std::vector *input_tensors); + int UpdateAclOutputs(std::vector *output_tensors); + int Execute(const std::vector &input_tensors, + const std::vector &output_tensors, + const std::map &model_share_config); + + private: + int LoadModel(const std::vector &input_tensors); + int CreateModelDesc(); + int SetDetectParams(void *data); + int AddDetectParamInput(); + int DetectPostProcess(mindspore::MSTensor *output_tensors); + int CreateTaskBufAndWorkBuf(); + int CreateNoShareTaskBufAndWorkBuf(); + int GetMaxTaskAndWorkBufSize(); + int CopyTensorDataToAclInputs(const std::vector &input_tensors); + int CopyAclOutputsToTensorData(const std::vector &output_tensors); + int FlushAclInputsAndOutputs(); + int AclModelRun(const std::vector &input_tensors); + int UnloadModel(); + + private: + static AllocatorPtr custom_allocator_; + static CustomConfigManagerPtr custom_config_manager_ptr_; + static AclContextManagerPtr acl_context_manager_; + + std::unordered_map inputs_mem_managed_by_tensor; // + std::unordered_map outputs_mem_managed_by_tensor; // + + size_t actual_batch_size_{1}; + /** acl related variables */ + uint32_t acl_model_id_{0}; + int32_t acl_device_id_{0}; + size_t stride_align_size_{16}; + AclModelType acl_model_type_{kCnn}; + void *acl_model_ptr_{nullptr}; + svp_acl_mdl_desc *acl_model_desc_{nullptr}; + svp_acl_mdl_dataset *acl_inputs_{nullptr}; + svp_acl_mdl_dataset *acl_outputs_{nullptr}; +}; +using AclModelManagerPtr = std::shared_ptr; +} // namespace lite +} // namespace mindspore +#endif // MINDSPORE_LITE_PROVIDERS_DPICO_MANAGER_ACL_MODEL_MANAGER_H_ diff --git a/mindspore-lite/providers/dpico/src/custom_allocator.h b/mindspore-lite/providers/dpico/src/custom_allocator.h new file mode 100644 index 000000000..dd6ec6d1f --- /dev/null +++ b/mindspore-lite/providers/dpico/src/custom_allocator.h @@ -0,0 +1,76 @@ +/** + * Copyright 2021-2022 Huawei Technologies 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. + */ + +#ifndef MINDSPORE_LITE_PROVIDERS_DPICO_SRC_CUSTOM_ALLOCATOR_H_ +#define MINDSPORE_LITE_PROVIDERS_DPICO_SRC_CUSTOM_ALLOCATOR_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "include/api/allocator.h" + +namespace mindspore { +namespace lite { +struct AllocatorContext { + int shiftFactor; + bool lockFlag; +}; + +class CustomAllocator : public Allocator { + public: + explicit CustomAllocator(size_t aligned_size = 32); + ~CustomAllocator() override; + void SetContext(const AllocatorContext &ctx); + void *Malloc(size_t size) override; + void Free(void *ptr) override; + int RefCount(void *ptr) override; + int SetRefCount(void *ptr, int ref_count) override; + int DecRefCount(void *ptr, int ref_count) override; + int IncRefCount(void *ptr, int ref_count) override; + size_t total_size() const { return this->total_size_; } + void Clear(); + + private: + void Lock(); + void UnLock(); + bool ReuseMemory(size_t free_size, size_t size) const; + struct MemBuf { + std::atomic_int ref_count_ = {0}; + size_t size = 0; + void *buf = nullptr; + }; + + std::mutex lock_; + size_t total_size_ = 0; + // buf, membuf> + std::unordered_map allocated_list_; + std::multimap free_list_; + // 6 is empirical value + unsigned shift_factor_ = 6; + bool lock_flag_ = true; + size_t max_malloc_size_ = 0; +}; +using CustomAllocatorPtr = std::shared_ptr; +constexpr int64_t MAX_MALLOC_SIZE = static_cast(2000) * 1024 * 1024; +constexpr int64_t MAX_THREAD_POOL_SIZE = static_cast(3000) * 1024 * 1024; +} // namespace lite +} // namespace mindspore +#endif // MINDSPORE_LITE_PROVIDERS_DPICO_SRC_CUSTOM_ALLOCATOR_H_ diff --git a/mindspore-lite/providers/dpico/src/custom_fp32.cc b/mindspore-lite/providers/dpico/src/custom_fp32.cc new file mode 100644 index 000000000..1781f0511 --- /dev/null +++ b/mindspore-lite/providers/dpico/src/custom_fp32.cc @@ -0,0 +1,297 @@ +/** + * Copyright 2021-2023 Huawei Technologies 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. + */ + +#include "src/custom_fp32.h" +#include +#include +#include +#include +#include "common/check_base.h" +#include "common/infer_util.h" +#include "common/op_attr.h" +#include "include/api/data_type.h" +#include "include/registry/register_kernel.h" +#include "include/registry/register_kernel_interface.h" + +namespace mindspore { +namespace lite { +constexpr size_t kNumOfInputOm = 1; + +bool CustomCPUKernel::InferShapeDone() const { + if (std::any_of(inputs_.begin(), inputs_.end(), [](const MSTensor &input) { + return input.DataType() == mindspore::DataType::kObjectTypeTensorType; + })) { + return false; + } + auto shape = outputs_.front().Shape(); + return !(std::find(shape.begin(), shape.end(), -1) != shape.end()); +} + +size_t DataTypeSize(mindspore::DataType data_type) { + switch (data_type) { + case mindspore::DataType::kNumberTypeFloat64: + return sizeof(double); + case mindspore::DataType::kNumberTypeFloat32: + return sizeof(float); + case mindspore::DataType::kNumberTypeInt8: + return sizeof(int8_t); + case mindspore::DataType::kNumberTypeUInt8: + return sizeof(uint8_t); + case mindspore::DataType::kNumberTypeFloat16: + case mindspore::DataType::kNumberTypeInt16: + return sizeof(int16_t); + case mindspore::DataType::kNumberTypeInt32: + return sizeof(int32_t); + case mindspore::DataType::kNumberTypeInt64: + return sizeof(int64_t); + case mindspore::DataType::kNumberTypeUInt16: + return sizeof(uint16_t); + case mindspore::DataType::kNumberTypeUInt32: + return sizeof(uint32_t); + case mindspore::DataType::kNumberTypeUInt64: + return sizeof(uint64_t); + case mindspore::DataType::kNumberTypeBool: + return sizeof(bool); + case mindspore::DataType::kObjectTypeString: + return sizeof(char); + case mindspore::DataType::kObjectTypeTensorType: + return 0; + default: + MS_LOG(ERROR) << "Not support the type: " << static_cast(data_type); + return 0; + } +} + +void CustomCPUKernel::UpdateInputOutputTensor() { + if (custom_id_ == 0) { + for (size_t i = 0; i < inputs_.size() - kNumOfInputOm; i++) { + std::vector shape = inputs_[i].Shape(); + if (shape.empty()) { + MS_LOG(ERROR) << "Input[" << i << "]`s shape is empty."; + return; + } + size_t shape_len = shape.size(); + size_t data_type_size = DataTypeSize(inputs_[i].DataType()); + if (data_type_size == 0) { + MS_LOG(ERROR) << "data type size is 0."; + return; + } + int64_t last_dim_size = shape[shape_len - 1] * data_type_size; + MS_LOG(DEBUG) << "Input last_dim = " << shape[shape_len - 1]; + if (last_dim_size % stride_align_size_ != 0) { + last_dim_size = (last_dim_size + stride_align_size_ - 1) & (~(stride_align_size_ - 1)); + int64_t last_dim_new = last_dim_size / data_type_size; + MS_LOG(DEBUG) << "Input new last_dim = " << last_dim_new; + shape[shape_len - 1] = last_dim_new; + inputs_[i].SetShape(shape); + } + } + } + if (custom_id_ == custom_num_ - 1) { + for (size_t i = 0; i < outputs_.size(); i++) { + auto shape = outputs_[i].Shape(); + if (shape.empty()) { + MS_LOG(ERROR) << "Output[" << i << "]`s shape is empty."; + return; + } + size_t shape_len = shape.size(); + size_t data_type_size = DataTypeSize(outputs_[i].DataType()); + if (data_type_size == 0) { + MS_LOG(ERROR) << "data type size is 0."; + return; + } + int64_t last_dim_size = shape[shape_len - 1] * data_type_size; + MS_LOG(DEBUG) << "Output last_dim = " << shape[shape_len - 1]; + if (last_dim_size % stride_align_size_ != 0) { + last_dim_size = (last_dim_size + stride_align_size_ - 1) & (~(stride_align_size_ - 1)); + int64_t last_dim_new = last_dim_size / data_type_size; + MS_LOG(DEBUG) << "Output new last_dim = " << last_dim_new; + shape[shape_len - 1] = last_dim_new; + outputs_[i].SetShape(shape); + } + } + } +} + +int CustomCPUKernel::ParseAttrs() { + std::map attrs; + std::string internal_stride; + std::string custom_id; + std::string custom_num; + std::string head_tail_op_is_custom; + + if (FetchAttrs(*primitive_, &attrs) == kSuccess) { + if (attrs.find("head_tail_op_is_custom") != attrs.end()) { + head_tail_op_is_custom = attrs.at("head_tail_op_is_custom"); + if (head_tail_op_is_custom != "1") { + MS_LOG(ERROR) << "When setting 'SupportZeroCopy=on', " + << "you must ensure that the first and last operators are custom operators."; + return RET_ERROR; + } + } else { + MS_LOG(ERROR) << "Get head_tail_op_is_custom failed."; + return RET_ERROR; + } + if (attrs.find(kLastDimStride) != attrs.end()) { + internal_stride = attrs.at(kLastDimStride); + } else { + MS_LOG(ERROR) << "Get internal_stride failed."; + return RET_ERROR; + } + if (attrs.find("custom_id") != attrs.end()) { + custom_id = attrs.at("custom_id"); + } else { + MS_LOG(ERROR) << "Get custom_id failed."; + return RET_ERROR; + } + if (attrs.find("custom_num") != attrs.end()) { + custom_num = attrs.at("custom_num"); + } else { + MS_LOG(ERROR) << "Get custom_num failed."; + return RET_ERROR; + } + } else { + MS_LOG(ERROR) << "Fetch attrs failed."; + return RET_ERROR; + } + + stride_align_size_ = static_cast(stoi(internal_stride)); + custom_id_ = static_cast(stoi(custom_id)); + custom_num_ = static_cast(stoi(custom_num)); + return RET_OK; +} + +int CustomCPUKernel::Prepare() { + CHECK_LESS_RETURN(inputs_.size(), kInputSize2); + CHECK_LESS_RETURN(outputs_.size(), 1); + if (acl_model_manager_ == nullptr) { + acl_model_manager_ = std::make_shared(); + MS_CHECK_TRUE_MSG(acl_model_manager_ != nullptr, RET_ERROR, "Acl_model_manager_ is nullptr"); + } + + std::map config_info = this->GetConfig(kDpico); + // init model manager + if (acl_model_manager_->Init(config_info, this->GetConfig(kModelSharingSection), primitive_, inputs_, outputs_) != + RET_OK) { + MS_LOG(ERROR) << "Init acl model manager failed."; + return RET_ERROR; + } + + if (!InferShapeDone()) { + MS_LOG(INFO) << "Infershape isn't done, skip this procedure"; + return RET_OK; + } + + if (config_info.find(kSupportZeroCopy) != config_info.end()) { + if (config_info[kSupportZeroCopy] == "on") { + support_zero_copy_ = "on"; + MS_LOG(INFO) << "Set 'SupportZeroCopy=on', will support zero copy."; + } else { + MS_LOG(INFO) << "Do not set 'SupportZeroCopy=on', will not support zero copy."; + } + } else { + MS_LOG(INFO) << "Do not set 'SupportZeroCopy', will not support zero copy."; + } + + if (support_zero_copy_ == "on") { + if (ParseAttrs() != RET_OK) { + MS_LOG(ERROR) << "Parse attrs failed or the attr is invalid."; + return RET_ERROR; + } + UpdateInputOutputTensor(); + } + if (acl_model_manager_->UpdateBatchSize(inputs_) != RET_OK) { + MS_LOG(ERROR) << "Update batch size for acl model manager failed."; + return RET_ERROR; + } + if (acl_model_manager_->PrepareAclInputs(&inputs_) != RET_OK) { + MS_LOG(ERROR) << "Prepare inputs for acl model manager failed."; + return RET_ERROR; + } + if (acl_model_manager_->PrepareAclOutputs(&outputs_) != RET_OK) { + MS_LOG(ERROR) << "Prepare outputs for acl model manager failed."; + return RET_ERROR; + } + return RET_OK; +} + +int CustomCPUKernel::ReSize() { + if (!InferShapeDone()) { + auto custom_kernel_interface = registry::RegisterKernelInterface::GetKernelInterface("", primitive_, this); + MS_CHECK_TRUE_MSG(custom_kernel_interface != nullptr, RET_ERROR, "Get custom kernel interface failed."); + auto status = custom_kernel_interface->Infer(&inputs_, &outputs_, primitive_, this); + MS_CHECK_TRUE_MSG(status == kSuccess, RET_ERROR, "Custom op infershape failed. " << this->name()); + } + if (support_zero_copy_ == "on") { + UpdateInputOutputTensor(); + } + if (acl_model_manager_->UpdateBatchSize(inputs_) != RET_OK) { + MS_LOG(ERROR) << "Update batch size for acl model manager failed."; + return RET_ERROR; + } + + auto ret = acl_model_manager_->UpdateKernelConfig(this->GetConfig(kDpico)); + MS_CHECK_TRUE_MSG(ret == RET_OK, RET_ERROR, "Acl model manager update kernel config failed."); + ret = acl_model_manager_->UpdateAclInputs(&inputs_); + MS_CHECK_TRUE_MSG(ret == RET_OK, RET_ERROR, "Acl model manager update inputs failed."); + ret = acl_model_manager_->UpdateAclOutputs(&outputs_); + MS_CHECK_TRUE_MSG(ret == RET_OK, RET_ERROR, "Acl model manager update outputs failed."); + return RET_OK; +} + +int CustomCPUKernel::Execute() { + // reallocate memory for output data + for (auto output : outputs_) { + auto data = output.MutableData(); + MS_CHECK_TRUE_MSG(data != nullptr, RET_ERROR, "Output tensor data is nullptr. " << output.Name()); + } + if (acl_model_manager_->Execute(inputs_, outputs_, this->GetConfig(kModelSharingSection)) != RET_OK) { + MS_LOG(ERROR) << "Acl model manager execute failed."; + return RET_ERROR; + } + return RET_OK; +} + +std::shared_ptr CustomCreateKernel(const std::vector &inputs, + const std::vector &outputs, + const mindspore::schema::Primitive *primitive, + const mindspore::Context *ctx) { + MS_CHECK_TRUE_MSG(primitive != nullptr, nullptr, "Primitive is nullptr"); + MS_CHECK_TRUE_MSG(ctx != nullptr, nullptr, "Ctx is nullptr"); + if (primitive->value_type() != mindspore::schema::PrimitiveType_Custom) { + MS_LOG(ERROR) << "Primitive type is not PrimitiveType_Custom"; + return nullptr; + } + + auto op = primitive->value_as_Custom(); + MS_CHECK_TRUE_MSG(op != nullptr, nullptr, "Op is nullptr"); + MS_CHECK_TRUE_MSG(op->attr() != nullptr, nullptr, "Op attr is nullptr"); + MS_CHECK_TRUE_MSG(op->attr()->size() >= 1, nullptr, "There should be at least 1 attribute of Custom"); + auto kernel = std::make_shared(inputs, outputs, primitive, ctx); + MS_CHECK_TRUE_MSG(kernel != nullptr, nullptr, "New custom kernel is nullptr"); + return kernel; +} + +namespace { +const auto kFloat32 = DataType::kNumberTypeFloat32; +const auto kInt8 = DataType::kNumberTypeInt8; +const auto kUInt8 = DataType::kNumberTypeUInt8; +} // namespace +REGISTER_CUSTOM_KERNEL(CPU, DPICO, kFloat32, DPICO, CustomCreateKernel) +REGISTER_CUSTOM_KERNEL(CPU, DPICO, kInt8, DPICO, CustomCreateKernel) +REGISTER_CUSTOM_KERNEL(CPU, DPICO, kUInt8, DPICO, CustomCreateKernel) +} // namespace lite +} // namespace mindspore diff --git a/mindspore-lite/providers/dpico/src/custom_fp32.h b/mindspore-lite/providers/dpico/src/custom_fp32.h new file mode 100644 index 000000000..b5a53bb56 --- /dev/null +++ b/mindspore-lite/providers/dpico/src/custom_fp32.h @@ -0,0 +1,59 @@ +/** + * Copyright 2021-2022 Huawei Technologies 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. + */ + +#ifndef MINDSPORE_LITE_PROVIDERS_DPICO_SRC_CUSTOM_FP32_H_ +#define MINDSPORE_LITE_PROVIDERS_DPICO_SRC_CUSTOM_FP32_H_ + +#include +#include +#include "include/api/kernel.h" +#include "include/errorcode.h" +#include "manager/acl_model_manager.h" + +using mindspore::kernel::Kernel; +using mindspore::lite::RET_ERROR; +using mindspore::lite::RET_OK; +namespace mindspore { +namespace lite { +class CustomCPUKernel : public Kernel { + public: + CustomCPUKernel(const std::vector &inputs, const std::vector &outputs, + const mindspore::schema::Primitive *primitive, const mindspore::Context *ctx) + : Kernel(inputs, outputs, primitive, ctx) {} + + ~CustomCPUKernel() = default; + + int Prepare() override; + int ReSize() override; + int Execute() override; + + private: + int ParseAttrs(); + bool InferShapeDone() const; + int PreProcess(); + void UpdateInputOutputTensor(); + + private: + AclModelManagerPtr acl_model_manager_{nullptr}; + std::string support_zero_copy_{"off"}; + size_t stride_align_size_{16}; + size_t custom_id_{0}; + size_t custom_num_{0}; +}; +} // namespace lite +} // namespace mindspore + +#endif // MINDSPORE_LITE_PROVIDERS_DPICO_SRC_CUSTOM_FP32_H_ diff --git a/mindspore-lite/providers/nnie/src/custom_allocator.h b/mindspore-lite/providers/nnie/src/custom_allocator.h new file mode 100644 index 000000000..7616f3403 --- /dev/null +++ b/mindspore-lite/providers/nnie/src/custom_allocator.h @@ -0,0 +1,47 @@ +/** + * Copyright 2022 Huawei Technologies 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. + */ + +#ifndef MINDSPORE_LITE_PROVIDERS_NNIE_SRC_CUSTOM_ALLOCATOR_H_ +#define MINDSPORE_LITE_PROVIDERS_NNIE_SRC_CUSTOM_ALLOCATOR_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "include/api/allocator.h" +#include "include/hi_type.h" + +namespace mindspore { +namespace nnie { +class CustomAllocator : public Allocator { + public: + CustomAllocator() {} + ~CustomAllocator() override {}; + void *Malloc(size_t size) override { return nullptr; } + void Free(void *ptr) override {} + int RefCount(void *ptr) override { return 1; } + int SetRefCount(void *ptr, int ref_count) override { return ref_count; } + int DecRefCount(void *ptr, int ref_count) override { return 1; } + int IncRefCount(void *ptr, int ref_count) override { return 1; } +}; +} // namespace nnie +} // namespace mindspore + +#endif // MINDSPORE_LITE_PROVIDERS_NNIE_SRC_CUSTOM_ALLOCATOR_H_ diff --git a/mindspore-lite/providers/nnie/src/custom_fp32.h b/mindspore-lite/providers/nnie/src/custom_fp32.h new file mode 100644 index 000000000..4e4acf4ef --- /dev/null +++ b/mindspore-lite/providers/nnie/src/custom_fp32.h @@ -0,0 +1,71 @@ +/** + * Copyright 2021 Huawei Technologies 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. + */ + +#ifndef MINDSPORE_LITE_PROVIDERS_NNIE_SRC_CUSTOM_FP32_H_ +#define MINDSPORE_LITE_PROVIDERS_NNIE_SRC_CUSTOM_FP32_H_ + +#include +#include +#include +#include "include/schema/model_generated.h" +#include "include/api/kernel.h" +#include "src/custom_infer.h" +#include "include/hi_type.h" +#include "src/nnie_cfg_parser.h" +#include "src/nnie_manager.h" +#include "src/nnie_print.h" +#include "src/custom_allocator.h" + +using mindspore::MSTensor; +using mindspore::kernel::Kernel; +namespace mindspore { +namespace nnie { +class CustomCPUKernel : public Kernel { + public: + CustomCPUKernel(nnie::NNIEManager *manager, int seg_id, bool forward_bbox, const std::vector &inputs, + const std::vector &outputs, const mindspore::schema::Primitive *primitive, + const mindspore::Context *ctx) + : Kernel(inputs, outputs, primitive, ctx), manager_(manager), seg_id_(seg_id), forward_bbox_(forward_bbox) { + if ((manager_) == nullptr) { + LOGE("manager_ is nullptr."); + } else { + manager_->SetMaxSegId(seg_id); + } + } + + ~CustomCPUKernel() override; + + int Prepare() override; + int ReSize() override; + int Execute() override; + + int seg_id(void) const { return seg_id_; } + + void set_seg_id(int id) { seg_id_ = id; } + + int forward_bbox(void) const { return forward_bbox_; } + + void set_forward_bbox(bool flag) { forward_bbox_ = flag; } + + private: + nnie::NNIEManager *manager_ = nullptr; + int seg_id_ = 0; + bool forward_bbox_ = false; + std::vector> outputs_shapes_; +}; +} // namespace nnie +} // namespace mindspore +#endif // MINDSPORE_LITE_PROVIDERS_NNIE_SRC_CUSTOM_FP32_H_ diff --git a/mindspore-lite/providers/nnie/src/custom_infer.cc b/mindspore-lite/providers/nnie/src/custom_infer.cc new file mode 100644 index 000000000..08a587006 --- /dev/null +++ b/mindspore-lite/providers/nnie/src/custom_infer.cc @@ -0,0 +1,166 @@ +/** + * Copyright 2021 Huawei Technologies 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. + */ + +#include "src/custom_infer.h" +#include +#include +#include "include/errorcode.h" +#include "src/nnie_print.h" +#include "include/api/format.h" +#include "include/registry/register_kernel_interface.h" + +using mindspore::kernel::KernelInterface; +using mindspore::lite::RET_ERROR; +using mindspore::lite::RET_OK; +using mindspore::schema::PrimitiveType_Custom; + +namespace mindspore { +namespace nnie { +std::shared_ptr CustomInferCreater() { + auto infer = new (std::nothrow) CustomInterface(); + if (infer == nullptr) { + LOGE("new custom infer is nullptr"); + return nullptr; + } + return std::shared_ptr(infer); +} + +int GetCustomShape(const mindspore::schema::Custom *op, const std::string &attr, + std::vector> *shapes) { + char buf[kMaxSize]; + bool has_outputs_shape = false; + + for (size_t i = 0; i < op->attr()->size(); i++) { + if (op->attr()->Get(i)->name()->str() == attr) { + auto output_info = op->attr()->Get(i)->data(); + int attr_size = static_cast(output_info->size()); + if (attr_size >= kMaxSize) { + LOGE("attr size too big"); + return RET_ERROR; + } + for (int j = 0; j < attr_size; j++) { + buf[j] = static_cast(output_info->Get(j)); + } + buf[attr_size] = 0; + has_outputs_shape = true; + break; + } + } + + if (!has_outputs_shape) { + LOGE("Custom op don't have %s attr.", attr.c_str()); + return RET_ERROR; + } + + char delims[] = ","; + char *res = nullptr; + char *save_ptr = nullptr; + res = strtok_r(buf, delims, &save_ptr); + while (res != nullptr) { + int64_t ndims = strtol(res, &res, kDecimal); + int j = 0; + std::vector shape; + shape.resize(ndims); + for (; j < ndims; j++) { + res = strtok_r(NULL, delims, &save_ptr); + shape[j] = static_cast(strtol(res, &res, kDecimal)); + } + shapes->push_back(shape); + + res = strtok_r(NULL, delims, &save_ptr); + } + return RET_OK; +} + +Status CustomInterface::Infer(std::vector *inputs, std::vector *outputs, + const mindspore::schema::Primitive *primitive) { + auto check_param = inputs != nullptr && outputs != nullptr && primitive != nullptr; + if (!check_param) { + LOGE("inputs, outputs or primitive is null"); + return kLiteError; + } + if (inputs->empty()) { + LOGE("Inputs size 0"); + return kLiteError; + } + if (outputs->empty()) { + LOGE("Outputs size 0"); + return kLiteError; + } + if (primitive->value_type() != mindspore::schema::PrimitiveType_Custom) { + LOGE("Primitive type is not PrimitiveType_Custom"); + return kLiteError; + } + + auto op = primitive->value_as_Custom(); + if ((op == nullptr) || (op->attr() == nullptr)) { + LOGE("op or its attr is null"); + return kLiteError; + } + if (op->attr()->size() < 1) { + LOGE("There are at least 1 attribute of Custom"); + return kLiteError; + } + std::vector> inputs_shape; + if (GetCustomShape(op, "inputs_shape", &inputs_shape) != RET_OK) { + LOGE("parser inputs_shape attribute err."); + return kLiteError; + } + std::vector> outputs_shape; + if (GetCustomShape(op, "outputs_shape", &outputs_shape) != RET_OK) { + LOGE("parser outputs_shape attribute err."); + return kLiteError; + } + if (inputs_shape.size() != (inputs->size() - 1)) { + LOGE("inputs num diff inputs_shape num."); + return kLiteError; + } + if (inputs_shape[0].size() != (*inputs)[0].Shape().size()) { + LOGE("shape size err."); + return kLiteError; + } + bool resize_flag = false; + int resize_num = 1; + for (size_t i = 0; i < inputs_shape[0].size(); i++) { + if (inputs_shape[0][i] != (*inputs)[0].Shape()[i]) { + if (i == 0) { + resize_flag = true; + resize_num = (*inputs)[0].Shape()[i]; + } else { + LOGE("Custom of NNIE only support batch_num resize."); + return kLiteError; + } + } + } + if (resize_flag) { + for (auto &output_shape : outputs_shape) { + output_shape[0] = resize_num; + } + } + for (size_t i = 0; i < outputs->size(); i++) { + (*outputs)[i].SetShape(outputs_shape[i]); + (*outputs)[i].SetDataType(DataType::kNumberTypeFloat32); + (*outputs)[i].SetFormat(Format::NCHW); + } + return kSuccess; +} +} // namespace nnie +} // namespace mindspore +namespace mindspore { +namespace kernel { +REGISTER_CUSTOM_KERNEL_INTERFACE(NNIE, NNIE, nnie::CustomInferCreater); +} // namespace kernel +} // namespace mindspore diff --git a/mindspore-lite/providers/nnie/src/nnie_cfg_parser.h b/mindspore-lite/providers/nnie/src/nnie_cfg_parser.h new file mode 100644 index 000000000..92875bc14 --- /dev/null +++ b/mindspore-lite/providers/nnie/src/nnie_cfg_parser.h @@ -0,0 +1,57 @@ +/** + * Copyright 2021 Huawei Technologies 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. + */ +#ifndef MINDSPORE_LITE_PROVIDERS_NNIE_SRC_NNIE_CFG_PARSER_H_ +#define MINDSPORE_LITE_PROVIDERS_NNIE_SRC_NNIE_CFG_PARSER_H_ +#include +#include +#include +#include "include/api/kernel.h" +#include "include/hi_type.h" + +namespace mindspore { +namespace nnie { +typedef struct { + HI_U64 phy_; + HI_U32 size_; +} MEM_ITEM; +/** + * Flags is a config container. + * Member objects: + * 1.time_step_: step num only for rnn or lstm model. Default is 1. + * 2.max_roi_num_: maximum number of ROI area, which is single picture supports, must be greater than 0.Default is 300. + * 3.core_ids_: running kernels' id, support multi-core, separated by commas when setting, such as {0, 1, 2}. + * each element must be an integer, wch meet such inequality 0 <= val < 8. + * Default is {0}. + */ +class Flags { + public: + Flags() = default; + ~Flags() = default; + int Init(const kernel::Kernel &kernel); + + public: + int time_step_{1}; + int max_roi_num_{300}; + std::vector core_ids_{0}; + bool keep_origin_output_{false}; + + private: + int ParserInt(const std::map &nnie_arg, const std::string key, int *val); + int ParserBool(const std::map &nnie_arg, const std::string key, bool *val); +}; +} // namespace nnie +} // namespace mindspore +#endif diff --git a/mindspore-lite/providers/nnie/src/nnie_manager.h b/mindspore-lite/providers/nnie/src/nnie_manager.h new file mode 100644 index 000000000..b0fdc8ce8 --- /dev/null +++ b/mindspore-lite/providers/nnie/src/nnie_manager.h @@ -0,0 +1,117 @@ +/** + * Copyright 2021 Huawei Technologies 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. + */ + +#ifndef MINDSPORE_LITE_PROVIDERS_NNIE_SRC_NNIE_MANAGER_H_ +#define MINDSPORE_LITE_PROVIDERS_NNIE_SRC_NNIE_MANAGER_H_ +#include +#include +#include +#include +#include "include/errorcode.h" +#include "include/api/types.h" +#include "include/api/allocator.h" +#include "src/nnie_common.h" +#include "src/nnie_cfg_parser.h" + +namespace mindspore { +namespace nnie { +class NNIEManager { + public: + static NNIEManager *GetInstance(const void *model_buf) { + static std::map managers_; + auto iter = managers_.find(model_buf); + if (iter != managers_.end()) { + return iter->second; + } else { + auto manager = new (std::nothrow) NNIEManager(); + if (manager == nullptr) { + return manager; + } else { + managers_[model_buf] = manager; + return manager; + } + } + } + + NNIEManager() {} + + ~NNIEManager() {} + + int Init(char *model_buf, int size, const std::vector &inputs); + + int CfgInit(const Flags &flags, int max_seg_id); + + void SetInputNum(int max_input_num); + + int SetAllocatorInputs(std::vector *inputs, bool run_box, std::shared_ptr allocator, + unsigned int seg_id); + + int SetAllocatorOutputs(std::vector *outputs, bool run_box, std::shared_ptr allocator, + unsigned int seg_id); + + int SetAllocator(std::vector *inputs, std::vector *outputs, + std::shared_ptr allocator, unsigned int seg_id); + + int FillData(std::vector *inputs, unsigned int seg_id); + + int Run(std::vector *outputs, unsigned int seg_id, + const std::vector> &outputs_shape); + + void Release(bool resize_flag); + + int LoadInputs(std::vector *inputs, std::shared_ptr allocator); + + int LoadOutputs(std::vector *outputs, std::shared_ptr allocator); + + int SetBlobAddr(SVP_SRC_BLOB_S *blob, HI_U64 virt, mindspore::MSTensor *tensor, std::shared_ptr allocator); + + void SetMaxSegId(int max_id) { + if (max_id > max_seg_id_) { + max_seg_id_ = max_id; + } + } + + inline int GetMaxSegId() { return max_seg_id_; } + + inline Flags *GetFlags() { return &flags_; } + + inline bool GetLoadModel() { return load_model_; } + + void SetLoadModel(bool flag) { load_model_ = flag; } + + private: + int SetAllocatorTensor(mindspore::MSTensor *tensor, SVP_SRC_BLOB_S *blob, std::shared_ptr allocator); + + int GetOutputData(std::vector *outputs, const std::vector> &outputs_shape, + bool run_box = false); + + int MallocBlobData(SVP_SRC_BLOB_S *blob, mindspore::MSTensor *tensor, HI_U32 blob_size); + + int FillRoiPooling(mindspore::MSTensor *input); + char *wk_model_ = nullptr; + + int model_size_ = 0; + + NnieRunCfg nnie_cfg_; + int max_seg_id_ = 0; + Flags flags_; + bool load_model_ = false; + std::vector blobs_; + std::vector tensors_; +}; +} // namespace nnie +} // namespace mindspore +#endif // MINDSPORE_LITE_PROVIDERS_NNIE_SRC_NNIE_MANAGER_H_ diff --git a/mindspore-lite/providers/nnie_proposal/src/proposal.h b/mindspore-lite/providers/nnie_proposal/src/proposal.h new file mode 100644 index 000000000..41b23c42f --- /dev/null +++ b/mindspore-lite/providers/nnie_proposal/src/proposal.h @@ -0,0 +1,93 @@ +/** + * Copyright 2021 Huawei Technologies 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. + */ + +#ifndef MINDSPORE_LITE_PROVIDERS_NNIE_PROPOSAL_SRC_PROPOSAL_H_ +#define MINDSPORE_LITE_PROVIDERS_NNIE_PROPOSAL_SRC_PROPOSAL_H_ +#include +#include "include/api/types.h" + +#define LOG_TAG1 "Proposal" +#define LOGE(format, ...) \ + do { \ + if (1) { \ + fprintf(stderr, "\n[ERROR] " LOG_TAG1 " [" __FILE__ ":%d] %s] ", __LINE__, __FUNCTION__); \ + fprintf(stderr, format, ##__VA_ARGS__); \ + } \ + } while (0) + +#define LOGW(format, ...) \ + do { \ + if (1) { \ + fprintf(stderr, "\n[Warning] " LOG_TAG1 " [" __FILE__ ":%d] %s] ", __LINE__, __FUNCTION__); \ + fprintf(stderr, format, ##__VA_ARGS__); \ + } \ + } while (0) + +namespace mindspore { +namespace proposal { +typedef struct { + uint32_t stride_; + void *data_; + uint32_t num_; + uint32_t width_; + uint32_t height_; + uint32_t chn_; +} RpnBoundingBox; + +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#define HALF_VAL 0.5f // the half value +#define COORDI_NUM 4 // coordinate numbers +#define PROPOSAL_WIDTH 6 // the number of proposal values +#define QUANT_BASE 4096 // the base value +#define SCORE_NUM 2 // the num of RPN scores +#define NUM_SCALE_ANCHORS 9 +#define NUM_NMS 6000 +#define MIN_SIZE 16 + +typedef struct { + uint32_t scales_[9]; + uint32_t ratios_[9]; + uint32_t inputs_height_[2]; + uint32_t inputs_width_[2]; + uint32_t inputs_channel_[2]; + uint32_t inputs_stride_; + uint32_t num_ratio_anchors_; + uint32_t num_scale_anchors_; + uint32_t ori_image_height_; + uint32_t ori_image_width_; + uint32_t min_size_; + uint32_t spatial_scale_; + uint32_t nms_thresh_; + uint32_t filter_thresh_; + uint32_t max_roi_num_; + uint32_t num_before_nms_; + float *inputs_[2]; + void *rpn_tmp_buf_; + RpnBoundingBox rpn_bounding_box_; +} ProposalParam; + +typedef struct { + int32_t min_; + int32_t max_; +} Stack; + +int32_t ProposalInit(ProposalParam *param, uint32_t max_roi_num, uint32_t ori_image_height, uint32_t ori_image_width); +int32_t ProposalRun(ProposalParam *param); +void ProposalDeInit(ProposalParam *param); +} // namespace proposal +} // namespace mindspore +#endif // MINDSPORE_LITE_PROVIDERS_NNIE_PROPOSAL_SRC_PROPOSAL_H_ diff --git a/mindspore-lite/providers/nnie_proposal/src/proposal_fp32.h b/mindspore-lite/providers/nnie_proposal/src/proposal_fp32.h new file mode 100644 index 000000000..e46d618e3 --- /dev/null +++ b/mindspore-lite/providers/nnie_proposal/src/proposal_fp32.h @@ -0,0 +1,50 @@ +/** + * Copyright 2021 Huawei Technologies 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. + */ + +#ifndef MINDSPORE_LITE_PROVIDERS_NNIE_PROPOSAL_SRC_PROPOSAL_FP32_H_ +#define MINDSPORE_LITE_PROVIDERS_NNIE_PROPOSAL_SRC_PROPOSAL_FP32_H_ + +#include +#include "schema/model_generated.h" +#include "include/api/kernel.h" +#include "src/proposal.h" + +using mindspore::kernel::Kernel; +namespace mindspore { +namespace proposal { +class ProposalCPUKernel : public Kernel { + public: + ProposalCPUKernel(const std::vector &inputs, const std::vector &outputs, + const mindspore::schema::Primitive *primitive, const mindspore::Context *ctx, int id, + int image_height, int image_width) + : Kernel(inputs, outputs, primitive, ctx), id_(id), image_height_(image_height), image_weight_(image_width) {} + + ~ProposalCPUKernel() override; + + int Prepare() override; + int ReSize() override; + int Execute() override; + + private: + proposal::ProposalParam proposal_param_ = {0}; + int64_t id_; + int64_t image_height_; + int64_t image_weight_; +}; +} // namespace proposal +} // namespace mindspore + +#endif // MINDSPORE_LITE_PROVIDERS_NNIE_PROPOSAL_SRC_PROPOSAL_FP32_H_ diff --git a/mindspore-lite/providers/nnie_proposal/src/proposal_infer.cc b/mindspore-lite/providers/nnie_proposal/src/proposal_infer.cc new file mode 100644 index 000000000..58e4a6d07 --- /dev/null +++ b/mindspore-lite/providers/nnie_proposal/src/proposal_infer.cc @@ -0,0 +1,72 @@ +/** + * Copyright 2021 Huawei Technologies 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. + */ + +#include "src/proposal_infer.h" +#include +#include +#include "include/errorcode.h" +#include "src/proposal.h" +#include "include/api/format.h" +#include "include/registry/register_kernel_interface.h" + +using mindspore::kernel::KernelInterface; +using mindspore::lite::RET_ERROR; +using mindspore::lite::RET_OK; +using mindspore::schema::PrimitiveType_Custom; + +namespace mindspore { +namespace proposal { +std::shared_ptr ProposalInferCreater() { + auto infer = std::make_shared(); + if (infer == nullptr) { + LOGE("new custom infer is nullptr"); + return nullptr; + } + + return infer; +} +Status ProposalInterface::Infer(std::vector *inputs, std::vector *outputs, + const mindspore::schema::Primitive *primitive) { + if (inputs->size() != 2) { + LOGE("Inputs size less 2"); + return kLiteError; + } + if (outputs->size() == 0) { + LOGE("Outputs size 0"); + return kLiteError; + } + if (primitive->value_type() != mindspore::schema::PrimitiveType_Custom) { + LOGE("Primitive type is not PrimitiveType_Custom"); + return kLiteError; + } + + size_t id = 0; + while (id < outputs->size()) { + std::vector shape{-1, COORDI_NUM}; + (*outputs)[id].SetShape(shape); + (*outputs)[id].SetDataType(DataType::kNumberTypeFloat32); + (*outputs)[id].SetFormat(Format::NCHW); + id++; + } + return kSuccess; +} +} // namespace proposal +} // namespace mindspore +namespace mindspore { +namespace kernel { +REGISTER_CUSTOM_KERNEL_INTERFACE(NNIE, Proposal, proposal::ProposalInferCreater); +} // namespace kernel +} // namespace mindspore diff --git a/mindspore-lite/python/src/common_pybind.h b/mindspore-lite/python/src/common_pybind.h index 40d0159b0..8885e5516 100644 --- a/mindspore-lite/python/src/common_pybind.h +++ b/mindspore-lite/python/src/common_pybind.h @@ -19,7 +19,7 @@ #include #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "src/common/log_adapter.h" #include "pybind11/pybind11.h" #include "pybind11/stl.h" diff --git a/mindspore-lite/python/src/context_pybind.cc b/mindspore-lite/python/src/context_pybind.cc index 986fbef1b..7f8777acc 100644 --- a/mindspore-lite/python/src/context_pybind.cc +++ b/mindspore-lite/python/src/context_pybind.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "pybind11/pybind11.h" #include "pybind11/stl.h" diff --git a/mindspore-lite/python/src/model_pybind.cc b/mindspore-lite/python/src/model_pybind.cc index 66c9b33e4..08b137d5a 100644 --- a/mindspore-lite/python/src/model_pybind.cc +++ b/mindspore-lite/python/src/model_pybind.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/model.h" -#include "include/cxx_api/model_group.h" -#include "include/cxx_api/model_parallel_runner.h" +#include "include/api/model.h" +#include "include/api/model_group.h" +#include "include/api/model_parallel_runner.h" #include "extendrt/cxx_api/model/model_impl.h" #include "src/common/log_adapter.h" #include "python/src/common_pybind.h" diff --git a/mindspore-lite/python/src/pybind_module.cc b/mindspore-lite/python/src/pybind_module.cc index db4b97fb2..55c640407 100644 --- a/mindspore-lite/python/src/pybind_module.cc +++ b/mindspore-lite/python/src/pybind_module.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "pybind11/pybind11.h" #include "pybind11/numpy.h" #include "pybind11/stl.h" diff --git a/mindspore-lite/python/src/tensor_pybind.cc b/mindspore-lite/python/src/tensor_pybind.cc index e4e06d5e6..465776ec0 100644 --- a/mindspore-lite/python/src/tensor_pybind.cc +++ b/mindspore-lite/python/src/tensor_pybind.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/types.h" -#include "include/cxx_api/data_type.h" -#include "include/cxx_api/format.h" +#include "include/api/types.h" +#include "include/api/data_type.h" +#include "include/api/format.h" #include "src/common/log_adapter.h" #include "src/litert/cxx_api/tensor_utils.h" #include "include/securec.h" diff --git a/mindspore-lite/src/CMakeLists.txt b/mindspore-lite/src/CMakeLists.txt index 8336e6e78..4218f76ac 100644 --- a/mindspore-lite/src/CMakeLists.txt +++ b/mindspore-lite/src/CMakeLists.txt @@ -379,7 +379,7 @@ set_target_properties(mindspore-lite PROPERTIES CLEAN_DIRECT_OUTPUT 1) if(APPLE) file(GLOB_RECURSE MINDSPORE_LITE_PUB_HDRS LIST_DIRECTORIES true - ${TOP_DIR}/include/cxx_api/*.h) + ${TOP_DIR}/include/api/*.h) file(GLOB MINDSPORE_LITE_PUB_HDRS_IR_HDRS ${TOP_DIR}/mindspore-lite/mindspore/mindspor/core/include/ir/dtype/type_id.h) file(GLOB MINDSPORE_LITE_PUB_HDRS_MINDAPI_HDRS diff --git a/mindspore-lite/src/common/config_infos.h b/mindspore-lite/src/common/config_infos.h index 4516fad2c..a5c4996d8 100644 --- a/mindspore-lite/src/common/config_infos.h +++ b/mindspore-lite/src/common/config_infos.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/visible.h" +#include "include/api/visible.h" #include "mindapi/base/shape_vector.h" namespace mindspore { diff --git a/mindspore-lite/src/common/context_util.h b/mindspore-lite/src/common/context_util.h index be7b46b96..085e2b8f7 100644 --- a/mindspore-lite/src/common/context_util.h +++ b/mindspore-lite/src/common/context_util.h @@ -19,7 +19,7 @@ #include #include #include -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "src/executor/kernel_exec.h" namespace mindspore { diff --git a/mindspore-lite/src/common/prim_util.h b/mindspore-lite/src/common/prim_util.h index d096d9f9e..507bb78a1 100644 --- a/mindspore-lite/src/common/prim_util.h +++ b/mindspore-lite/src/common/prim_util.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_COMMON_PRIM_UTIL_H_ #include "src/common/version_manager.h" -#include "include/cxx_api/visible.h" +#include "include/api/visible.h" namespace mindspore { namespace lite { diff --git a/mindspore-lite/src/common/random_data_generator.h b/mindspore-lite/src/common/random_data_generator.h index 50c7eb9d9..653dc46c3 100644 --- a/mindspore-lite/src/common/random_data_generator.h +++ b/mindspore-lite/src/common/random_data_generator.h @@ -19,7 +19,7 @@ #include #include "src/common/log_adapter.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" namespace mindspore { namespace lite { int GenRandomData(mindspore::MSTensor *tensors); diff --git a/mindspore-lite/src/common/tensor_util.h b/mindspore-lite/src/common/tensor_util.h index 913074f8f..080bb448a 100644 --- a/mindspore-lite/src/common/tensor_util.h +++ b/mindspore-lite/src/common/tensor_util.h @@ -26,7 +26,7 @@ #include "nnacl_c/infer/common_infer.h" #include "nnacl_c/tensorlist_c_utils.h" #include "src/litert/cxx_api/tensor/tensor_impl.h" -#include "include/cxx_api/visible.h" +#include "include/api/visible.h" namespace mindspore { namespace lite { diff --git a/mindspore-lite/src/common/thread_utils.h b/mindspore-lite/src/common/thread_utils.h index d538a0cdb..58c599081 100644 --- a/mindspore-lite/src/common/thread_utils.h +++ b/mindspore-lite/src/common/thread_utils.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_COMMON_THREAD_UTILS_H_ #ifdef __linux__ -#include "include/cxx_api/status.h" +#include "include/api/status.h" namespace mindspore { namespace lite { constexpr int kProcessSuccess = 0; diff --git a/mindspore-lite/src/executor/kernel_exec.h b/mindspore-lite/src/executor/kernel_exec.h index c009d6322..480cbc01c 100644 --- a/mindspore-lite/src/executor/kernel_exec.h +++ b/mindspore-lite/src/executor/kernel_exec.h @@ -30,10 +30,10 @@ #include "src/litert/inner_context.h" #include "src/tensor.h" #include "include/errorcode.h" -#include "include/cxx_api/kernel.h" +#include "include/api/kernel.h" #include "src/litert/cxx_api/tensor/tensor_impl.h" #include "src/litert/lite_kernel.h" -#include "include/cxx_api/delegate.h" +#include "include/api/delegate.h" #include "extendrt/mindir_loader/abstract_kernel.h" #include "include/lite_types.h" #include "src/infer/primitive_type.h" diff --git a/mindspore-lite/src/extendrt/convert/runtime_convert.h b/mindspore-lite/src/extendrt/convert/runtime_convert.h index 967b221b5..81daa911f 100644 --- a/mindspore-lite/src/extendrt/convert/runtime_convert.h +++ b/mindspore-lite/src/extendrt/convert/runtime_convert.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "mindapi/ir/func_graph.h" #include "src/common/config_infos.h" diff --git a/mindspore-lite/src/extendrt/cxx_api/cell.cc b/mindspore-lite/src/extendrt/cxx_api/cell.cc index d4f4e8216..f6a836539 100644 --- a/mindspore-lite/src/extendrt/cxx_api/cell.cc +++ b/mindspore-lite/src/extendrt/cxx_api/cell.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/cxx_api/cell.h" +#include "include/api/cell.h" #include "src/common/log_adapter.h" namespace mindspore { @@ -24,7 +24,7 @@ std::vector CellBase::operator()(const std::vector &inputs) const return empty; } -GraphCell::GraphCell(const Graph &graph) : graph_(std::shared_ptr(new (std::nothrow) Graph(graph))) { +GraphCell::GraphCell(const Graph &graph) : graph_(std::shared_ptr(new(std::nothrow) Graph(graph))) { if (graph_ == nullptr) { MS_LOG(ERROR) << "Invalid graph."; } @@ -36,7 +36,7 @@ GraphCell::GraphCell(const std::shared_ptr &graph) : graph_(graph) { } } -GraphCell::GraphCell(Graph &&graph) : graph_(std::shared_ptr(new (std::nothrow) Graph(graph))) { +GraphCell::GraphCell(Graph &&graph) : graph_(std::shared_ptr(new(std::nothrow) Graph(graph))) { if (graph_ == nullptr) { MS_LOG(ERROR) << "Invalid graph."; } diff --git a/mindspore-lite/src/extendrt/cxx_api/context.cc b/mindspore-lite/src/extendrt/cxx_api/context.cc index bae15bca2..af4d2a05e 100644 --- a/mindspore-lite/src/extendrt/cxx_api/context.cc +++ b/mindspore-lite/src/extendrt/cxx_api/context.cc @@ -16,8 +16,8 @@ #include "src/extendrt/cxx_api/context.h" #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/data_type.h" +#include "include/api/types.h" +#include "include/api/data_type.h" #include "include/lite_types.h" #include "src/litert/inner_allocator.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/extendrt/cxx_api/context.h b/mindspore-lite/src/extendrt/cxx_api/context.h index 1ef3ace52..aee463b98 100644 --- a/mindspore-lite/src/extendrt/cxx_api/context.h +++ b/mindspore-lite/src/extendrt/cxx_api/context.h @@ -26,8 +26,8 @@ #else #include #endif -#include "include/cxx_api/context.h" -#include "include/cxx_api/delegate_api.h" +#include "include/api/context.h" +#include "include/api/delegate_api.h" namespace mindspore { struct Context::Data { diff --git a/mindspore-lite/src/extendrt/cxx_api/dlutils.h b/mindspore-lite/src/extendrt/cxx_api/dlutils.h index 86799c22a..dd495936e 100644 --- a/mindspore-lite/src/extendrt/cxx_api/dlutils.h +++ b/mindspore-lite/src/extendrt/cxx_api/dlutils.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_EXTENDRT_CXX_API_DLUTILS_H_ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/common/file_utils.h" #if !defined(_WIN32) && !defined(_WIN64) #include diff --git a/mindspore-lite/src/extendrt/cxx_api/file_utils.h b/mindspore-lite/src/extendrt/cxx_api/file_utils.h index 357e53ea8..e827cb649 100644 --- a/mindspore-lite/src/extendrt/cxx_api/file_utils.h +++ b/mindspore-lite/src/extendrt/cxx_api/file_utils.h @@ -18,7 +18,7 @@ #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" namespace mindspore { Buffer ReadFile(const std::string &file); diff --git a/mindspore-lite/src/extendrt/cxx_api/graph/graph.cc b/mindspore-lite/src/extendrt/cxx_api/graph/graph.cc index 558c388f9..e6c335001 100644 --- a/mindspore-lite/src/extendrt/cxx_api/graph/graph.cc +++ b/mindspore-lite/src/extendrt/cxx_api/graph/graph.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/graph.h" +#include "include/api/graph.h" #include "extendrt/cxx_api/graph/graph_data.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/extendrt/cxx_api/graph/graph_data.h b/mindspore-lite/src/extendrt/cxx_api/graph/graph_data.h index 275284176..1b0ad53a6 100644 --- a/mindspore-lite/src/extendrt/cxx_api/graph/graph_data.h +++ b/mindspore-lite/src/extendrt/cxx_api/graph/graph_data.h @@ -19,8 +19,8 @@ #include #include #include -#include "include/cxx_api/graph.h" -#include "include/cxx_api/types.h" +#include "include/api/graph.h" +#include "include/api/types.h" #include "ir/func_graph.h" namespace mindspore { diff --git a/mindspore-lite/src/extendrt/cxx_api/graph/graph_impl.h b/mindspore-lite/src/extendrt/cxx_api/graph/graph_impl.h index f8ea3bd04..f310e017e 100644 --- a/mindspore-lite/src/extendrt/cxx_api/graph/graph_impl.h +++ b/mindspore-lite/src/extendrt/cxx_api/graph/graph_impl.h @@ -21,8 +21,8 @@ #include #include #include -#include "include/cxx_api/cell.h" -#include "include/cxx_api/graph.h" +#include "include/api/cell.h" +#include "include/api/graph.h" #include "extendrt/cxx_api/graph/graph_data.h" #include "include/common/utils/utils.h" diff --git a/mindspore-lite/src/extendrt/cxx_api/model/model.cc b/mindspore-lite/src/extendrt/cxx_api/model/model.cc index 0d6ee1c45..b3f1ebcee 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model/model.cc +++ b/mindspore-lite/src/extendrt/cxx_api/model/model.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" +#include "include/api/model.h" +#include "include/api/context.h" #include "extendrt/cxx_api/model/model_impl.h" #include "src/common/config_file.h" #include "src/common/common.h" diff --git a/mindspore-lite/src/extendrt/cxx_api/model/model_group.cc b/mindspore-lite/src/extendrt/cxx_api/model/model_group.cc index 65c9614b1..b6e5d7bcc 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model/model_group.cc +++ b/mindspore-lite/src/extendrt/cxx_api/model/model_group.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "include/cxx_api/model_group.h" +#include "include/api/model_group.h" #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/types.h" +#include "include/api/context.h" +#include "include/api/dual_abi_helper.h" #include "src/extendrt/cxx_api/model/model_group_impl.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/extendrt/cxx_api/model/model_group_impl.cc b/mindspore-lite/src/extendrt/cxx_api/model/model_group_impl.cc index 0bd054f27..e6082156c 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model/model_group_impl.cc +++ b/mindspore-lite/src/extendrt/cxx_api/model/model_group_impl.cc @@ -19,8 +19,8 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" +#include "include/api/types.h" +#include "include/api/context.h" #include "src/common/log_adapter.h" #include "src/extendrt/model_manager.h" #include "extendrt/cxx_api/model/model_impl.h" diff --git a/mindspore-lite/src/extendrt/cxx_api/model/model_group_impl.h b/mindspore-lite/src/extendrt/cxx_api/model/model_group_impl.h index 1f355d817..94e86c9c5 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model/model_group_impl.h +++ b/mindspore-lite/src/extendrt/cxx_api/model/model_group_impl.h @@ -25,8 +25,8 @@ #include #include #include -#include "include/cxx_api/model_group.h" -#include "include/cxx_api/context.h" +#include "include/api/model_group.h" +#include "include/api/context.h" namespace mindspore { class ModelGroupImpl { diff --git a/mindspore-lite/src/extendrt/cxx_api/model/model_impl.cc b/mindspore-lite/src/extendrt/cxx_api/model/model_impl.cc index 0c8663411..a8c6a2d14 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model/model_impl.cc +++ b/mindspore-lite/src/extendrt/cxx_api/model/model_impl.cc @@ -44,7 +44,7 @@ #include "infer/custom.h" #include "infer/return.h" #include "src/extendrt/model_manager.h" -#include "include/cxx_api/model_group.h" +#include "include/api/model_group.h" #include "src/common/common.h" #include "mindspore/core/include/ir/graph_utils.h" diff --git a/mindspore-lite/src/extendrt/cxx_api/model/model_impl.h b/mindspore-lite/src/extendrt/cxx_api/model/model_impl.h index c3603106d..86c56d957 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model/model_impl.h +++ b/mindspore-lite/src/extendrt/cxx_api/model/model_impl.h @@ -21,17 +21,17 @@ #include #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/graph.h" -#include "include/cxx_api/serialization.h" +#include "include/api/context.h" +#include "include/api/model.h" +#include "include/api/graph.h" +#include "include/api/serialization.h" #include "extendrt/cxx_api/graph/graph_data.h" #include "include/common/utils/utils.h" #include "ir/func_graph.h" #include "extendrt/infer_session.h" #include "src/common/config_infos.h" #include "mindapi/ir/common.h" -#include "include/cxx_api/model_group.h" +#include "include/api/model_group.h" #include "utils/crypto.h" #ifndef _WIN32 diff --git a/mindspore-lite/src/extendrt/cxx_api/model/multi_model_runner.cc b/mindspore-lite/src/extendrt/cxx_api/model/multi_model_runner.cc index 76f356f54..f8cb4cd6e 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model/multi_model_runner.cc +++ b/mindspore-lite/src/extendrt/cxx_api/model/multi_model_runner.cc @@ -14,16 +14,16 @@ * limitations under the License. */ #include "include/api/multi_model_runner.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "extendrt/cxx_api/model/model_impl.h" #include "src/common/config_file.h" #include "src/common/common.h" #include "load_mindir/load_model.h" #include "extendrt/cxx_api/file_utils.h" #include "extendrt/utils/func_graph_utils.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/dual_abi_helper.h" #include "mindspore/core/include/ir/graph_utils.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "src/extendrt/delegate/ascend_acl/ascend_allocator_plugin.h" namespace mindspore { namespace { diff --git a/mindspore-lite/src/extendrt/cxx_api/model_pool/model_parallel_runner.cc b/mindspore-lite/src/extendrt/cxx_api/model_pool/model_parallel_runner.cc index 64d42319f..931736d06 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model_pool/model_parallel_runner.cc +++ b/mindspore-lite/src/extendrt/cxx_api/model_pool/model_parallel_runner.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/model_parallel_runner.h" +#include "include/api/model_parallel_runner.h" #include "src/extendrt/cxx_api/model_pool/model_parallel_runner_impl.h" #include "src/extendrt/cxx_api/model_pool/runner_config.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/extendrt/cxx_api/model_pool/model_parallel_runner_impl.h b/mindspore-lite/src/extendrt/cxx_api/model_pool/model_parallel_runner_impl.h index d1ad67483..7bb53b2d4 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model_pool/model_parallel_runner_impl.h +++ b/mindspore-lite/src/extendrt/cxx_api/model_pool/model_parallel_runner_impl.h @@ -21,7 +21,7 @@ #include #include #include "src/extendrt/cxx_api/model_pool/model_pool.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" namespace mindspore { class ModelParallelRunnerImpl { public: diff --git a/mindspore-lite/src/extendrt/cxx_api/model_pool/model_pool.h b/mindspore-lite/src/extendrt/cxx_api/model_pool/model_pool.h index 79c234094..fe1374e64 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model_pool/model_pool.h +++ b/mindspore-lite/src/extendrt/cxx_api/model_pool/model_pool.h @@ -25,9 +25,9 @@ #include #include #include "src/extendrt/dynamic_mem_allocator.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/model_parallel_runner.h" +#include "include/api/status.h" +#include "include/api/context.h" +#include "include/api/model_parallel_runner.h" #include "src/extendrt/cxx_api/model_pool/model_worker.h" #include "src/extendrt/cxx_api/model_pool/predict_task_queue.h" namespace mindspore { diff --git a/mindspore-lite/src/extendrt/cxx_api/model_pool/model_worker.h b/mindspore-lite/src/extendrt/cxx_api/model_pool/model_worker.h index 2ff7cef95..be9ad0fad 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model_pool/model_worker.h +++ b/mindspore-lite/src/extendrt/cxx_api/model_pool/model_worker.h @@ -24,7 +24,7 @@ #include #include #include -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "src/extendrt/cxx_api/model_pool/predict_task_queue.h" namespace mindspore { class PredictTaskQueue; diff --git a/mindspore-lite/src/extendrt/cxx_api/model_pool/predict_task_queue.h b/mindspore-lite/src/extendrt/cxx_api/model_pool/predict_task_queue.h index 361b6343c..26fd61d66 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model_pool/predict_task_queue.h +++ b/mindspore-lite/src/extendrt/cxx_api/model_pool/predict_task_queue.h @@ -21,8 +21,8 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" +#include "include/api/types.h" +#include "include/api/status.h" #include "src/extendrt/cxx_api/model_pool/model_worker.h" #include "thread/hqueue.h" #ifndef USE_HQUEUE diff --git a/mindspore-lite/src/extendrt/cxx_api/model_pool/resource_manager.cc b/mindspore-lite/src/extendrt/cxx_api/model_pool/resource_manager.cc index 68efd6fea..a22224fda 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model_pool/resource_manager.cc +++ b/mindspore-lite/src/extendrt/cxx_api/model_pool/resource_manager.cc @@ -18,7 +18,7 @@ #include #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/common/log_adapter.h" #include "src/common/utils.h" #include "src/extendrt/numa_adapter.h" diff --git a/mindspore-lite/src/extendrt/cxx_api/model_pool/resource_manager.h b/mindspore-lite/src/extendrt/cxx_api/model_pool/resource_manager.h index 29ba06381..3ddde36a8 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model_pool/resource_manager.h +++ b/mindspore-lite/src/extendrt/cxx_api/model_pool/resource_manager.h @@ -23,7 +23,7 @@ #include #include #include "src/common/log_adapter.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/extendrt/cxx_api/model_pool/model_worker.h" namespace mindspore { class ResourceManager { diff --git a/mindspore-lite/src/extendrt/cxx_api/model_pool/runner_config.h b/mindspore-lite/src/extendrt/cxx_api/model_pool/runner_config.h index 6400dad90..beaeaf5d0 100644 --- a/mindspore-lite/src/extendrt/cxx_api/model_pool/runner_config.h +++ b/mindspore-lite/src/extendrt/cxx_api/model_pool/runner_config.h @@ -19,7 +19,7 @@ #include #include #include -#include "include/cxx_api/model_parallel_runner.h" +#include "include/api/model_parallel_runner.h" namespace mindspore { struct RunnerConfig::Data { int workers_num = 0; diff --git a/mindspore-lite/src/extendrt/cxx_api/serialization.cc b/mindspore-lite/src/extendrt/cxx_api/serialization.cc index c0672db00..d436d7269 100644 --- a/mindspore-lite/src/extendrt/cxx_api/serialization.cc +++ b/mindspore-lite/src/extendrt/cxx_api/serialization.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/serialization.h" +#include "include/api/serialization.h" #include #include #include diff --git a/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_allocator.h b/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_allocator.h index 8e6d5d3a5..7417b0e24 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_allocator.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_allocator.h @@ -21,7 +21,7 @@ #include #include "acl/acl_base.h" #include "acl/acl_rt.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/extendrt/delegate/ascend_acl/ascend_allocator_plugin.h" namespace mindspore { diff --git a/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_env_guard.h b/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_env_guard.h index bd7192f2c..3de39b3dc 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_env_guard.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_env_guard.h @@ -21,7 +21,7 @@ #include #include #include "acl/acl_base.h" -#include "include/cxx_api/visible.h" +#include "include/api/visible.h" namespace mindspore { class AclInitAdapter { diff --git a/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_graph_executor.h b/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_graph_executor.h index 25bedfbc0..5edcfcb61 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_graph_executor.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_graph_executor.h @@ -21,9 +21,9 @@ #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/types.h" #include "extendrt/session/lite_graph_executor.h" #include "common/config_infos.h" #include "src/common/common.h" diff --git a/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_plugin_impl.h b/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_plugin_impl.h index 4ffcfd3d0..09afe6109 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_plugin_impl.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_acl/acl_plugin_impl.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_EXTENDRT_ASCEND_ACL_ACL_PLUGIN_IMPL_H_ #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/common/log_adapter.h" #include "extendrt/delegate/plugin/ascend_acl_executor_plugin.h" #include "extendrt/delegate/ascend_acl/acl_graph_executor.h" diff --git a/mindspore-lite/src/extendrt/delegate/ascend_acl/ascend_allocator_plugin.h b/mindspore-lite/src/extendrt/delegate/ascend_acl/ascend_allocator_plugin.h index 408e256cd..e2cd99ed4 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_acl/ascend_allocator_plugin.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_acl/ascend_allocator_plugin.h @@ -18,7 +18,7 @@ #define delegate_MINDSPORE_LITE_SRC_EXTENDRT_KERNEL_ASCEND_ASCEND_ALLOCATOR_PLUGIN_H_ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" namespace mindspore { class AscendAllocatorPluginImpl { public: diff --git a/mindspore-lite/src/extendrt/delegate/ascend_acl/dyn_shape_process.h b/mindspore-lite/src/extendrt/delegate/ascend_acl/dyn_shape_process.h index c86cf548f..d623ab3c7 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_acl/dyn_shape_process.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_acl/dyn_shape_process.h @@ -21,7 +21,7 @@ #include #include #include "extendrt/delegate/ascend_acl/acl_model_options.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "acl/acl.h" #include "acl/acl_mdl.h" #include "acl/acl_rt.h" diff --git a/mindspore-lite/src/extendrt/delegate/ascend_acl/model_infer.h b/mindspore-lite/src/extendrt/delegate/ascend_acl/model_infer.h index b076a3e5b..ba603d4c2 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_acl/model_infer.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_acl/model_infer.h @@ -22,7 +22,7 @@ #include #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "include/errorcode.h" #include "extendrt/delegate/ascend_acl/model_process.h" diff --git a/mindspore-lite/src/extendrt/delegate/ascend_acl/model_process.h b/mindspore-lite/src/extendrt/delegate/ascend_acl/model_process.h index d51999d8a..e5d1aac8b 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_acl/model_process.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_acl/model_process.h @@ -27,9 +27,9 @@ #include "acl/acl.h" #include "acl/acl_mdl.h" #include "acl/acl_rt.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "include/errorcode.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "extendrt/delegate/ascend_acl/acl_model_options.h" #include "extendrt/delegate/ascend_acl/dyn_shape_process.h" #include "extendrt/delegate/ascend_acl/acl_mem_manager.h" diff --git a/mindspore-lite/src/extendrt/delegate/ascend_ge/aoe_api_tune_process.h b/mindspore-lite/src/extendrt/delegate/ascend_ge/aoe_api_tune_process.h index 9a1d4c041..03e6c2780 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_ge/aoe_api_tune_process.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_ge/aoe_api_tune_process.h @@ -22,7 +22,7 @@ #include #include #include "backend/ge_backend/graph_ir/types.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "cxx_api/model/acl/acl_model_options.h" #include "ge/ge_api.h" diff --git a/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_device_context.cc b/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_device_context.cc index 57d50d75d..e9fdb12d6 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_device_context.cc +++ b/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_device_context.cc @@ -19,8 +19,8 @@ #include #include #include "include/common/utils/scoped_long_running.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" +#include "include/api/context.h" +#include "include/api/status.h" #include "mindspore/ccsrc/include/backend/common/ms_device_shape_transfer.h" #include "backend/ge_backend/graph_ir/utils.h" #include "ge/ge_api.h" diff --git a/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_device_context.h b/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_device_context.h index 45266ac87..620b518f5 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_device_context.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_device_context.h @@ -21,8 +21,8 @@ #include #include "common/config_infos.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" +#include "include/api/context.h" +#include "include/api/status.h" #include "utils/ms_context.h" namespace mindspore { diff --git a/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_dynamic_utils.h b/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_dynamic_utils.h index f0a58b175..75bb61d9b 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_dynamic_utils.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_dynamic_utils.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "include/model.h" #include "backend/ge_backend/graph_ir/types.h" #include "extendrt/session/lite_graph_executor.h" diff --git a/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_graph_executor.h b/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_graph_executor.h index 05cea5e3d..f91ed28eb 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_graph_executor.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_graph_executor.h @@ -23,7 +23,7 @@ #include #include -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "include/model.h" #include "backend/ge_backend/graph_ir/types.h" #include "extendrt/session/lite_graph_executor.h" diff --git a/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_plugin_impl.h b/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_plugin_impl.h index 70fbbfb5c..bb2014fcb 100644 --- a/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_plugin_impl.h +++ b/mindspore-lite/src/extendrt/delegate/ascend_ge/ge_plugin_impl.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_EXTENDRT_ASCEND_GE_GE_PLUGIN_IMPL_H_ #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/common/log_adapter.h" #include "extendrt/delegate/plugin/ascend_ge_executor_plugin.h" #include "extendrt/delegate/ascend_ge/ge_device_context.h" diff --git a/mindspore-lite/src/extendrt/delegate/factory.h b/mindspore-lite/src/extendrt/delegate/factory.h index 0be81e822..03bdf92a4 100644 --- a/mindspore-lite/src/extendrt/delegate/factory.h +++ b/mindspore-lite/src/extendrt/delegate/factory.h @@ -23,7 +23,7 @@ #include "utils/hash_map.h" #include "runtime/hardware_abstract/device_context/device_context.h" #include "src/extendrt/delegate_graph_executor.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "src/common/config_infos.h" namespace mindspore { diff --git a/mindspore-lite/src/extendrt/delegate/graph_executor/litert/func_graph_reuse_manager.h b/mindspore-lite/src/extendrt/delegate/graph_executor/litert/func_graph_reuse_manager.h index d27c3d710..78f52e487 100644 --- a/mindspore-lite/src/extendrt/delegate/graph_executor/litert/func_graph_reuse_manager.h +++ b/mindspore-lite/src/extendrt/delegate/graph_executor/litert/func_graph_reuse_manager.h @@ -23,7 +23,7 @@ #include #include #include "base/base.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/common/helper/infer_helpers.h" #include "src/extendrt/session/lite_graph_executor.h" namespace mindspore { diff --git a/mindspore-lite/src/extendrt/delegate/graph_executor/litert/graph_executor.h b/mindspore-lite/src/extendrt/delegate/graph_executor/litert/graph_executor.h index 06c0c8a88..9c54929c9 100644 --- a/mindspore-lite/src/extendrt/delegate/graph_executor/litert/graph_executor.h +++ b/mindspore-lite/src/extendrt/delegate/graph_executor/litert/graph_executor.h @@ -24,7 +24,7 @@ #include "extendrt/session/lite_graph_executor.h" #include "schema/inner/model_generated.h" #include "runtime/hardware_abstract/device_context/device_context.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "include/model.h" #include "src/litert/lite_session.h" #include "src/common/helper/infer_helpers.h" diff --git a/mindspore-lite/src/extendrt/delegate/graph_executor/litert/litert_plugin_impl.h b/mindspore-lite/src/extendrt/delegate/graph_executor/litert/litert_plugin_impl.h index 1253d2fdf..57008cc2c 100644 --- a/mindspore-lite/src/extendrt/delegate/graph_executor/litert/litert_plugin_impl.h +++ b/mindspore-lite/src/extendrt/delegate/graph_executor/litert/litert_plugin_impl.h @@ -15,7 +15,7 @@ */ #ifndef MINDSPORE_LITE_SRC_EXTENDRT_DELEGATE_GRAPH_EXECUTOR_LITERT_GRAPH_EXECUTO_LITERT_PLUGIN_IMPL_H_ #define MINDSPORE_LITE_SRC_EXTENDRT_DELEGATE_GRAPH_EXECUTOR_LITERT_GRAPH_EXECUTO_LITERT_PLUGIN_IMPL_H_ -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/common/log_adapter.h" #include "extendrt/delegate/plugin/litert_executor_plugin.h" diff --git a/mindspore-lite/src/extendrt/delegate/plugin/ascend_acl_executor_plugin.h b/mindspore-lite/src/extendrt/delegate/plugin/ascend_acl_executor_plugin.h index 221752f28..58816fa88 100644 --- a/mindspore-lite/src/extendrt/delegate/plugin/ascend_acl_executor_plugin.h +++ b/mindspore-lite/src/extendrt/delegate/plugin/ascend_acl_executor_plugin.h @@ -18,8 +18,8 @@ #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" +#include "include/api/context.h" +#include "include/api/status.h" namespace mindspore::lite { class AscendAclExecutorPluginImplBase { diff --git a/mindspore-lite/src/extendrt/delegate/plugin/ascend_ge_executor_plugin.h b/mindspore-lite/src/extendrt/delegate/plugin/ascend_ge_executor_plugin.h index 0ef3a18ca..04bb8c164 100644 --- a/mindspore-lite/src/extendrt/delegate/plugin/ascend_ge_executor_plugin.h +++ b/mindspore-lite/src/extendrt/delegate/plugin/ascend_ge_executor_plugin.h @@ -18,8 +18,8 @@ #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" +#include "include/api/context.h" +#include "include/api/status.h" #include "src/common/log_adapter.h" #include "mindapi/base/macros.h" #include "base/base.h" diff --git a/mindspore-lite/src/extendrt/delegate/plugin/litert_executor_plugin.h b/mindspore-lite/src/extendrt/delegate/plugin/litert_executor_plugin.h index 6f522f1b2..1875964fa 100644 --- a/mindspore-lite/src/extendrt/delegate/plugin/litert_executor_plugin.h +++ b/mindspore-lite/src/extendrt/delegate/plugin/litert_executor_plugin.h @@ -15,7 +15,7 @@ */ #ifndef MINDSPORE_LITE_SRC_EXTENDRT_LITERT_EXECUTOR_PLUGIN_H_ #define MINDSPORE_LITE_SRC_EXTENDRT_LITERT_EXECUTOR_PLUGIN_H_ -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/common/log_adapter.h" #include "mindapi/base/macros.h" diff --git a/mindspore-lite/src/extendrt/delegate_graph_executor.h b/mindspore-lite/src/extendrt/delegate_graph_executor.h index 87f62b506..b38b233f7 100644 --- a/mindspore-lite/src/extendrt/delegate_graph_executor.h +++ b/mindspore-lite/src/extendrt/delegate_graph_executor.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_EXTENDRT_DELEGATE_GRAPH_EXECUTOR_H_ #include #include -#include "include/cxx_api/delegate_api.h" +#include "include/api/delegate_api.h" #include "ir/func_graph.h" #include "ir/anf.h" #include "runtime/hardware_abstract/device_context/device_context.h" diff --git a/mindspore-lite/src/extendrt/dynamic_mem_allocator.h b/mindspore-lite/src/extendrt/dynamic_mem_allocator.h index 80174b4b6..e6e806726 100644 --- a/mindspore-lite/src/extendrt/dynamic_mem_allocator.h +++ b/mindspore-lite/src/extendrt/dynamic_mem_allocator.h @@ -21,7 +21,7 @@ #include #include #include -#include "include/cxx_api/allocator.h" +#include "include/api/allocator.h" #include "src/extendrt/dynamic_mem_manager.h" namespace mindspore { diff --git a/mindspore-lite/src/extendrt/graph_scheduler.h b/mindspore-lite/src/extendrt/graph_scheduler.h index e8b00ee88..4870615a9 100644 --- a/mindspore-lite/src/extendrt/graph_scheduler.h +++ b/mindspore-lite/src/extendrt/graph_scheduler.h @@ -19,10 +19,10 @@ #include #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/graph.h" -#include "include/cxx_api/status.h" +#include "include/api/context.h" +#include "include/api/model.h" +#include "include/api/graph.h" +#include "include/api/status.h" #include "include/common/utils/utils.h" #include "ir/func_graph.h" #include "src/executor/kernel_exec.h" diff --git a/mindspore-lite/src/extendrt/infer_session.h b/mindspore-lite/src/extendrt/infer_session.h index 4afc34f90..b2e36b7cc 100644 --- a/mindspore-lite/src/extendrt/infer_session.h +++ b/mindspore-lite/src/extendrt/infer_session.h @@ -19,10 +19,10 @@ #include #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/graph.h" -#include "include/cxx_api/status.h" +#include "include/api/context.h" +#include "include/api/model.h" +#include "include/api/graph.h" +#include "include/api/status.h" #include "include/common/utils/utils.h" #include "ir/func_graph.h" #include "extendrt/session/type.h" diff --git a/mindspore-lite/src/extendrt/mindir_loader/abstract_kernel.h b/mindspore-lite/src/extendrt/mindir_loader/abstract_kernel.h index 8373f20b2..4421ed11e 100644 --- a/mindspore-lite/src/extendrt/mindir_loader/abstract_kernel.h +++ b/mindspore-lite/src/extendrt/mindir_loader/abstract_kernel.h @@ -19,7 +19,7 @@ #include -#include "include/cxx_api/kernel.h" +#include "include/api/kernel.h" #include "src/tensor.h" using mindspore::kernel::Kernel; diff --git a/mindspore-lite/src/extendrt/mindir_loader/mindir_model/inner_kernel.h b/mindspore-lite/src/extendrt/mindir_loader/mindir_model/inner_kernel.h index b27b62e35..488328e12 100644 --- a/mindspore-lite/src/extendrt/mindir_loader/mindir_model/inner_kernel.h +++ b/mindspore-lite/src/extendrt/mindir_loader/mindir_model/inner_kernel.h @@ -23,7 +23,7 @@ #include "src/tensor.h" #include "include/errorcode.h" -#include "include/cxx_api/kernel.h" +#include "include/api/kernel.h" #include "src/litert/inner_context.h" #include "runtime/hardware_abstract/kernel_base/kernel.h" #include "extendrt/mindir_loader/abstract_kernel.h" diff --git a/mindspore-lite/src/extendrt/mindir_loader/mindir_model/mindir_model_util.h b/mindspore-lite/src/extendrt/mindir_loader/mindir_model/mindir_model_util.h index 50d2806b9..80a7974c8 100644 --- a/mindspore-lite/src/extendrt/mindir_loader/mindir_model/mindir_model_util.h +++ b/mindspore-lite/src/extendrt/mindir_loader/mindir_model/mindir_model_util.h @@ -21,7 +21,7 @@ #include "ir/anf.h" #include "mindapi/base/type_id.h" #include "proto/mind_ir.pb.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" namespace mindspore::infer::mindir { class MindirModelUtil { diff --git a/mindspore-lite/src/extendrt/mock/lite_runtime/converters.h b/mindspore-lite/src/extendrt/mock/lite_runtime/converters.h index 04b94c211..e8943835e 100644 --- a/mindspore-lite/src/extendrt/mock/lite_runtime/converters.h +++ b/mindspore-lite/src/extendrt/mock/lite_runtime/converters.h @@ -19,9 +19,9 @@ #include #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/cfg.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/cfg.h" #include "include/train/train_cfg.h" #include "src/litert/inner_context.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/extendrt/model_manager.cc b/mindspore-lite/src/extendrt/model_manager.cc index 3a84b06b9..4125df261 100644 --- a/mindspore-lite/src/extendrt/model_manager.cc +++ b/mindspore-lite/src/extendrt/model_manager.cc @@ -19,7 +19,7 @@ #include #include #include -#include "include/cxx_api/model_group.h" +#include "include/api/model_group.h" namespace mindspore { bool JudgeMergeFlag(ModelGroupFlag input_flag, ModelGroupFlag cur_flag) { diff --git a/mindspore-lite/src/extendrt/model_manager.h b/mindspore-lite/src/extendrt/model_manager.h index 6f870849d..6ddd361dc 100644 --- a/mindspore-lite/src/extendrt/model_manager.h +++ b/mindspore-lite/src/extendrt/model_manager.h @@ -23,7 +23,7 @@ #include #include #include -#include "include/cxx_api/model_group.h" +#include "include/api/model_group.h" namespace mindspore { class ModelManager { diff --git a/mindspore-lite/src/extendrt/session/factory.h b/mindspore-lite/src/extendrt/session/factory.h index a0f12e904..d0809e797 100644 --- a/mindspore-lite/src/extendrt/session/factory.h +++ b/mindspore-lite/src/extendrt/session/factory.h @@ -21,7 +21,7 @@ #include "extendrt/session/type.h" #include "extendrt/infer_session.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" namespace mindspore { using InferSessionRegFunc = std::function(const std::shared_ptr &, const ConfigInfos &)>; diff --git a/mindspore-lite/src/extendrt/session/lite_graph_executor.h b/mindspore-lite/src/extendrt/session/lite_graph_executor.h index 1f5e4f7f0..99610698b 100644 --- a/mindspore-lite/src/extendrt/session/lite_graph_executor.h +++ b/mindspore-lite/src/extendrt/session/lite_graph_executor.h @@ -21,9 +21,9 @@ #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "runtime/hardware_abstract/device_context/device_context.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" namespace mindspore { /// \brief Adaptive Graph Executor for cloud Graph Executor to solve interface conflicts. diff --git a/mindspore-lite/src/extendrt/utils/func_graph_utils.h b/mindspore-lite/src/extendrt/utils/func_graph_utils.h index 62b3d6037..a15ecd71f 100644 --- a/mindspore-lite/src/extendrt/utils/func_graph_utils.h +++ b/mindspore-lite/src/extendrt/utils/func_graph_utils.h @@ -27,9 +27,9 @@ #include "ir/anf.h" #include "ir/dtype/type.h" #include "ir/func_graph.h" -#include "include/cxx_api/data_type.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" +#include "include/api/data_type.h" +#include "include/api/types.h" +#include "include/api/status.h" #include "runtime/hardware_abstract/kernel_base/kernel.h" #include "include/common/utils/anfalgo.h" diff --git a/mindspore-lite/src/extendrt/utils/serialization.cc b/mindspore-lite/src/extendrt/utils/serialization.cc index e2c1ccb41..01521fd4e 100644 --- a/mindspore-lite/src/extendrt/utils/serialization.cc +++ b/mindspore-lite/src/extendrt/utils/serialization.cc @@ -24,7 +24,7 @@ #endif #include "utils/crypto.h" #include "extendrt/cxx_api/file_utils.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "src/common/crypto.h" namespace mindspore::infer { diff --git a/mindspore-lite/src/extendrt/utils/serialization.h b/mindspore-lite/src/extendrt/utils/serialization.h index 126d7b2da..5af057949 100644 --- a/mindspore-lite/src/extendrt/utils/serialization.h +++ b/mindspore-lite/src/extendrt/utils/serialization.h @@ -20,11 +20,11 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/graph.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/status.h" +#include "include/api/types.h" +#include "include/api/model.h" +#include "include/api/graph.h" +#include "include/api/dual_abi_helper.h" #include "base/base.h" namespace mindspore::infer { diff --git a/mindspore-lite/src/extendrt/utils/tensor_default_impl.h b/mindspore-lite/src/extendrt/utils/tensor_default_impl.h index 22449f7f1..238b3fd04 100644 --- a/mindspore-lite/src/extendrt/utils/tensor_default_impl.h +++ b/mindspore-lite/src/extendrt/utils/tensor_default_impl.h @@ -25,7 +25,7 @@ #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "ir/tensor.h" #include "ir/device_address.h" #include "common/utils.h" diff --git a/mindspore-lite/src/extendrt/utils/tensor_utils.h b/mindspore-lite/src/extendrt/utils/tensor_utils.h index e7a6e669c..b1c98d50f 100644 --- a/mindspore-lite/src/extendrt/utils/tensor_utils.h +++ b/mindspore-lite/src/extendrt/utils/tensor_utils.h @@ -24,7 +24,7 @@ #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "ir/tensor.h" #include "ir/device_address.h" #include "common/utils.h" diff --git a/mindspore-lite/src/infer/executor.h b/mindspore-lite/src/infer/executor.h index f98512909..caf090710 100644 --- a/mindspore-lite/src/infer/executor.h +++ b/mindspore-lite/src/infer/executor.h @@ -20,7 +20,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "infer/tensor.h" namespace mindspore::infer::abstract { diff --git a/mindspore-lite/src/infer/graph_runtime.h b/mindspore-lite/src/infer/graph_runtime.h index b44d109dc..c3688952e 100644 --- a/mindspore-lite/src/infer/graph_runtime.h +++ b/mindspore-lite/src/infer/graph_runtime.h @@ -19,7 +19,7 @@ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "infer/executor.h" #include "infer/execution_plan.h" #include "infer/kernel_callback.h" diff --git a/mindspore-lite/src/litert/c_api/context_c.cc b/mindspore-lite/src/litert/c_api/context_c.cc index dc494a3db..c2390017f 100644 --- a/mindspore-lite/src/litert/c_api/context_c.cc +++ b/mindspore-lite/src/litert/c_api/context_c.cc @@ -16,7 +16,7 @@ #include "src/litert/c_api/context_c.h" #include "include/c_api/context_c.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "src/common/log_adapter.h" // ================ Context ================ diff --git a/mindspore-lite/src/litert/c_api/model_c.cc b/mindspore-lite/src/litert/c_api/model_c.cc index 31c82fead..b27b2dde5 100644 --- a/mindspore-lite/src/litert/c_api/model_c.cc +++ b/mindspore-lite/src/litert/c_api/model_c.cc @@ -16,9 +16,9 @@ #include "include/c_api/model_c.h" #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/serialization.h" -#include "include/cxx_api/types.h" +#include "include/api/context.h" +#include "include/api/serialization.h" +#include "include/api/types.h" #include "src/litert/cxx_api/tensor/tensor_impl.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/c_api/tensor_c.cc b/mindspore-lite/src/litert/c_api/tensor_c.cc index 88d732f7e..0e600ce0a 100644 --- a/mindspore-lite/src/litert/c_api/tensor_c.cc +++ b/mindspore-lite/src/litert/c_api/tensor_c.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "include/c_api/tensor_c.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/tensor.h" #include "src/litert/cxx_api/tensor/tensor_impl.h" #include "src/litert/inner_allocator.h" diff --git a/mindspore-lite/src/litert/cxx_api/callback/callback_adapter.h b/mindspore-lite/src/litert/cxx_api/callback/callback_adapter.h index 0c437e5a8..f3be8c47d 100644 --- a/mindspore-lite/src/litert/cxx_api/callback/callback_adapter.h +++ b/mindspore-lite/src/litert/cxx_api/callback/callback_adapter.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_CXX_API_CALLBACK_CALLBACK_ADAPTER_H_ #define MINDSPORE_LITE_SRC_RUNTIME_CXX_API_CALLBACK_CALLBACK_ADAPTER_H_ -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "include/train/train_loop_callback.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/cxx_api/callback/ckpt_saver.cc b/mindspore-lite/src/litert/cxx_api/callback/ckpt_saver.cc index 5eb94a415..6ed26cf59 100644 --- a/mindspore-lite/src/litert/cxx_api/callback/ckpt_saver.cc +++ b/mindspore-lite/src/litert/cxx_api/callback/ckpt_saver.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/callback/ckpt_saver.h" +#include "include/api/callback/ckpt_saver.h" #include #include #include diff --git a/mindspore-lite/src/litert/cxx_api/callback/loss_monitor.cc b/mindspore-lite/src/litert/cxx_api/callback/loss_monitor.cc index 35a50d709..6094143bb 100644 --- a/mindspore-lite/src/litert/cxx_api/callback/loss_monitor.cc +++ b/mindspore-lite/src/litert/cxx_api/callback/loss_monitor.cc @@ -18,7 +18,7 @@ #include #include #include "include/train/loss_monitor.h" -#include "include/cxx_api/callback/loss_monitor.h" +#include "include/api/callback/loss_monitor.h" #include "src/litert/cxx_api/callback/callback_impl.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/cxx_api/callback/lr_scheduler.cc b/mindspore-lite/src/litert/cxx_api/callback/lr_scheduler.cc index a886c96cc..527f16039 100644 --- a/mindspore-lite/src/litert/cxx_api/callback/lr_scheduler.cc +++ b/mindspore-lite/src/litert/cxx_api/callback/lr_scheduler.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/callback/lr_scheduler.h" +#include "include/api/callback/lr_scheduler.h" #include #include #include diff --git a/mindspore-lite/src/litert/cxx_api/callback/train_accuracy.cc b/mindspore-lite/src/litert/cxx_api/callback/train_accuracy.cc index e2685c745..7081d04cc 100644 --- a/mindspore-lite/src/litert/cxx_api/callback/train_accuracy.cc +++ b/mindspore-lite/src/litert/cxx_api/callback/train_accuracy.cc @@ -18,7 +18,7 @@ #include #include #include "include/train/classification_train_accuracy_monitor.h" -#include "include/cxx_api/callback/train_accuracy.h" +#include "include/api/callback/train_accuracy.h" #include "src/litert/cxx_api/callback/callback_impl.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/cxx_api/cell.cc b/mindspore-lite/src/litert/cxx_api/cell.cc index 791b56579..3773a1be0 100644 --- a/mindspore-lite/src/litert/cxx_api/cell.cc +++ b/mindspore-lite/src/litert/cxx_api/cell.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/cxx_api/cell.h" +#include "include/api/cell.h" #include "src/common/log_adapter.h" namespace mindspore { @@ -24,7 +24,7 @@ std::vector CellBase::operator()(const std::vector &inputs) const return empty; } -GraphCell::GraphCell(const Graph &graph) : graph_(std::shared_ptr(new (std::nothrow) Graph(graph))) { +GraphCell::GraphCell(const Graph &graph) : graph_(std::shared_ptr(new(std::nothrow) Graph(graph))) { if (graph_ == nullptr) { MS_LOG(ERROR) << "Invalid graph."; } @@ -36,7 +36,7 @@ GraphCell::GraphCell(const std::shared_ptr &graph) : graph_(graph) { } } -GraphCell::GraphCell(Graph &&graph) : graph_(std::shared_ptr(new (std::nothrow) Graph(graph))) { +GraphCell::GraphCell(Graph &&graph) : graph_(std::shared_ptr(new(std::nothrow) Graph(graph))) { if (graph_ == nullptr) { MS_LOG(ERROR) << "Invalid graph."; } diff --git a/mindspore-lite/src/litert/cxx_api/context.cc b/mindspore-lite/src/litert/cxx_api/context.cc index 6f6cc7f89..435ab537d 100644 --- a/mindspore-lite/src/litert/cxx_api/context.cc +++ b/mindspore-lite/src/litert/cxx_api/context.cc @@ -16,8 +16,8 @@ #include "src/litert/cxx_api/context.h" #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/data_type.h" +#include "include/api/types.h" +#include "include/api/data_type.h" #include "include/lite_types.h" #include "src/litert/inner_allocator.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/cxx_api/context.h b/mindspore-lite/src/litert/cxx_api/context.h index be605ca43..0923d1a41 100644 --- a/mindspore-lite/src/litert/cxx_api/context.h +++ b/mindspore-lite/src/litert/cxx_api/context.h @@ -26,8 +26,8 @@ #else #include #endif -#include "include/cxx_api/context.h" -#include "include/cxx_api/delegate.h" +#include "include/api/context.h" +#include "include/api/delegate.h" namespace mindspore { struct Context::Data { diff --git a/mindspore-lite/src/litert/cxx_api/converters.h b/mindspore-lite/src/litert/cxx_api/converters.h index ccae58a16..b19d7c0ec 100644 --- a/mindspore-lite/src/litert/cxx_api/converters.h +++ b/mindspore-lite/src/litert/cxx_api/converters.h @@ -19,9 +19,9 @@ #include #include #include -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/cfg.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/cfg.h" #include "include/train/train_cfg.h" #include "src/litert/inner_context.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/cxx_api/graph/graph.cc b/mindspore-lite/src/litert/cxx_api/graph/graph.cc index cf461624a..5c1567ccf 100644 --- a/mindspore-lite/src/litert/cxx_api/graph/graph.cc +++ b/mindspore-lite/src/litert/cxx_api/graph/graph.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "include/cxx_api/graph.h" -#include "include/cxx_api/cell.h" +#include "include/api/graph.h" +#include "include/api/cell.h" #include "src/litert/cxx_api/graph/graph_data.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/cxx_api/graph/graph_data.h b/mindspore-lite/src/litert/cxx_api/graph/graph_data.h index 86bd0e508..040a90c9e 100644 --- a/mindspore-lite/src/litert/cxx_api/graph/graph_data.h +++ b/mindspore-lite/src/litert/cxx_api/graph/graph_data.h @@ -21,8 +21,8 @@ #include #include #include -#include "include/cxx_api/graph.h" -#include "include/cxx_api/types.h" +#include "include/api/graph.h" +#include "include/api/types.h" #include "src/litert/lite_model.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/cxx_api/kernel.cc b/mindspore-lite/src/litert/cxx_api/kernel.cc index 0c40aa9b0..9d321b24b 100644 --- a/mindspore-lite/src/litert/cxx_api/kernel.cc +++ b/mindspore-lite/src/litert/cxx_api/kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/kernel.h" +#include "include/api/kernel.h" #include "include/errorcode.h" #include "src/registry/kernel_interface_registry.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/cxx_api/kernel_executor/custom_om_infer.cc b/mindspore-lite/src/litert/cxx_api/kernel_executor/custom_om_infer.cc index 171319831..14f49ac97 100644 --- a/mindspore-lite/src/litert/cxx_api/kernel_executor/custom_om_infer.cc +++ b/mindspore-lite/src/litert/cxx_api/kernel_executor/custom_om_infer.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "include/registry/register_kernel_interface.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/cxx_api/kernel_executor/kernel_executor.h b/mindspore-lite/src/litert/cxx_api/kernel_executor/kernel_executor.h index 9818561cb..8a2cde46f 100644 --- a/mindspore-lite/src/litert/cxx_api/kernel_executor/kernel_executor.h +++ b/mindspore-lite/src/litert/cxx_api/kernel_executor/kernel_executor.h @@ -19,9 +19,9 @@ #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/context.h" +#include "include/api/types.h" +#include "include/api/status.h" +#include "include/api/context.h" #include "ops/base_operator.h" #include "infer/custom.h" diff --git a/mindspore-lite/src/litert/cxx_api/kernel_executor/op_converter.h b/mindspore-lite/src/litert/cxx_api/kernel_executor/op_converter.h index 09af1901f..0de55ede9 100644 --- a/mindspore-lite/src/litert/cxx_api/kernel_executor/op_converter.h +++ b/mindspore-lite/src/litert/cxx_api/kernel_executor/op_converter.h @@ -21,7 +21,7 @@ #include #include "ops/base_operator.h" #include "src/common/log_adapter.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" namespace mindspore { namespace lite { diff --git a/mindspore-lite/src/litert/cxx_api/metrics/accuracy.cc b/mindspore-lite/src/litert/cxx_api/metrics/accuracy.cc index b78a4d7b4..d24d880bc 100644 --- a/mindspore-lite/src/litert/cxx_api/metrics/accuracy.cc +++ b/mindspore-lite/src/litert/cxx_api/metrics/accuracy.cc @@ -18,7 +18,7 @@ #include #include #include "include/train/accuracy_metrics.h" -#include "include/cxx_api/metrics/accuracy.h" +#include "include/api/metrics/accuracy.h" #include "src/litert/cxx_api/metrics/metrics_impl.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/cxx_api/metrics/metrics_impl.h b/mindspore-lite/src/litert/cxx_api/metrics/metrics_impl.h index da12bb111..6c984a7f4 100644 --- a/mindspore-lite/src/litert/cxx_api/metrics/metrics_impl.h +++ b/mindspore-lite/src/litert/cxx_api/metrics/metrics_impl.h @@ -24,7 +24,7 @@ #include #include #include -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "include/train/metrics.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/cxx_api/model/model.cc b/mindspore-lite/src/litert/cxx_api/model/model.cc index 4e5d40567..ea5aed467 100644 --- a/mindspore-lite/src/litert/cxx_api/model/model.cc +++ b/mindspore-lite/src/litert/cxx_api/model/model.cc @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include #ifdef GPU_TENSORRT #include #endif #include "flatbuffers/flatbuffers.h" -#include "include/cxx_api/callback/callback.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/serialization.h" -#include "include/cxx_api/graph.h" +#include "include/api/callback/callback.h" +#include "include/api/context.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/types.h" +#include "include/api/serialization.h" +#include "include/api/graph.h" #include "src/common/log_adapter.h" #if defined(ENABLE_PRE_INFERENCE) && defined(__linux__) && !defined(Debug) #include "src/common/thread_utils.h" diff --git a/mindspore-lite/src/litert/cxx_api/model/model_group.cc b/mindspore-lite/src/litert/cxx_api/model/model_group.cc index ef5a15e43..6de883a6e 100755 --- a/mindspore-lite/src/litert/cxx_api/model/model_group.cc +++ b/mindspore-lite/src/litert/cxx_api/model/model_group.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "include/cxx_api/model_group.h" +#include "include/api/model_group.h" #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/types.h" +#include "include/api/context.h" +#include "include/api/dual_abi_helper.h" #include "src/litert/cxx_api/model/model_group_impl.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/cxx_api/model/model_group_impl.cc b/mindspore-lite/src/litert/cxx_api/model/model_group_impl.cc index 8e2b1a3f8..e915e57d3 100755 --- a/mindspore-lite/src/litert/cxx_api/model/model_group_impl.cc +++ b/mindspore-lite/src/litert/cxx_api/model/model_group_impl.cc @@ -21,8 +21,8 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" +#include "include/api/types.h" +#include "include/api/context.h" #include "src/litert/cxx_api/converters.h" #include "src/common/log_adapter.h" #include "src/litert/lite_session.h" diff --git a/mindspore-lite/src/litert/cxx_api/model/model_group_impl.h b/mindspore-lite/src/litert/cxx_api/model/model_group_impl.h index 35e3cca97..d93721df1 100644 --- a/mindspore-lite/src/litert/cxx_api/model/model_group_impl.h +++ b/mindspore-lite/src/litert/cxx_api/model/model_group_impl.h @@ -24,8 +24,8 @@ #include #include #include -#include "include/cxx_api/model_group.h" -#include "include/cxx_api/context.h" +#include "include/api/model_group.h" +#include "include/api/context.h" #include "src/litert/lite_session.h" #include "src/litert/inner_context.h" diff --git a/mindspore-lite/src/litert/cxx_api/model/model_impl.cc b/mindspore-lite/src/litert/cxx_api/model/model_impl.cc index bc2533ce6..272c01ddc 100644 --- a/mindspore-lite/src/litert/cxx_api/model/model_impl.cc +++ b/mindspore-lite/src/litert/cxx_api/model/model_impl.cc @@ -22,8 +22,8 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" +#include "include/api/types.h" +#include "include/api/context.h" #include "src/litert/inner_allocator.h" #include "src/litert/cxx_api/converters.h" #include "src/litert/cxx_api/graph/graph_data.h" diff --git a/mindspore-lite/src/litert/cxx_api/model/model_impl.h b/mindspore-lite/src/litert/cxx_api/model/model_impl.h index e0d936091..f8943afcb 100644 --- a/mindspore-lite/src/litert/cxx_api/model/model_impl.h +++ b/mindspore-lite/src/litert/cxx_api/model/model_impl.h @@ -24,9 +24,9 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/cell.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/cell.h" #include "src/litert/cxx_api/graph/graph_data.h" #include "src/litert/inner_context.h" #include "src/litert/lite_session.h" diff --git a/mindspore-lite/src/litert/cxx_api/serialization.cc b/mindspore-lite/src/litert/cxx_api/serialization.cc index d1fada3fe..1bc33a699 100644 --- a/mindspore-lite/src/litert/cxx_api/serialization.cc +++ b/mindspore-lite/src/litert/cxx_api/serialization.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "include/cxx_api/serialization.h" +#include "include/api/serialization.h" #include #include -#include "include/cxx_api/graph.h" -#include "include/cxx_api/types.h" +#include "include/api/graph.h" +#include "include/api/types.h" #include "include/model.h" #include "src/litert/cxx_api/graph/graph_data.h" #include "src/litert/cxx_api/model/model_impl.h" diff --git a/mindspore-lite/src/litert/cxx_api/tensor/tensor_impl.h b/mindspore-lite/src/litert/cxx_api/tensor/tensor_impl.h index 346c54988..fccabd864 100644 --- a/mindspore-lite/src/litert/cxx_api/tensor/tensor_impl.h +++ b/mindspore-lite/src/litert/cxx_api/tensor/tensor_impl.h @@ -24,8 +24,8 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" +#include "include/api/types.h" +#include "include/api/status.h" #include "include/errorcode.h" #include "src/tensor.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/cxx_api/tensor_utils.h b/mindspore-lite/src/litert/cxx_api/tensor_utils.h index 49f9cdb03..b7ee8d908 100644 --- a/mindspore-lite/src/litert/cxx_api/tensor_utils.h +++ b/mindspore-lite/src/litert/cxx_api/tensor_utils.h @@ -22,7 +22,7 @@ #include #include "ir/dtype/type_id.h" #include "src/tensor.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "src/litert/cxx_api/tensor/tensor_impl.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/cxx_api/train/converters.cc b/mindspore-lite/src/litert/cxx_api/train/converters.cc index b923eda4d..8c49337d0 100644 --- a/mindspore-lite/src/litert/cxx_api/train/converters.cc +++ b/mindspore-lite/src/litert/cxx_api/train/converters.cc @@ -15,7 +15,7 @@ */ #include "src/litert/cxx_api/converters.h" #include "include/train/train_cfg.h" -#include "include/cxx_api/cfg.h" +#include "include/api/cfg.h" #include "src/common/log_adapter.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/cxx_api/train/model.cc b/mindspore-lite/src/litert/cxx_api/train/model.cc index 213ad069a..7ac2c3c15 100644 --- a/mindspore-lite/src/litert/cxx_api/train/model.cc +++ b/mindspore-lite/src/litert/cxx_api/train/model.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "include/cxx_api/model.h" -#include "include/cxx_api/callback/callback.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/model.h" +#include "include/api/callback/callback.h" +#include "include/api/dual_abi_helper.h" #include "src/litert/cxx_api/model/model_impl.h" #include "src/litert/cxx_api/callback/callback_impl.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/cxx_api/train/model_build.cc b/mindspore-lite/src/litert/cxx_api/train/model_build.cc index f11c5c3ed..6ec79777d 100644 --- a/mindspore-lite/src/litert/cxx_api/train/model_build.cc +++ b/mindspore-lite/src/litert/cxx_api/train/model_build.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "src/common/log_adapter.h" #include "src/litert/cxx_api/model/model_impl.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/cxx_api/train/model_impl.cc b/mindspore-lite/src/litert/cxx_api/train/model_impl.cc index 02fe2ffe7..726b0585f 100644 --- a/mindspore-lite/src/litert/cxx_api/train/model_impl.cc +++ b/mindspore-lite/src/litert/cxx_api/train/model_impl.cc @@ -17,9 +17,9 @@ #include "src/litert/cxx_api/model/model_impl.h" #include #include -#include "include/cxx_api/serialization.h" -#include "include/cxx_api/callback/callback.h" -#include "include/cxx_api/metrics/metrics.h" +#include "include/api/serialization.h" +#include "include/api/callback/callback.h" +#include "include/api/metrics/metrics.h" #include "src/litert/cxx_api/converters.h" #include "src/litert/cxx_api/metrics/metrics_adapter.h" #include "src/litert/cxx_api/metrics/metrics_impl.h" diff --git a/mindspore-lite/src/litert/cxx_api/train/train_support.cc b/mindspore-lite/src/litert/cxx_api/train/train_support.cc index f178cac33..13c68a3b5 100644 --- a/mindspore-lite/src/litert/cxx_api/train/train_support.cc +++ b/mindspore-lite/src/litert/cxx_api/train/train_support.cc @@ -17,11 +17,11 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/dual_abi_helper.h" -#include "include/cxx_api/callback/callback.h" -#include "include/cxx_api/metrics/metrics.h" +#include "include/api/types.h" +#include "include/api/context.h" +#include "include/api/dual_abi_helper.h" +#include "include/api/callback/callback.h" +#include "include/api/metrics/metrics.h" #include "src/litert/lite_model.h" #include "src/litert/inner_context.h" #include "src/litert/inner_allocator.h" diff --git a/mindspore-lite/src/litert/cxx_api/types.cc b/mindspore-lite/src/litert/cxx_api/types.cc index 00636b9b9..dab419444 100644 --- a/mindspore-lite/src/litert/cxx_api/types.cc +++ b/mindspore-lite/src/litert/cxx_api/types.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/dual_abi_helper.h" +#include "include/api/status.h" +#include "include/api/dual_abi_helper.h" #include "src/litert/cxx_api/tensor/tensor_impl.h" #include "src/litert/cxx_api/tensor_utils.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/delegate/coreml/coreml_delegate.h b/mindspore-lite/src/litert/delegate/coreml/coreml_delegate.h index 12f741777..4a2d66611 100644 --- a/mindspore-lite/src/litert/delegate/coreml/coreml_delegate.h +++ b/mindspore-lite/src/litert/delegate/coreml/coreml_delegate.h @@ -19,7 +19,7 @@ #include #include -#include "include/cxx_api/delegate.h" +#include "include/api/delegate.h" #include "src/litert/delegate/coreml/op/coreml_op.h" #include "src/litert/delegate/coreml/pass/coreml_pass_manager.h" diff --git a/mindspore-lite/src/litert/delegate/coreml/coreml_executor.h b/mindspore-lite/src/litert/delegate/coreml/coreml_executor.h index 62422763a..f41676c29 100644 --- a/mindspore-lite/src/litert/delegate/coreml/coreml_executor.h +++ b/mindspore-lite/src/litert/delegate/coreml/coreml_executor.h @@ -1,18 +1,18 @@ /** -* Copyright 2022 Huawei Technologies 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. -*/ + * Copyright 2022 Huawei Technologies 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. + */ #ifndef MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_COREML_COREML_EXECUTOR_H_ #define MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_COREML_COREML_EXECUTOR_H_ @@ -20,18 +20,19 @@ #import #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" constexpr int kNum12 = 12; API_AVAILABLE(ios(kNum12)) @interface MSFeatureProvider : NSObject { - const std::vector* _ms_tensors; - NSSet* _featureNames; + const std::vector *_ms_tensors; + NSSet *_featureNames; } -- (instancetype)initWithMSTensor:(const std::vector*)inputs - coreMLVersion:(int)coreMLVersion; +- (instancetype)initWithMSTensor: + (const std::vector *)inputs + coreMLVersion:(int)coreMLVersion; - (MLFeatureValue *)featureValueForName:(NSString *)featureName; @property(nonatomic, readonly) NSSet *featureNames; @end @@ -39,12 +40,12 @@ API_AVAILABLE(ios(kNum12)) API_AVAILABLE(ios(kNum12)) @interface CoreMLExecutor : NSObject -- (bool)run:(const std::vector&)inputs - outputs:(const std::vector&)outputs; +- (bool)run:(const std::vector &)inputs + outputs:(const std::vector &)outputs; -- (bool)load:(NSURL*)compileUrl; +- (bool)load:(NSURL *)compileUrl; -@property MLModel* model; +@property MLModel *model; @property(nonatomic, readonly) int coreMLVersion; @end -#endif // MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_COREML_COREML_EXECUTOR_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_COREML_COREML_EXECUTOR_H_ diff --git a/mindspore-lite/src/litert/delegate/coreml/coreml_executor_wrapper.h b/mindspore-lite/src/litert/delegate/coreml/coreml_executor_wrapper.h index 88c96a17f..c38ff1925 100644 --- a/mindspore-lite/src/litert/delegate/coreml/coreml_executor_wrapper.h +++ b/mindspore-lite/src/litert/delegate/coreml/coreml_executor_wrapper.h @@ -19,7 +19,7 @@ #include #include #include "include/errorcode.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" namespace mindspore::lite { class CoreMLExecutorWrapper { diff --git a/mindspore-lite/src/litert/delegate/coreml/coreml_graph.h b/mindspore-lite/src/litert/delegate/coreml/coreml_graph.h index 6f9c8cff3..e0aea4fa6 100644 --- a/mindspore-lite/src/litert/delegate/coreml/coreml_graph.h +++ b/mindspore-lite/src/litert/delegate/coreml/coreml_graph.h @@ -24,7 +24,7 @@ #include #include "proto/Model.pb.h" #include "proto/NeuralNetwork.pb.h" -#include "include/cxx_api/kernel.h" +#include "include/api/kernel.h" #include "src/litert/delegate/coreml/op/coreml_op.h" #include "src/litert/delegate/coreml/coreml_executor_wrapper.h" diff --git a/mindspore-lite/src/litert/delegate/coreml/op/coreml_op.h b/mindspore-lite/src/litert/delegate/coreml/op/coreml_op.h index fbeb36878..31d6982be 100644 --- a/mindspore-lite/src/litert/delegate/coreml/op/coreml_op.h +++ b/mindspore-lite/src/litert/delegate/coreml/op/coreml_op.h @@ -26,8 +26,8 @@ #include "proto/NeuralNetwork.pb.h" #include "schema/model_generated.h" #include "include/errorcode.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/data_type.h" +#include "include/api/types.h" +#include "include/api/data_type.h" #include "src/common/log_adapter.h" #include "src/common/log_util.h" #include "nnacl_c/op_base.h" diff --git a/mindspore-lite/src/litert/delegate/coreml/stub/coreml_delegate_stub.cc b/mindspore-lite/src/litert/delegate/coreml/stub/coreml_delegate_stub.cc index 704265790..992dff07c 100644 --- a/mindspore-lite/src/litert/delegate/coreml/stub/coreml_delegate_stub.cc +++ b/mindspore-lite/src/litert/delegate/coreml/stub/coreml_delegate_stub.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/delegate.h" +#include "include/api/delegate.h" #include "src/common/log_adapter.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/delegate/delegate_utils.h b/mindspore-lite/src/litert/delegate/delegate_utils.h index bd85665ea..5843699cf 100644 --- a/mindspore-lite/src/litert/delegate/delegate_utils.h +++ b/mindspore-lite/src/litert/delegate/delegate_utils.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_DELEGATE_UTILS_H_ #define MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_DELEGATE_UTILS_H_ #include -#include "include/cxx_api/delegate.h" +#include "include/api/delegate.h" #include "src/common/log_adapter.h" #include "include/errorcode.h" #include "nnacl_c/op_base.h" diff --git a/mindspore-lite/src/litert/delegate/npu/npu_converter_utils.h b/mindspore-lite/src/litert/delegate/npu/npu_converter_utils.h index 2405a023f..d76c6f2f8 100644 --- a/mindspore-lite/src/litert/delegate/npu/npu_converter_utils.h +++ b/mindspore-lite/src/litert/delegate/npu/npu_converter_utils.h @@ -25,8 +25,8 @@ #include "schema/ops_generated.h" #include "include/graph/tensor.h" #include "include/graph/op/array_defs.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/data_type.h" +#include "include/api/types.h" +#include "include/api/data_type.h" #include "include/graph/op/all_ops.h" #include "src/common/log_adapter.h" #include "nnacl_c/op_base.h" diff --git a/mindspore-lite/src/litert/delegate/npu/npu_delegate.h b/mindspore-lite/src/litert/delegate/npu/npu_delegate.h index 54ad043d6..17b43a348 100644 --- a/mindspore-lite/src/litert/delegate/npu/npu_delegate.h +++ b/mindspore-lite/src/litert/delegate/npu/npu_delegate.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/delegate.h" +#include "include/api/delegate.h" #include "src/litert/delegate/npu/npu_manager.h" #include "src/litert/delegate/npu/pass/npu_pass_manager.h" #include "src/litert/delegate/npu/op/npu_op.h" diff --git a/mindspore-lite/src/litert/delegate/npu/npu_graph.h b/mindspore-lite/src/litert/delegate/npu/npu_graph.h index 7d5dc4bf4..1ff835c42 100644 --- a/mindspore-lite/src/litert/delegate/npu/npu_graph.h +++ b/mindspore-lite/src/litert/delegate/npu/npu_graph.h @@ -21,7 +21,7 @@ #include #include #include -#include "include/cxx_api/kernel.h" +#include "include/api/kernel.h" #include "src/litert/delegate/npu/op/npu_op.h" #include "src/litert/delegate/npu/npu_executor.h" diff --git a/mindspore-lite/src/litert/delegate/npu/npu_subgraph.h b/mindspore-lite/src/litert/delegate/npu/npu_subgraph.h index de2fdcc70..519fb68a5 100644 --- a/mindspore-lite/src/litert/delegate/npu/npu_subgraph.h +++ b/mindspore-lite/src/litert/delegate/npu/npu_subgraph.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/kernel.h" +#include "include/api/kernel.h" #include "src/litert/delegate/npu/npu_executor.h" namespace mindspore::lite { diff --git a/mindspore-lite/src/litert/delegate/npu/op/npu_op.h b/mindspore-lite/src/litert/delegate/npu/op/npu_op.h index c06f06fe5..215d445c9 100644 --- a/mindspore-lite/src/litert/delegate/npu/op/npu_op.h +++ b/mindspore-lite/src/litert/delegate/npu/op/npu_op.h @@ -24,8 +24,8 @@ #include "include/graph/graph.h" #include "schema/model_generated.h" #include "include/errorcode.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/data_type.h" +#include "include/api/types.h" +#include "include/api/data_type.h" #include "src/common/log_adapter.h" #include "src/common/log_util.h" #include "nnacl_c/op_base.h" diff --git a/mindspore-lite/src/litert/delegate/npu/transpose_kernel.h b/mindspore-lite/src/litert/delegate/npu/transpose_kernel.h index 8f1fd2c90..7ab66a6d7 100644 --- a/mindspore-lite/src/litert/delegate/npu/transpose_kernel.h +++ b/mindspore-lite/src/litert/delegate/npu/transpose_kernel.h @@ -20,7 +20,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "include/cxx_api/kernel.h" +#include "include/api/kernel.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" diff --git a/mindspore-lite/src/litert/delegate/parameter_cache/cache_algorithm.h b/mindspore-lite/src/litert/delegate/parameter_cache/cache_algorithm.h index 1f0a09f86..c496b76b9 100644 --- a/mindspore-lite/src/litert/delegate/parameter_cache/cache_algorithm.h +++ b/mindspore-lite/src/litert/delegate/parameter_cache/cache_algorithm.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_PARAMETER_CACHE_CACHE_ALGORITHM_H_ #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" namespace mindspore { namespace cache { diff --git a/mindspore-lite/src/litert/delegate/parameter_cache/embedding_cache.h b/mindspore-lite/src/litert/delegate/parameter_cache/embedding_cache.h index 851b41068..ba3c1d895 100644 --- a/mindspore-lite/src/litert/delegate/parameter_cache/embedding_cache.h +++ b/mindspore-lite/src/litert/delegate/parameter_cache/embedding_cache.h @@ -19,9 +19,9 @@ #include #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/data_type.h" +#include "include/api/status.h" +#include "include/api/types.h" +#include "include/api/data_type.h" #include "src/common/log_adapter.h" #include "src/litert/delegate/parameter_cache/cache_algorithm.h" #include "src/litert/delegate/parameter_cache/cache_mem_base.h" diff --git a/mindspore-lite/src/litert/delegate/parameter_cache/embedding_cache_manager.h b/mindspore-lite/src/litert/delegate/parameter_cache/embedding_cache_manager.h index 08de74ecf..c811384f3 100644 --- a/mindspore-lite/src/litert/delegate/parameter_cache/embedding_cache_manager.h +++ b/mindspore-lite/src/litert/delegate/parameter_cache/embedding_cache_manager.h @@ -20,9 +20,9 @@ #include #include #include -#include "include/cxx_api/kernel.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/data_type.h" +#include "include/api/kernel.h" +#include "include/api/status.h" +#include "include/api/data_type.h" #include "src/litert/delegate/parameter_cache/embedding_cache.h" #include "src/litert/delegate/parameter_cache/load_host_cache_model.h" #include "src/litert/delegate/tensorrt/distribution/distribution_base.h" diff --git a/mindspore-lite/src/litert/delegate/parameter_cache/factory_mgr_base.h b/mindspore-lite/src/litert/delegate/parameter_cache/factory_mgr_base.h index 47db66536..cb0049f5f 100644 --- a/mindspore-lite/src/litert/delegate/parameter_cache/factory_mgr_base.h +++ b/mindspore-lite/src/litert/delegate/parameter_cache/factory_mgr_base.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_PARAMETER_CACHE_FACTORY_MGR_BASE_H_ #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" namespace mindspore { namespace lite { diff --git a/mindspore-lite/src/litert/delegate/parameter_cache/lfu_cache.h b/mindspore-lite/src/litert/delegate/parameter_cache/lfu_cache.h index dd002ab6e..1e5d0f87f 100644 --- a/mindspore-lite/src/litert/delegate/parameter_cache/lfu_cache.h +++ b/mindspore-lite/src/litert/delegate/parameter_cache/lfu_cache.h @@ -21,7 +21,7 @@ #include #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "src/litert/delegate/parameter_cache/cache_algorithm.h" namespace mindspore { namespace cache { diff --git a/mindspore-lite/src/litert/delegate/parameter_cache/load_host_cache_model.h b/mindspore-lite/src/litert/delegate/parameter_cache/load_host_cache_model.h index 82d8160e2..93e521715 100644 --- a/mindspore-lite/src/litert/delegate/parameter_cache/load_host_cache_model.h +++ b/mindspore-lite/src/litert/delegate/parameter_cache/load_host_cache_model.h @@ -19,11 +19,11 @@ #include #include -#include "include/cxx_api/status.h" -#include "include/cxx_api/data_type.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/kernel.h" -#include "include/cxx_api/delegate.h" +#include "include/api/status.h" +#include "include/api/data_type.h" +#include "include/api/types.h" +#include "include/api/kernel.h" +#include "include/api/delegate.h" #include "src/litert/lite_model.h" namespace mindspore { diff --git a/mindspore-lite/src/litert/infer_manager.h b/mindspore-lite/src/litert/infer_manager.h index 4d9401278..9a8766cc3 100644 --- a/mindspore-lite/src/litert/infer_manager.h +++ b/mindspore-lite/src/litert/infer_manager.h @@ -26,8 +26,8 @@ #include "src/tensor.h" #include "nnacl_c/tensor_c.h" #include "nnacl_c/infer/infer.h" -#include "include/cxx_api/kernel.h" -#include "include/cxx_api/allocator.h" +#include "include/api/kernel.h" +#include "include/api/allocator.h" namespace mindspore::lite { MS_API int KernelInferShape(const std::vector &tensors_in, const std::vector &outputs, diff --git a/mindspore-lite/src/litert/inner_allocator.h b/mindspore-lite/src/litert/inner_allocator.h index 745c45a9b..8c89508ca 100644 --- a/mindspore-lite/src/litert/inner_allocator.h +++ b/mindspore-lite/src/litert/inner_allocator.h @@ -25,7 +25,7 @@ #include #include #include -#include "include/cxx_api/allocator.h" +#include "include/api/allocator.h" namespace mindspore { struct AllocatorContext { diff --git a/mindspore-lite/src/litert/kernel/cpu/base/group_convolution_creator.h b/mindspore-lite/src/litert/kernel/cpu/base/group_convolution_creator.h index 3ce2ac75f..c362a7ef1 100644 --- a/mindspore-lite/src/litert/kernel/cpu/base/group_convolution_creator.h +++ b/mindspore-lite/src/litert/kernel/cpu/base/group_convolution_creator.h @@ -22,7 +22,7 @@ #include "src/litert/lite_kernel.h" #include "nnacl_c/conv_parameter.h" #include "src/litert/tensor_category.h" -#include "include/cxx_api/allocator.h" +#include "include/api/allocator.h" namespace mindspore::kernel { struct TensorInfo { diff --git a/mindspore-lite/src/litert/lite_kernel.h b/mindspore-lite/src/litert/lite_kernel.h index 62f35064c..501ab5d1f 100644 --- a/mindspore-lite/src/litert/lite_kernel.h +++ b/mindspore-lite/src/litert/lite_kernel.h @@ -29,8 +29,8 @@ #include "include/errorcode.h" #include "schema/model_generated.h" #include "src/litert/cxx_api/tensor/tensor_impl.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/kernel.h" +#include "include/api/context.h" +#include "include/api/kernel.h" #include "src/litert/thread_cost_model.h" #include "extendrt/mindir_loader/abstract_kernel.h" diff --git a/mindspore-lite/src/litert/lite_model.h b/mindspore-lite/src/litert/lite_model.h index 14c120908..24a4da0ef 100644 --- a/mindspore-lite/src/litert/lite_model.h +++ b/mindspore-lite/src/litert/lite_model.h @@ -32,7 +32,7 @@ #ifdef ENABLE_MODEL_OBF #include "tools/obfuscator/include/deobfuscator.h" #endif -#include "include/cxx_api/types.h" +#include "include/api/types.h" #ifdef ENABLE_LITE_HELPER #include "src/common/helper/infer_helpers.h" #endif diff --git a/mindspore-lite/src/litert/lite_session.h b/mindspore-lite/src/litert/lite_session.h index 78bc3da38..4c58e1a38 100644 --- a/mindspore-lite/src/litert/lite_session.h +++ b/mindspore-lite/src/litert/lite_session.h @@ -32,7 +32,7 @@ #include "src/tensor.h" #include "src/tensorlist.h" #include "src/common/dynamic_library_loader.h" -#include "include/cxx_api/delegate.h" +#include "include/api/delegate.h" #if GPU_OPENCL #include "src/litert/kernel/gpu/opencl/opencl_runtime.h" #endif diff --git a/mindspore-lite/src/litert/runtime_allocator.h b/mindspore-lite/src/litert/runtime_allocator.h index 579c28730..67ef70222 100644 --- a/mindspore-lite/src/litert/runtime_allocator.h +++ b/mindspore-lite/src/litert/runtime_allocator.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/allocator.h" +#include "include/api/allocator.h" #include "include/errorcode.h" #include "src/tensor.h" diff --git a/mindspore-lite/src/litert/runtime_convert.h b/mindspore-lite/src/litert/runtime_convert.h index e41888a5c..6975aba6b 100644 --- a/mindspore-lite/src/litert/runtime_convert.h +++ b/mindspore-lite/src/litert/runtime_convert.h @@ -21,7 +21,7 @@ #include #include #include -#include "include/cxx_api/context.h" +#include "include/api/context.h" namespace mindspore::lite { char *RuntimeConvert(const char *model_buf, const size_t &buf_size, size_t *size, mindspore::Context *context); diff --git a/mindspore-lite/src/litert/scheduler.h b/mindspore-lite/src/litert/scheduler.h index 3927377ec..8142119c8 100644 --- a/mindspore-lite/src/litert/scheduler.h +++ b/mindspore-lite/src/litert/scheduler.h @@ -29,7 +29,7 @@ #include "src/litert/inner_context.h" #include "include/model.h" #include "src/litert/scheduler_cb.h" -#include "include/cxx_api/delegate.h" +#include "include/api/delegate.h" #include "src/control_flow/control_flow_scheduler.h" #include "src/litert/runtime_shape_fusion_pass.h" diff --git a/mindspore-lite/src/litert/thread_cost_model.h b/mindspore-lite/src/litert/thread_cost_model.h index 25db62fef..0254b1efd 100644 --- a/mindspore-lite/src/litert/thread_cost_model.h +++ b/mindspore-lite/src/litert/thread_cost_model.h @@ -19,7 +19,7 @@ #include #include "nnacl_c/op_base.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "schema/ops_generated.h" namespace mindspore::lite { diff --git a/mindspore-lite/src/registry/kernel_interface_registry.cc b/mindspore-lite/src/registry/kernel_interface_registry.cc index ef6028a26..eebec6560 100644 --- a/mindspore-lite/src/registry/kernel_interface_registry.cc +++ b/mindspore-lite/src/registry/kernel_interface_registry.cc @@ -20,7 +20,7 @@ #include "src/common/log_adapter.h" #include "src/common/version_manager.h" #include "schema/model_generated.h" -#include "include/cxx_api/kernel.h" +#include "include/api/kernel.h" using mindspore::registry::KernelInterfaceCreator; using mindspore::schema::PrimitiveType_MAX; diff --git a/mindspore-lite/src/tensor.h b/mindspore-lite/src/tensor.h index 286d26422..1cee4d11e 100644 --- a/mindspore-lite/src/tensor.h +++ b/mindspore-lite/src/tensor.h @@ -24,7 +24,7 @@ #include #include #include -#include "include/cxx_api/format.h" +#include "include/api/format.h" #include "include/lite_types.h" #include "nnacl_c/tensor_c.h" #include "nnacl_c/tensor_c_utils.h" diff --git a/mindspore-lite/src/train/opt_allocator.h b/mindspore-lite/src/train/opt_allocator.h index aeaf39ecf..e3f88e1ab 100644 --- a/mindspore-lite/src/train/opt_allocator.h +++ b/mindspore-lite/src/train/opt_allocator.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_TRAIN_OPT_ALLOCATOR_H_ #include -#include "include/cxx_api/allocator.h" +#include "include/api/allocator.h" namespace mindspore { class OptAllocator { @@ -37,5 +37,5 @@ class OptAllocator { size_t heap_ = 0; size_t align_size_; }; -}; // namespace mindspore +}; // namespace mindspore #endif // MINDSPORE_LITE_SRC_TRAIN_OPT_ALLOCATOR_H_ diff --git a/mindspore-lite/test/common/common_test.h b/mindspore-lite/test/common/common_test.h index e12cc32b2..e8f32d3b7 100644 --- a/mindspore-lite/test/common/common_test.h +++ b/mindspore-lite/test/common/common_test.h @@ -23,7 +23,7 @@ #include #include #include "gtest/gtest.h" -#include "include/cxx_api/format.h" +#include "include/api/format.h" #include "src/litert/tensor_category.h" #include "nnacl_c/tensorlist_c_utils.h" #include "nnacl_c/tensor_c_utils.h" diff --git a/mindspore-lite/test/st/cpp/check_deviceinfo_cpp/example.cc b/mindspore-lite/test/st/cpp/check_deviceinfo_cpp/example.cc index 0389cf076..53bf674f0 100644 --- a/mindspore-lite/test/st/cpp/check_deviceinfo_cpp/example.cc +++ b/mindspore-lite/test/st/cpp/check_deviceinfo_cpp/example.cc @@ -20,10 +20,10 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/types.h" template void GenerateRandomData(int size, void *data, Distribution distribution) { diff --git a/mindspore-lite/test/st/cpp/device_example_cpp/example.cc b/mindspore-lite/test/st/cpp/device_example_cpp/example.cc index 40a41d4e4..750b59cbc 100644 --- a/mindspore-lite/test/st/cpp/device_example_cpp/example.cc +++ b/mindspore-lite/test/st/cpp/device_example_cpp/example.cc @@ -20,10 +20,10 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/types.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/status.h" +#include "include/api/types.h" #ifdef ENABLE_ASCEND #include "./mem_ascend.h" diff --git a/mindspore-lite/test/st/mix_data_type_test.cc b/mindspore-lite/test/st/mix_data_type_test.cc index a54e5e582..cd02e804a 100644 --- a/mindspore-lite/test/st/mix_data_type_test.cc +++ b/mindspore-lite/test/st/mix_data_type_test.cc @@ -21,7 +21,7 @@ #include "schema/inner/model_generated.h" #include "src/executor/kernel_exec.h" #include "src/litert/lite_session.h" -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "src/litert/cxx_api/model/model_impl.h" namespace mindspore { diff --git a/mindspore-lite/test/st/multiple_device_test.cc b/mindspore-lite/test/st/multiple_device_test.cc index 4bb58dd81..5115445a7 100644 --- a/mindspore-lite/test/st/multiple_device_test.cc +++ b/mindspore-lite/test/st/multiple_device_test.cc @@ -19,7 +19,7 @@ #include "src/litert/lite_session.h" #include "src/executor/sub_graph_kernel.h" #include "ir/dtype/type_id.h" -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "src/litert/cxx_api/converters.h" #include "src/litert/cxx_api/model/model_impl.h" diff --git a/mindspore-lite/test/ut/src/api/generic_api_test.cc b/mindspore-lite/test/ut/src/api/generic_api_test.cc index b96b3faea..4c52f8517 100644 --- a/mindspore-lite/test/ut/src/api/generic_api_test.cc +++ b/mindspore-lite/test/ut/src/api/generic_api_test.cc @@ -14,8 +14,8 @@ * limitations under the License. */ #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" +#include "include/api/types.h" +#include "include/api/context.h" #include "common/common_test.h" #include "src/runtime/cxx_api/converters.h" #include "src/common/context_util.h" diff --git a/mindspore-lite/test/ut/src/api/model_group_test.cc b/mindspore-lite/test/ut/src/api/model_group_test.cc index 77f450903..e2364da98 100644 --- a/mindspore-lite/test/ut/src/api/model_group_test.cc +++ b/mindspore-lite/test/ut/src/api/model_group_test.cc @@ -16,7 +16,7 @@ #include #include #include -#include "include/cxx_api/model_group.h" +#include "include/api/model_group.h" #include "src/common/file_utils.h" namespace mindspore { diff --git a/mindspore-lite/test/ut/src/api/model_parallel_runner_test.cc b/mindspore-lite/test/ut/src/api/model_parallel_runner_test.cc index ed4f344c3..5c2954bc8 100644 --- a/mindspore-lite/test/ut/src/api/model_parallel_runner_test.cc +++ b/mindspore-lite/test/ut/src/api/model_parallel_runner_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include -#include "include/cxx_api/model_parallel_runner.h" +#include "include/api/model_parallel_runner.h" #include "common/common_test.h" #include "src/common/file_utils.h" diff --git a/mindspore-lite/test/ut/src/dataset/eager_test.cc b/mindspore-lite/test/ut/src/dataset/eager_test.cc index 12b8a43d1..ddb915410 100644 --- a/mindspore-lite/test/ut/src/dataset/eager_test.cc +++ b/mindspore-lite/test/ut/src/dataset/eager_test.cc @@ -24,7 +24,7 @@ #include "minddata/dataset/include/dataset/execute.h" #include "minddata/dataset/util/path.h" #include "src/common/log_adapter.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" using MSTensor = mindspore::lite::Tensor; using DETensor = mindspore::tensor::DETensor; diff --git a/mindspore-lite/test/ut/src/registry/registry_custom_op_test.cc b/mindspore-lite/test/ut/src/registry/registry_custom_op_test.cc index db8b2438f..81b13063e 100644 --- a/mindspore-lite/test/ut/src/registry/registry_custom_op_test.cc +++ b/mindspore-lite/test/ut/src/registry/registry_custom_op_test.cc @@ -18,8 +18,8 @@ #include #include "schema/inner/model_generated.h" #include "common/common_test.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/model.h" +#include "include/api/context.h" +#include "include/api/model.h" #include "src/common/log_adapter.h" #include "src/litert/lite_session.h" #include "include/registry/register_kernel_interface.h" diff --git a/mindspore-lite/test/ut/src/registry/registry_gpu_custom_op_test.cc b/mindspore-lite/test/ut/src/registry/registry_gpu_custom_op_test.cc index 977b60d5c..18d308d79 100644 --- a/mindspore-lite/test/ut/src/registry/registry_gpu_custom_op_test.cc +++ b/mindspore-lite/test/ut/src/registry/registry_gpu_custom_op_test.cc @@ -18,15 +18,15 @@ #include #include "schema/inner/model_generated.h" #include "common/common_test.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/model.h" +#include "include/api/context.h" +#include "include/api/model.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "src/litert/lite_session.h" #include "include/registry/register_kernel_interface.h" #include "include/registry/register_kernel.h" #include "include/registry/opencl_runtime_wrapper.h" -#include "include/cxx_api/data_type.h" +#include "include/api/data_type.h" using mindspore::kernel::Kernel; using mindspore::kernel::KernelInterface; diff --git a/mindspore-lite/test/ut/src/registry/registry_test.cc b/mindspore-lite/test/ut/src/registry/registry_test.cc index a2933d334..e6e2cdc80 100644 --- a/mindspore-lite/test/ut/src/registry/registry_test.cc +++ b/mindspore-lite/test/ut/src/registry/registry_test.cc @@ -17,8 +17,8 @@ #include #include "schema/inner/model_generated.h" #include "common/common_test.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/model.h" +#include "include/api/context.h" +#include "include/api/model.h" #include "src/common/log_adapter.h" #include "src/litert/lite_session.h" #include "include/registry/register_kernel_interface.h" diff --git a/mindspore-lite/test/ut/src/runtime/kernel/arm/cxx_api/model_test.cc b/mindspore-lite/test/ut/src/runtime/kernel/arm/cxx_api/model_test.cc index 463914167..373402f86 100644 --- a/mindspore-lite/test/ut/src/runtime/kernel/arm/cxx_api/model_test.cc +++ b/mindspore-lite/test/ut/src/runtime/kernel/arm/cxx_api/model_test.cc @@ -15,10 +15,10 @@ */ #include #include "common/common_test.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/serialization.h" -#include "include/cxx_api/metrics/accuracy.h" +#include "include/api/model.h" +#include "include/api/context.h" +#include "include/api/serialization.h" +#include "include/api/metrics/accuracy.h" namespace mindspore { namespace { diff --git a/mindspore-lite/test/ut/src/runtime/kernel/arm/cxx_api/serialization_test.cc b/mindspore-lite/test/ut/src/runtime/kernel/arm/cxx_api/serialization_test.cc index 20f22ff40..fa64020d3 100644 --- a/mindspore-lite/test/ut/src/runtime/kernel/arm/cxx_api/serialization_test.cc +++ b/mindspore-lite/test/ut/src/runtime/kernel/arm/cxx_api/serialization_test.cc @@ -17,7 +17,7 @@ #include #include #include "common/common_test.h" -#include "include/cxx_api/serialization.h" +#include "include/api/serialization.h" namespace mindspore { class TestCxxApiLiteSerialization : public mindspore::CommonTest { diff --git a/mindspore-lite/test/ut/src/runtime/kernel/dsp/custom/fft_tests.cc b/mindspore-lite/test/ut/src/runtime/kernel/dsp/custom/fft_tests.cc index 16da10e59..e27cd0cb3 100644 --- a/mindspore-lite/test/ut/src/runtime/kernel/dsp/custom/fft_tests.cc +++ b/mindspore-lite/test/ut/src/runtime/kernel/dsp/custom/fft_tests.cc @@ -20,8 +20,8 @@ #include #include "schema/inner/model_generated.h" #include "common/common_test.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/model.h" +#include "include/api/context.h" +#include "include/api/model.h" #include "src/common/log_adapter.h" #include "src/litert/lite_session.h" #include "include/registry/register_kernel_interface.h" diff --git a/mindspore-lite/test/ut/src/runtime/runtime_convert_tests.cc b/mindspore-lite/test/ut/src/runtime/runtime_convert_tests.cc index cdd532269..08bfde654 100644 --- a/mindspore-lite/test/ut/src/runtime/runtime_convert_tests.cc +++ b/mindspore-lite/test/ut/src/runtime/runtime_convert_tests.cc @@ -14,8 +14,8 @@ * limitations under the License. */ #include "common/common_test.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/status.h" +#include "include/api/model.h" +#include "include/api/status.h" namespace mindspore { class RuntimeConvert : public mindspore::CommonTest { diff --git a/mindspore-lite/tools/benchmark/benchmark_base.h b/mindspore-lite/tools/benchmark/benchmark_base.h index 81b4bfb39..cd156d564 100644 --- a/mindspore-lite/tools/benchmark/benchmark_base.h +++ b/mindspore-lite/tools/benchmark/benchmark_base.h @@ -34,8 +34,8 @@ #include #endif #include "include/model.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/format.h" +#include "include/api/types.h" +#include "include/api/format.h" #include "tools/common/flag_parser.h" #include "src/common/file_utils.h" #include "src/common/utils.h" diff --git a/mindspore-lite/tools/benchmark/benchmark_unified_api.h b/mindspore-lite/tools/benchmark/benchmark_unified_api.h index bf4963094..18b8229ce 100644 --- a/mindspore-lite/tools/benchmark/benchmark_unified_api.h +++ b/mindspore-lite/tools/benchmark/benchmark_unified_api.h @@ -37,12 +37,12 @@ #include "tools/common/flag_parser.h" #include "src/common/file_utils.h" #include "src/common/utils.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" +#include "include/api/types.h" +#include "include/api/model.h" +#include "include/api/context.h" #include "tools/common/opengl_util.h" #ifdef MSLITE_ENABLE_CLOUD_INFERENCE -#include "include/cxx_api/model_parallel_runner.h" +#include "include/api/model_parallel_runner.h" #endif namespace mindspore::lite { diff --git a/mindspore-lite/tools/benchmark_train/net_train.cc b/mindspore-lite/tools/benchmark_train/net_train.cc index eeb7c4d58..545cb0ed3 100644 --- a/mindspore-lite/tools/benchmark_train/net_train.cc +++ b/mindspore-lite/tools/benchmark_train/net_train.cc @@ -25,7 +25,7 @@ #include #endif #include "src/common/common.h" -#include "include/cxx_api/serialization.h" +#include "include/api/serialization.h" #include "include/securec.h" namespace mindspore { diff --git a/mindspore-lite/tools/benchmark_train/net_train.h b/mindspore-lite/tools/benchmark_train/net_train.h index c276aba3b..c77fe2009 100644 --- a/mindspore-lite/tools/benchmark_train/net_train.h +++ b/mindspore-lite/tools/benchmark_train/net_train.h @@ -31,10 +31,10 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/cfg.h" +#include "include/api/model.h" +#include "include/api/types.h" +#include "include/api/context.h" +#include "include/api/cfg.h" #ifdef ENABLE_FP16 #include diff --git a/mindspore-lite/tools/benchmark_train/net_train_base.cc b/mindspore-lite/tools/benchmark_train/net_train_base.cc index 75ea63288..92a3ead10 100644 --- a/mindspore-lite/tools/benchmark_train/net_train_base.cc +++ b/mindspore-lite/tools/benchmark_train/net_train_base.cc @@ -21,7 +21,7 @@ #include #endif #include "src/common/common.h" -#include "include/cxx_api/serialization.h" +#include "include/api/serialization.h" namespace mindspore { namespace lite { diff --git a/mindspore-lite/tools/benchmark_train/net_train_base.h b/mindspore-lite/tools/benchmark_train/net_train_base.h index 86783d1be..526120cd7 100644 --- a/mindspore-lite/tools/benchmark_train/net_train_base.h +++ b/mindspore-lite/tools/benchmark_train/net_train_base.h @@ -31,10 +31,10 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/cfg.h" +#include "include/api/model.h" +#include "include/api/types.h" +#include "include/api/context.h" +#include "include/api/cfg.h" #ifdef ENABLE_FP16 #include diff --git a/mindspore-lite/tools/benchmark_train/net_train_c_api.h b/mindspore-lite/tools/benchmark_train/net_train_c_api.h index 7935d0105..a347bc3d5 100644 --- a/mindspore-lite/tools/benchmark_train/net_train_c_api.h +++ b/mindspore-lite/tools/benchmark_train/net_train_c_api.h @@ -31,10 +31,10 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/cfg.h" +#include "include/api/model.h" +#include "include/api/types.h" +#include "include/api/context.h" +#include "include/api/cfg.h" #include "include/c_api/model_c.h" #include "include/c_api/context_c.h" diff --git a/mindspore-lite/tools/common/custom_ascend_utils.h b/mindspore-lite/tools/common/custom_ascend_utils.h index 8412f4817..bec6d2db9 100644 --- a/mindspore-lite/tools/common/custom_ascend_utils.h +++ b/mindspore-lite/tools/common/custom_ascend_utils.h @@ -26,9 +26,9 @@ #include "ir/anf.h" #include "ir/dtype/type.h" #include "ir/func_graph.h" -#include "include/cxx_api/types.h" -#include "include/cxx_api/data_type.h" -#include "include/cxx_api/status.h" +#include "include/api/types.h" +#include "include/api/data_type.h" +#include "include/api/status.h" #include "runtime/hardware_abstract/kernel_base/kernel.h" #include "include/common/utils/anfalgo.h" #include "mindspore/ops/infer/custom.h" diff --git a/mindspore-lite/tools/common/tensor_util.h b/mindspore-lite/tools/common/tensor_util.h index ef58558fc..1875f8dfa 100644 --- a/mindspore-lite/tools/common/tensor_util.h +++ b/mindspore-lite/tools/common/tensor_util.h @@ -34,7 +34,7 @@ #include "src/common/utils.h" #include "tools/common/statistic_utils.h" #include "src/tensor.h" -#include "include/cxx_api/model.h" +#include "include/api/model.h" namespace mindspore { namespace lite { diff --git a/mindspore-lite/tools/converter/adapter/acl/common/acl_types.h b/mindspore-lite/tools/converter/adapter/acl/common/acl_types.h index a8d81b857..91fe8a594 100644 --- a/mindspore-lite/tools/converter/adapter/acl/common/acl_types.h +++ b/mindspore-lite/tools/converter/adapter/acl/common/acl_types.h @@ -21,8 +21,8 @@ #include #include #include -#include "include/cxx_api/data_type.h" -#include "include/cxx_api/context.h" +#include "include/api/data_type.h" +#include "include/api/context.h" namespace mindspore { namespace lite { diff --git a/mindspore-lite/tools/converter/adapter/acl/common/acl_types_utils.h b/mindspore-lite/tools/converter/adapter/acl/common/acl_types_utils.h index 882adb6a2..c7417e7c8 100644 --- a/mindspore-lite/tools/converter/adapter/acl/common/acl_types_utils.h +++ b/mindspore-lite/tools/converter/adapter/acl/common/acl_types_utils.h @@ -21,8 +21,8 @@ #include #include #include -#include "include/cxx_api/data_type.h" -#include "include/cxx_api/context.h" +#include "include/api/data_type.h" +#include "include/api/context.h" #include "src/common/log_util.h" #include "tools/converter/adapter/acl/common/acl_types.h" diff --git a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/any_utils.h b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/any_utils.h index ff6eae8ad..9ec0bf805 100644 --- a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/any_utils.h +++ b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/any_utils.h @@ -21,8 +21,8 @@ #include #include #include -#include "include/cxx_api/visible.h" -#include "include/cxx_api/data_type.h" +#include "include/api/visible.h" +#include "include/api/data_type.h" namespace mindspore { // std::any is not support to access across shared libraries, so add an adapter to access std::any diff --git a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/context.cc b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/context.cc index 7ec050099..7bdb4a39e 100644 --- a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/context.cc +++ b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/context.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include #include #include "cxx_api/any_utils.h" diff --git a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/dlutils.h b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/dlutils.h index 09c165835..d4cb56172 100644 --- a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/dlutils.h +++ b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/dlutils.h @@ -21,7 +21,7 @@ #include #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "utils/file_utils.h" namespace mindspore { diff --git a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/graph/acl/acl_convert_init_adapter.h b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/graph/acl/acl_convert_init_adapter.h index 4cf934d85..81ccfbca8 100644 --- a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/graph/acl/acl_convert_init_adapter.h +++ b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/graph/acl/acl_convert_init_adapter.h @@ -22,7 +22,7 @@ #include #include "acl/acl_base.h" #include "ge/ge_ir_build.h" -#include "include/cxx_api/visible.h" +#include "include/api/visible.h" namespace mindspore { class MS_API AclConvertInitAdapter { diff --git a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/graph/graph_data.h b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/graph/graph_data.h index 8d748417b..168eeb531 100644 --- a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/graph/graph_data.h +++ b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/graph/graph_data.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/graph.h" -#include "include/cxx_api/types.h" +#include "include/api/graph.h" +#include "include/api/types.h" #include "include/dataset/execute.h" #include "ir/func_graph.h" diff --git a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/acl/acl_model_options.h b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/acl/acl_model_options.h index a3b67cdbf..1e337b8e7 100644 --- a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/acl/acl_model_options.h +++ b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/acl/acl_model_options.h @@ -22,9 +22,9 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" -#include "include/cxx_api/context.h" +#include "include/api/types.h" +#include "include/api/status.h" +#include "include/api/context.h" namespace mindspore { class MS_API AclModelOptions { diff --git a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/acl/model_converter.h b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/acl/model_converter.h index af8f40a1f..7025417c3 100644 --- a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/acl/model_converter.h +++ b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/acl/model_converter.h @@ -20,8 +20,8 @@ #include #include #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" +#include "include/api/types.h" +#include "include/api/status.h" #include "ir/func_graph.h" #include "backend/ge_backend/graph_ir/types.h" #include "ge/ge_ir_build.h" diff --git a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/aoe/auto_tune_process.h b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/aoe/auto_tune_process.h index 2ceb50195..90e8b140c 100644 --- a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/aoe/auto_tune_process.h +++ b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/model/aoe/auto_tune_process.h @@ -19,7 +19,7 @@ #include #include "backend/ge_backend/graph_ir/types.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "cxx_api/model/acl/acl_model_options.h" namespace mindspore { diff --git a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/serialization.cc b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/serialization.cc index 16d1c1b72..55a3dc26f 100644 --- a/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/serialization.cc +++ b/mindspore-lite/tools/converter/adapter/acl/cxx_api_lite/cxx_api/serialization.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "include/cxx_api/serialization.h" +#include "include/api/serialization.h" #include #include #include "cxx_api/graph/graph_data.h" diff --git a/mindspore-lite/tools/converter/adapter/acl/src/acl_pass_impl.h b/mindspore-lite/tools/converter/adapter/acl/src/acl_pass_impl.h index 7428cfe28..74b72e38f 100644 --- a/mindspore-lite/tools/converter/adapter/acl/src/acl_pass_impl.h +++ b/mindspore-lite/tools/converter/adapter/acl/src/acl_pass_impl.h @@ -23,7 +23,7 @@ #include #include "include/backend/optimizer/pass.h" #include "include/errorcode.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "include/registry/converter_context.h" #include "cxx_api/model/acl/acl_model_options.h" #include "tools/converter/adapter/acl/common/acl_types.h" diff --git a/mindspore-lite/tools/converter/adapter/dpico/common/format_utils.h b/mindspore-lite/tools/converter/adapter/dpico/common/format_utils.h index 9e5527a04..9cc91b3e6 100644 --- a/mindspore-lite/tools/converter/adapter/dpico/common/format_utils.h +++ b/mindspore-lite/tools/converter/adapter/dpico/common/format_utils.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/format.h" +#include "include/api/format.h" #include "common/anf_util.h" namespace mindspore { diff --git a/mindspore-lite/tools/converter/adapter/dpico/common/infer_util.h b/mindspore-lite/tools/converter/adapter/dpico/common/infer_util.h index 5b6e872c9..a06299494 100644 --- a/mindspore-lite/tools/converter/adapter/dpico/common/infer_util.h +++ b/mindspore-lite/tools/converter/adapter/dpico/common/infer_util.h @@ -19,7 +19,7 @@ #include #include -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "schema/model_generated.h" #include "src/graph_split_info.h" diff --git a/mindspore-lite/tools/converter/adapter/dpico/mapper/bias_mapper.cc b/mindspore-lite/tools/converter/adapter/dpico/mapper/bias_mapper.cc index 76c294d12..13aa19af6 100644 --- a/mindspore-lite/tools/converter/adapter/dpico/mapper/bias_mapper.cc +++ b/mindspore-lite/tools/converter/adapter/dpico/mapper/bias_mapper.cc @@ -24,7 +24,7 @@ #include "common/op_attr.h" #include "common/op_enum.h" #include "op/bias_operator.h" -#include "include/cxx_api/format.h" +#include "include/api/format.h" namespace mindspore { namespace dpico { diff --git a/mindspore-lite/tools/converter/adapter/dpico/parser/parser_utils.h b/mindspore-lite/tools/converter/adapter/dpico/parser/parser_utils.h index 20368293b..a11033f64 100644 --- a/mindspore-lite/tools/converter/adapter/dpico/parser/parser_utils.h +++ b/mindspore-lite/tools/converter/adapter/dpico/parser/parser_utils.h @@ -21,7 +21,7 @@ #include #include "mindapi/ir/common.h" #include "mindapi/ir/anf.h" -#include "include/cxx_api/format.h" +#include "include/api/format.h" #include "mindapi/ir/func_graph.h" #include "mindapi/base/logging.h" #include "include/errorcode.h" diff --git a/mindspore-lite/tools/converter/adapter/dpico/src/custom_creator.cc b/mindspore-lite/tools/converter/adapter/dpico/src/custom_creator.cc index d4615f35c..35224fd7a 100644 --- a/mindspore-lite/tools/converter/adapter/dpico/src/custom_creator.cc +++ b/mindspore-lite/tools/converter/adapter/dpico/src/custom_creator.cc @@ -20,7 +20,7 @@ #include #include #include -#include "include/cxx_api/format.h" +#include "include/api/format.h" #include "infer/make_tuple.h" #include "common/anf_util.h" #include "common/op_attr.h" diff --git a/mindspore-lite/tools/converter/adapter/dpico/src/graph_split_api.cc b/mindspore-lite/tools/converter/adapter/dpico/src/graph_split_api.cc index f49eee070..ad99c5eae 100644 --- a/mindspore-lite/tools/converter/adapter/dpico/src/graph_split_api.cc +++ b/mindspore-lite/tools/converter/adapter/dpico/src/graph_split_api.cc @@ -24,7 +24,7 @@ #include "infer/tuple_get_item.h" #include "common/op_attr.h" #include "include/errorcode.h" -#include "include/cxx_api/format.h" +#include "include/api/format.h" #include "src/graph_split_info.h" #include "common/check_base.h" #include "common/anf_util.h" diff --git a/mindspore-lite/tools/converter/adapter/dsp/infer/custom_common.h b/mindspore-lite/tools/converter/adapter/dsp/infer/custom_common.h index c99a934b3..c8953affa 100644 --- a/mindspore-lite/tools/converter/adapter/dsp/infer/custom_common.h +++ b/mindspore-lite/tools/converter/adapter/dsp/infer/custom_common.h @@ -18,8 +18,8 @@ #define MINDSPORE_LITE_TOOLS_CONVERTER_ADAPTER_DSP_CUSTOM_COMMON_H #include -#include "include/cxx_api/types.h" -#include "include/cxx_api/status.h" +#include "include/api/types.h" +#include "include/api/status.h" namespace mindspore::lite { namespace common { diff --git a/mindspore-lite/tools/converter/adapter/dsp/infer/custom_fft_infer.cc b/mindspore-lite/tools/converter/adapter/dsp/infer/custom_fft_infer.cc index ef9645b40..91be6f2a6 100644 --- a/mindspore-lite/tools/converter/adapter/dsp/infer/custom_fft_infer.cc +++ b/mindspore-lite/tools/converter/adapter/dsp/infer/custom_fft_infer.cc @@ -17,7 +17,7 @@ #include "tools/converter/adapter/dsp/infer/custom_fft_infer.h" #include #include -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "include/registry/register_kernel_interface.h" #include "tools/converter/adapter/dsp/infer/custom_common.h" diff --git a/mindspore-lite/tools/converter/adapter/utils.cc b/mindspore-lite/tools/converter/adapter/utils.cc index 76405dd97..d2bb054c8 100644 --- a/mindspore-lite/tools/converter/adapter/utils.cc +++ b/mindspore-lite/tools/converter/adapter/utils.cc @@ -32,8 +32,8 @@ #include #include #include -#include "include/cxx_api/model.h" -#include "include/cxx_api/context.h" +#include "include/api/model.h" +#include "include/api/context.h" #include "src/common/file_utils.h" #ifdef _WIN32 diff --git a/mindspore-lite/tools/converter/converter.cc b/mindspore-lite/tools/converter/converter.cc index 933684975..6f70837cd 100644 --- a/mindspore-lite/tools/converter/converter.cc +++ b/mindspore-lite/tools/converter/converter.cc @@ -30,7 +30,7 @@ #include "src/train/train_populate_parameter.h" #endif #include "include/registry/model_parser_registry.h" -#include "include/cxx_api/format.h" +#include "include/api/format.h" #include "src/common/dynamic_library_loader.h" #include "src/common/log_util.h" #include "tools/converter/parser/parser_utils.h" @@ -40,7 +40,7 @@ #include "src/common/prim_util.h" #include "src/common/version_manager.h" #include "tools/common/tensor_util.h" -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "tools/mindir_exporter/mindir_serializer.h" #include "src/common/primitive_t_utils.h" #include "tools/converter/config_parser/acl_option_param_parser.h" diff --git a/mindspore-lite/tools/converter/converter_funcgraph.cc b/mindspore-lite/tools/converter/converter_funcgraph.cc index eaabba1c8..4d04f8fcf 100644 --- a/mindspore-lite/tools/converter/converter_funcgraph.cc +++ b/mindspore-lite/tools/converter/converter_funcgraph.cc @@ -38,7 +38,7 @@ #include "src/common/prim_util.h" #include "src/common/version_manager.h" #include "tools/common/tensor_util.h" -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "tools/mindir_exporter/mindir_serializer.h" #include "src/common/primitive_t_utils.h" #include "tools/converter/config_parser/acl_option_param_parser.h" diff --git a/mindspore-lite/tools/converter/converter_lite/converter_flags.h b/mindspore-lite/tools/converter/converter_lite/converter_flags.h index 006daf3d5..dc1c25708 100644 --- a/mindspore-lite/tools/converter/converter_lite/converter_flags.h +++ b/mindspore-lite/tools/converter/converter_lite/converter_flags.h @@ -19,8 +19,8 @@ #include #include #include -#include "include/cxx_api/format.h" -#include "include/cxx_api/data_type.h" +#include "include/api/format.h" +#include "include/api/data_type.h" #include "include/registry/converter_context.h" #include "tools/common/flag_parser.h" diff --git a/mindspore-lite/tools/converter/converter_lite/main.cc b/mindspore-lite/tools/converter/converter_lite/main.cc index d590c0a0a..84c488cf7 100644 --- a/mindspore-lite/tools/converter/converter_lite/main.cc +++ b/mindspore-lite/tools/converter/converter_lite/main.cc @@ -20,7 +20,7 @@ #define USE_DEPRECATED_API #include #include "include/converter.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" #include "tools/converter/converter_lite/converter_flags.h" #include "include/securec.h" diff --git a/mindspore-lite/tools/converter/cxx_api/converter.cc b/mindspore-lite/tools/converter/cxx_api/converter.cc index a214c7011..8eaec8979 100644 --- a/mindspore-lite/tools/converter/cxx_api/converter.cc +++ b/mindspore-lite/tools/converter/cxx_api/converter.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "include/converter.h" -#include "include/cxx_api/data_type.h" +#include "include/api/data_type.h" #include "include/securec.h" #include "tools/converter/cxx_api/converter_para.h" #include "tools/converter/converter_context.h" diff --git a/mindspore-lite/tools/converter/micro/coder/utils/type_cast.h b/mindspore-lite/tools/converter/micro/coder/utils/type_cast.h index 2d0148b4c..4c6b1a0d3 100644 --- a/mindspore-lite/tools/converter/micro/coder/utils/type_cast.h +++ b/mindspore-lite/tools/converter/micro/coder/utils/type_cast.h @@ -23,7 +23,7 @@ #include #include #include "ir/dtype/type_id.h" -#include "include/cxx_api/format.h" +#include "include/api/format.h" #include "src/common/log_adapter.h" #include "nnacl_c/op_base.h" #include "tools/converter/micro/coder/config.h" diff --git a/mindspore-lite/tools/converter/preprocess/image_preprocess.h b/mindspore-lite/tools/converter/preprocess/image_preprocess.h index a21f8b697..d335d809a 100644 --- a/mindspore-lite/tools/converter/preprocess/image_preprocess.h +++ b/mindspore-lite/tools/converter/preprocess/image_preprocess.h @@ -22,7 +22,7 @@ #include #endif #include "tools/converter/preprocess/preprocess_param.h" -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "src/tensor.h" namespace mindspore { diff --git a/mindspore-lite/tools/converter/quantizer/eigen_util.h b/mindspore-lite/tools/converter/quantizer/eigen_util.h index 07138734e..82faf3572 100644 --- a/mindspore-lite/tools/converter/quantizer/eigen_util.h +++ b/mindspore-lite/tools/converter/quantizer/eigen_util.h @@ -20,7 +20,7 @@ #include #include #include "ir/tensor.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" #include "src/tensor.h" namespace mindspore::lite::quant { diff --git a/mindspore-lite/tools/converter/quantizer/quantize_util.h b/mindspore-lite/tools/converter/quantizer/quantize_util.h index 3278b6d57..694061c5e 100644 --- a/mindspore-lite/tools/converter/quantizer/quantize_util.h +++ b/mindspore-lite/tools/converter/quantizer/quantize_util.h @@ -35,7 +35,7 @@ #include #include "ir/anf.h" #include "src/tensor.h" -#include "include/cxx_api/model.h" +#include "include/api/model.h" #include "include/errorcode.h" #include "tools/converter/cxx_api/converter_para.h" #include "tools/converter/quantizer/quant_param_holder.h" diff --git a/mindspore-lite/tools/dataset/cropper/dependencies.txt b/mindspore-lite/tools/dataset/cropper/dependencies.txt index a49894ce0..5caea39d2 100644 --- a/mindspore-lite/tools/dataset/cropper/dependencies.txt +++ b/mindspore-lite/tools/dataset/cropper/dependencies.txt @@ -1 +1 @@ -{"ESSENTIAL": ["mindspore/mindspore/core/include/mindapi/base/format.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/json_helper.cc", "mindspore/mindspore/core/utils/parallel_node_check.cc", "mindspore/mindspore/core/ir/meta_func_graph.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.cc", "mindspore/mindspore/core/utils/log_adapter.cc", "mindspore/mindspore/core/ir/func_graph_base.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/text.h", "mindspore/mindspore/core/ir/tensor.cc", "mindspore/mindspore/core/include/ir/param_info.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/skip_first_epoch_sampler.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/random.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/epoch_ctrl_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/btree_iterator.tpp", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/random_apply_op.cc", "mindspore/mindspore/core/utils/info.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/btree_impl.tpp", "mindspore/mindspore/ccsrc/minddata/dataset/util/validators.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/album_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/cond_var.cc", "mindspore/mindspore/core/utils/ms_exception.cc", "mindspore/mindspore/core/utils/profile.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/execute.h", "mindspore/mindspore/core/include/base/effect_info.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/parallel_op.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/map_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/intrp_resource.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/dataset_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op/cpu_map_job.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/intrp_service.cc", "mindspore/mindspore/ccsrc/minddata/dataset/callback/callback_param.h", "mindspore/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/zip_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/project_node.cc", "mindspore/mindspore/core/ir/scope.cc", "mindspore/mindspore/core/include/base/float16.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_merge_op.cc", "mindspore/mindspore/core/ir/dtype/monad_type.cc", "mindspore/mindspore/core/utils/misc.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/pipeline_op.cc", "mindspore/mindspore/core/include/utils/overload.h", "mindspore/mindspore/core/include/utils/system/env.h", "mindspore/mindspore/core/include/utils/hash_map.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/operator_connector.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/auto_index.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/project_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/services.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/datasets.cc", "mindspore/mindspore/core/include/utils/hash_set.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/skip_pushdown_pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/list.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/arena.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/concat_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/vision.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/tensor.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/cache/dataset_cache_impl.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/cpu_sampler.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/device_tensor.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/config_manager.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/python/python_mp.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/shuffle_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/samplers/sequential_sampler_ir.cc", "mindspore/include/api/format.h", "mindspore/mindspore/core/include/utils/hashing.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/tensor_row.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_validation_pass.cc", "mindspore/mindspore/core/utils/trace_base.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/bit.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/status.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/cache/stub/cache_grpc_client.h", "mindspore/mindspore/core/ir/dtype/number.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/btree.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/ir/tensor_operation.h", "mindspore/mindspore/core/utils/label.cc", "mindspore/mindspore/core/ir/func_graph_cloner.cc", "mindspore/mindspore/core/utils/anf_utils.cc", "mindspore/mindspore/ccsrc/include/common/utils/utils.h", "mindspore/mindspore/ccsrc/include/common/utils/convert_utils.h", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/compose_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_lookup_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/build_vocab_op.cc", "mindspore/mindspore/core/include/utils/signal.h", "build/_deps/jpeg_turbo-src/./jerror.h", "mindspore/mindspore/ccsrc/include/common/debug/common.h", "mindspore/mindspore/ccsrc/minddata/dataset/api/transforms.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/path.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/data_queue_op.cc", "build/_deps/jpeg_turbo-src/./jpeglib.h", "mindspore/mindspore/ccsrc/minddata/dataset/api/text.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/execute.cc", "mindspore/mindspore/core/include/ir/kernel_info_dev.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/add_skip_pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/tf_record_node.cc", "mindspore-lite/src/common/log_adapter.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/filter_op.cc", "build/_deps/jpeg_turbo-src/_build/jconfig.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_base_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/take_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/callback/ds_callback.h", "mindspore/mindspore/core/abstract/dshape.cc", "mindspore/mindspore/core/include/ir/dtype/type_id.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/service.cc", "mindspore/mindspore/core/include/base/user_data.h", "mindspore/mindspore/core/ir/meta_tensor.cc", "mindspore/mindspore/core/include/utils/system/base.h", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/py_func_op.cc", "mindspore/mindspore/core/utils/file_utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/task.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/data_queue_node.cc", "third_party/securec/include/securectype.h", "mindspore/mindspore/core/include/utils/compact_set.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/connector.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/system_pool.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/memory_pool.cc", "mindspore/mindspore/core/abstract/param_validator.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/tree_adapter.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mappable_leaf_op.cc", "mindspore/mindspore/core/include/ir/scalar.h", "mindspore/mindspore/core/ir/primitive.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/data_utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/datasets.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/batch_node.cc", "mindspore/mindspore/core/include/utils/visible.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/tree_modifier.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/epoch_ctrl_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/ag_news_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/random_data_op.cc", "mindspore/mindspore/core/include/utils/counter.h", "mindspore/mindspore/core/include/ir/api_tensor_impl.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op/map_job.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/device_queue_tracing.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/execution_tree.cc", "third_party/securec/include/./securectype.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/post/auto_worker_pass.cc", "mindspore/mindspore/core/include/ir/device_address.h", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/transforms.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/task_manager.cc", "mindspore/mindspore/core/ir/manager.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/iterator.h", "third_party/securec/include/securec.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/cache/dataset_cache.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/random_choice_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/samplers.cc", "mindspore/mindspore/core/ir/dtype/ref.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/csv_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op/map_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/monitor.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/shuffle_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/cache/cache_common.h", "mindspore/mindspore/core/include/ir/signature.h", "third_party/securec/include/./securec.h", "mindspore/mindspore/ccsrc/include/common/visible.h", "mindspore/mindspore/ccsrc/minddata/dataset/core/type_id.h", "mindspore/mindspore/core/utils/ms_utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/runtime_context.cc", "mindspore/mindspore/core/include/utils/convert_utils_base.h", "mindspore/include/api/status.h", "mindspore/mindspore/core/abstract/utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/constants.h", "mindspore/mindspore/ccsrc/include/common/utils/comm_manager.h", "mindspore/mindspore/core/utils/system/file_system.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/global_context.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc", "build/_deps/jpeg_turbo-src/./jmorecfg.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/queue_map.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/log_adapter.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/dataset_op.cc", "mindspore/mindspore/core/base/base_ref.cc", "mindspore/mindspore/core/abstract/analysis_context.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/input_validation_pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/skip_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/tensor_op.cc", "mindspore/mindspore/core/utils/any.cc", "mindspore/mindspore/ccsrc/include/common/utils/contract.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/repeat_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/consumers/pull_based_tree_consumer.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/auto_tune.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/nonmappable_leaf_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/data_helper.h", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/duplicate_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/build_vocab_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/de_tensor.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/circular_pool.cc", "mindspore/mindspore/core/utils/ms_context.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/tree_adapter_lite.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.cc", "mindspore/mindspore/core/include/utils/shape_utils.h", "mindspore/mindspore/core/include/ir/dtype/empty.h", "mindspore/mindspore/core/include/utils/symbolic.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/cache/cache_fbb.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/client.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/image_process.cc", "mindspore/mindspore/ccsrc/minddata/dataset/callback/callback_manager.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/repeat_op.cc", "mindspore/include/api/context.h", "mindspore/mindspore/core/include/utils/flags.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/jagged_connector.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.cc", "mindspore/include/api/data_type.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/deep_copy_pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/lite_mat.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/zip_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/getter_pass.cc", "mindspore/mindspore/core/ir/dtype/container.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/data_schema.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/slice.cc", "mindspore/mindspore/core/utils/trace_info.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/mnist_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/ag_news_op.cc", "mindspore/mindspore/core/ir/primal_debug_info.cc", "mindspore/mindspore/core/abstract/abstract_function.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/ir/data/transforms_ir.cc", "mindspore/mindspore/core/abstract/abstract_value.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/wait_post.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/tensor_helpers.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/ir/validators.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/allocator.h", "mindspore/mindspore/core/utils/system/crc32c.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sampler.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/c_func_op.cc", "mindspore/mindspore/core/ir/dtype/tensor_type.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/epoch_ctrl_pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/node_removal_pass.cc", "mindspore/mindspore/core/ir/dtype/type.cc", "mindspore/include/api/dual_abi_helper.h", "mindspore/mindspore/core/ir/anf.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/python/pybind_register.cc", "mindspore/ops/op_def/core_ops.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/rename_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/filter_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/samplers/skip_first_epoch_sampler_ir.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.cc", "mindspore/mindspore/core/include/base/complex_storage.h", "mindspore/mindspore/core/ir/graph_utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/text/kernels/whitespace_tokenizer_op.cc", "mindspore/mindspore/core/include/mindapi/base/type_id.h", "mindspore/mindspore/core/base/base.cc", "mindspore-lite/src/common/log.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/treap.h", "mindspore/mindspore/core/ir/value.cc", "mindspore/mindspore/ccsrc/minddata/dataset/text/kernels/truncate_sequence_pair_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/image/lite_image_utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/samplers.h", "mindspore/mindspore/core/include/utils/ms_utils_secure.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/skip_op.cc", "mindspore/mindspore/core/utils/ordered_map.h", "mindspore/mindspore/core/ir/func_graph_transform.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/queue.h", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.cc", "mindspore/mindspore/core/include/utils/ordered_set.h", "mindspore/mindspore/ccsrc/minddata/dataset/core/types.cc", "mindspore/mindspore/core/ir/primal_attr.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/semaphore.cc", "mindspore/mindspore/core/ir/device_event.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/samplers/prebuilt_sampler_ir.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/dataset_iterator_tracing.cc", "mindspore/mindspore/core/ir/dtype.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc", "mindspore/mindspore/core/ir/func_graph.cc", "mindspore/mindspore/ccsrc/minddata/dataset/text/ir/kernels/text_ir.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/lock.cc", "mindspore/mindspore/ccsrc/minddata/dataset/text/kernels/jieba_tokenizer_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/dataset_iterator.cc", "mindspore/mindspore/ccsrc/minddata/dataset/text/kernels/basic_tokenizer_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/json_fwd.hpp", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/io_block.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/rename_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/device_resource.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/cv_tensor.cc", "mindspore/mindspore/core/include/mindapi/base/shape_vector.h", "mindspore/mindspore/ccsrc/minddata/dataset/core/data_type.cc", "mindspore/mindspore/core/ir/named.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/root_node.cc", "mindspore/include/api/context.h"]} +{"ESSENTIAL": ["mindspore/mindspore/core/include/mindapi/base/format.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/json_helper.cc", "mindspore/mindspore/core/utils/parallel_node_check.cc", "mindspore/mindspore/core/ir/meta_func_graph.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.cc", "mindspore/mindspore/core/utils/log_adapter.cc", "mindspore/mindspore/core/ir/func_graph_base.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/text.h", "mindspore/mindspore/core/ir/tensor.cc", "mindspore/mindspore/core/include/ir/param_info.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/skip_first_epoch_sampler.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/random.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/epoch_ctrl_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/btree_iterator.tpp", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/random_apply_op.cc", "mindspore/mindspore/core/utils/info.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/btree_impl.tpp", "mindspore/mindspore/ccsrc/minddata/dataset/util/validators.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/album_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/cond_var.cc", "mindspore/mindspore/core/utils/ms_exception.cc", "mindspore/mindspore/core/utils/profile.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/execute.h", "mindspore/mindspore/core/include/base/effect_info.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/samplers/samplers_ir.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/parallel_op.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/map_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/intrp_resource.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/dataset_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op/cpu_map_job.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/intrp_service.cc", "mindspore/mindspore/ccsrc/minddata/dataset/callback/callback_param.h", "mindspore/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/zip_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/project_node.cc", "mindspore/mindspore/core/ir/scope.cc", "mindspore/mindspore/core/include/base/float16.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_merge_op.cc", "mindspore/mindspore/core/ir/dtype/monad_type.cc", "mindspore/mindspore/core/utils/misc.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/pipeline_op.cc", "mindspore/mindspore/core/include/utils/overload.h", "mindspore/mindspore/core/include/utils/system/env.h", "mindspore/mindspore/core/include/utils/hash_map.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/operator_connector.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/auto_index.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/project_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/services.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/datasets.cc", "mindspore/mindspore/core/include/utils/hash_set.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/skip_pushdown_pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/list.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/arena.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/concat_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/vision.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/tensor.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/cache/dataset_cache_impl.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/cpu_sampler.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/device_tensor.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/config_manager.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/python/python_mp.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/shuffle_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/samplers/sequential_sampler_ir.cc", "include/api/format.h", "mindspore/mindspore/core/include/utils/hashing.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/tensor_row.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_validation_pass.cc", "mindspore/mindspore/core/utils/trace_base.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/bit.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/status.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/cache/stub/cache_grpc_client.h", "mindspore/mindspore/core/ir/dtype/number.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/btree.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/ir/tensor_operation.h", "mindspore/mindspore/core/utils/label.cc", "mindspore/mindspore/core/ir/func_graph_cloner.cc", "mindspore/mindspore/core/utils/anf_utils.cc", "mindspore/mindspore/ccsrc/include/common/utils/utils.h", "mindspore/mindspore/ccsrc/include/common/utils/convert_utils.h", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/compose_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_lookup_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/build_vocab_op.cc", "mindspore/mindspore/core/include/utils/signal.h", "build/_deps/jpeg_turbo-src/./jerror.h", "mindspore/mindspore/ccsrc/include/common/debug/common.h", "mindspore/mindspore/ccsrc/minddata/dataset/api/transforms.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/path.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/data_queue_op.cc", "build/_deps/jpeg_turbo-src/./jpeglib.h", "mindspore/mindspore/ccsrc/minddata/dataset/api/text.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/execute.cc", "mindspore/mindspore/core/include/ir/kernel_info_dev.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/add_skip_pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/tf_record_node.cc", "mindspore-lite/src/common/log_adapter.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/filter_op.cc", "build/_deps/jpeg_turbo-src/_build/jconfig.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_base_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/take_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/callback/ds_callback.h", "mindspore/mindspore/core/abstract/dshape.cc", "mindspore/mindspore/core/include/ir/dtype/type_id.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/service.cc", "mindspore/mindspore/core/include/base/user_data.h", "mindspore/mindspore/core/ir/meta_tensor.cc", "mindspore/mindspore/core/include/utils/system/base.h", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/py_func_op.cc", "mindspore/mindspore/core/utils/file_utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/task.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/data_queue_node.cc", "third_party/securec/include/securectype.h", "mindspore/mindspore/core/include/utils/compact_set.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/connector.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/system_pool.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/memory_pool.cc", "mindspore/mindspore/core/abstract/param_validator.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/tree_adapter.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mappable_leaf_op.cc", "mindspore/mindspore/core/include/ir/scalar.h", "mindspore/mindspore/core/ir/primitive.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/data_utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/datasets.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/batch_node.cc", "mindspore/mindspore/core/include/utils/visible.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/tree_modifier.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/epoch_ctrl_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/ag_news_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/random_data_op.cc", "mindspore/mindspore/core/include/utils/counter.h", "mindspore/mindspore/core/include/ir/api_tensor_impl.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op/map_job.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/device_queue_tracing.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/execution_tree.cc", "third_party/securec/include/./securectype.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/post/auto_worker_pass.cc", "mindspore/mindspore/core/include/ir/device_address.h", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/transforms.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/task_manager.cc", "mindspore/mindspore/core/ir/manager.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/iterator.h", "third_party/securec/include/securec.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/cache/dataset_cache.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/random_choice_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/samplers.cc", "mindspore/mindspore/core/ir/dtype/ref.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/csv_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op/map_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/monitor.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/shuffle_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/cache/cache_common.h", "mindspore/mindspore/core/include/ir/signature.h", "third_party/securec/include/./securec.h", "mindspore/mindspore/ccsrc/include/common/visible.h", "mindspore/mindspore/ccsrc/minddata/dataset/core/type_id.h", "mindspore/mindspore/core/utils/ms_utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/runtime_context.cc", "mindspore/mindspore/core/include/utils/convert_utils_base.h", "include/api/status.h", "mindspore/mindspore/core/abstract/utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/constants.h", "mindspore/mindspore/ccsrc/include/common/utils/comm_manager.h", "mindspore/mindspore/core/utils/system/file_system.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/global_context.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc", "build/_deps/jpeg_turbo-src/./jmorecfg.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/queue_map.h", "mindspore/mindspore/ccsrc/minddata/dataset/util/log_adapter.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/dataset_op.cc", "mindspore/mindspore/core/base/base_ref.cc", "mindspore/mindspore/core/abstract/analysis_context.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/input_validation_pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/skip_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/tensor_op.cc", "mindspore/mindspore/core/utils/any.cc", "mindspore/mindspore/ccsrc/include/common/utils/contract.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/repeat_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/consumers/pull_based_tree_consumer.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/auto_tune.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/nonmappable_leaf_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/data_helper.h", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/duplicate_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/build_vocab_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/de_tensor.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/circular_pool.cc", "mindspore/mindspore/core/utils/ms_context.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/tree_adapter_lite.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.cc", "mindspore/mindspore/core/include/utils/shape_utils.h", "mindspore/mindspore/core/include/ir/dtype/empty.h", "mindspore/mindspore/core/include/utils/symbolic.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/cache/cache_fbb.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/client.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/image_process.cc", "mindspore/mindspore/ccsrc/minddata/dataset/callback/callback_manager.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/repeat_op.cc", "include/api/context.h", "mindspore/mindspore/core/include/utils/flags.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/jagged_connector.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.cc", "include/api/data_type.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/deep_copy_pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/lite_mat.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/zip_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/getter_pass.cc", "mindspore/mindspore/core/ir/dtype/container.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/data_schema.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/slice.cc", "mindspore/mindspore/core/utils/trace_info.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/mnist_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/ag_news_op.cc", "mindspore/mindspore/core/ir/primal_debug_info.cc", "mindspore/mindspore/core/abstract/abstract_function.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/ir/data/transforms_ir.cc", "mindspore/mindspore/core/abstract/abstract_value.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/wait_post.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/tensor_helpers.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/ir/validators.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/allocator.h", "mindspore/mindspore/core/utils/system/crc32c.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sampler.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/c_func_op.cc", "mindspore/mindspore/core/ir/dtype/tensor_type.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/epoch_ctrl_pass.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/opt/pre/node_removal_pass.cc", "mindspore/mindspore/core/ir/dtype/type.cc", "include/api/dual_abi_helper.h", "mindspore/mindspore/core/ir/anf.cc", "mindspore/mindspore/ccsrc/minddata/dataset/api/python/pybind_register.cc", "mindspore/ops/op_def/core_ops.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/rename_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/filter_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/samplers/skip_first_epoch_sampler_ir.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.cc", "mindspore/mindspore/core/include/base/complex_storage.h", "mindspore/mindspore/core/ir/graph_utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/text/kernels/whitespace_tokenizer_op.cc", "mindspore/mindspore/core/include/mindapi/base/type_id.h", "mindspore/mindspore/core/base/base.cc", "mindspore-lite/src/common/log.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/treap.h", "mindspore/mindspore/core/ir/value.cc", "mindspore/mindspore/ccsrc/minddata/dataset/text/kernels/truncate_sequence_pair_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/image/lite_image_utils.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/samplers.h", "mindspore/mindspore/core/include/utils/ms_utils_secure.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/skip_op.cc", "mindspore/mindspore/core/utils/ordered_map.h", "mindspore/mindspore/core/ir/func_graph_transform.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/queue.h", "mindspore/mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.cc", "mindspore/mindspore/core/include/utils/ordered_set.h", "mindspore/mindspore/ccsrc/minddata/dataset/core/types.cc", "mindspore/mindspore/core/ir/primal_attr.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/semaphore.cc", "mindspore/mindspore/core/ir/device_event.h", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/samplers/prebuilt_sampler_ir.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/perf/dataset_iterator_tracing.cc", "mindspore/mindspore/core/ir/dtype.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc", "mindspore/mindspore/core/ir/func_graph.cc", "mindspore/mindspore/ccsrc/minddata/dataset/text/ir/kernels/text_ir.cc", "mindspore/mindspore/ccsrc/minddata/dataset/util/lock.cc", "mindspore/mindspore/ccsrc/minddata/dataset/text/kernels/jieba_tokenizer_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/dataset_iterator.cc", "mindspore/mindspore/ccsrc/minddata/dataset/text/kernels/basic_tokenizer_op.cc", "mindspore/mindspore/ccsrc/minddata/dataset/include/dataset/json_fwd.hpp", "mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/io_block.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/rename_node.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/device_resource.cc", "mindspore/mindspore/ccsrc/minddata/dataset/core/cv_tensor.cc", "mindspore/mindspore/core/include/mindapi/base/shape_vector.h", "mindspore/mindspore/ccsrc/minddata/dataset/core/data_type.cc", "mindspore/mindspore/core/ir/named.cc", "mindspore/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/root_node.cc", "include/api/context.h"]} diff --git a/mindspore-lite/tools/obfuscator/include/deobfuscator.h b/mindspore-lite/tools/obfuscator/include/deobfuscator.h index a243b0c2c..3a33b9f77 100644 --- a/mindspore-lite/tools/obfuscator/include/deobfuscator.h +++ b/mindspore-lite/tools/obfuscator/include/deobfuscator.h @@ -22,7 +22,7 @@ #include "src/common/log_adapter.h" #include "include/model.h" #include "schema/inner/model_generated.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" #define IV_SIZE 16 diff --git a/mindspore-lite/tools/optimizer/common/gllo_utils.h b/mindspore-lite/tools/optimizer/common/gllo_utils.h index 41bce6011..2fe4035a4 100644 --- a/mindspore-lite/tools/optimizer/common/gllo_utils.h +++ b/mindspore-lite/tools/optimizer/common/gllo_utils.h @@ -32,7 +32,7 @@ #include "infer/cxx_api/conv2d_backprop_input_fusion.h" #include "schema/inner/model_generated.h" #include "tools/converter/converter_context.h" -#include "include/cxx_api/status.h" +#include "include/api/status.h" using PrimitiveCPtr = std::shared_ptr; using mindspore::lite::RET_ERROR; diff --git a/mindspore-lite/tools/optimizer/const_fold/fold_utils.h b/mindspore-lite/tools/optimizer/const_fold/fold_utils.h index b8c41ee50..e60c3c9bb 100644 --- a/mindspore-lite/tools/optimizer/const_fold/fold_utils.h +++ b/mindspore-lite/tools/optimizer/const_fold/fold_utils.h @@ -19,7 +19,7 @@ #include #include "ir/anf.h" -#include "include/cxx_api/context.h" +#include "include/api/context.h" #include "include/registry/converter_context.h" #include "schema/inner/model_generated.h" #include "src/litert/inner_context.h" diff --git a/mindspore-lite/tools/optimizer/graph/input_data_type_trans_pass.h b/mindspore-lite/tools/optimizer/graph/input_data_type_trans_pass.h index 885f92735..33a7251d7 100644 --- a/mindspore-lite/tools/optimizer/graph/input_data_type_trans_pass.h +++ b/mindspore-lite/tools/optimizer/graph/input_data_type_trans_pass.h @@ -18,9 +18,9 @@ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_GRAPH_INPUT_DATA_TYPE_TRANS_PASS_H_ #include #include "include/backend/optimizer/pass.h" -#include "include/cxx_api/data_type.h" +#include "include/api/data_type.h" #include "tools/optimizer/common/gllo_utils.h" -#include "include/cxx_api/types.h" +#include "include/api/types.h" namespace mindspore::opt { class InOutDTypeTransPass : public Pass { diff --git a/mindspore-lite/tools/optimizer/graph/specify_graph_input_format.h b/mindspore-lite/tools/optimizer/graph/specify_graph_input_format.h index 4b0ff79a8..12d51a4cd 100644 --- a/mindspore-lite/tools/optimizer/graph/specify_graph_input_format.h +++ b/mindspore-lite/tools/optimizer/graph/specify_graph_input_format.h @@ -19,8 +19,8 @@ #include "include/backend/optimizer/pass.h" #include "tools/optimizer/common/gllo_utils.h" -#include "include/cxx_api/format.h" -#include "include/cxx_api/types.h" +#include "include/api/format.h" +#include "include/api/types.h" #include "include/registry/converter_context.h" namespace mindspore { diff --git a/mindspore-lite/tools/optimizer/graph/specify_graph_output_format.h b/mindspore-lite/tools/optimizer/graph/specify_graph_output_format.h index 3ae220384..1b75110cb 100644 --- a/mindspore-lite/tools/optimizer/graph/specify_graph_output_format.h +++ b/mindspore-lite/tools/optimizer/graph/specify_graph_output_format.h @@ -19,8 +19,8 @@ #include "include/backend/optimizer/pass.h" #include "tools/optimizer/common/gllo_utils.h" -#include "include/cxx_api/format.h" -#include "include/cxx_api/types.h" +#include "include/api/format.h" +#include "include/api/types.h" #include "include/registry/converter_context.h" namespace mindspore { diff --git a/mindspore-lite/tools/providers/triton/backend/src/mslite_model_state.h b/mindspore-lite/tools/providers/triton/backend/src/mslite_model_state.h index c4fbeb361..29fd0c7f1 100644 --- a/mindspore-lite/tools/providers/triton/backend/src/mslite_model_state.h +++ b/mindspore-lite/tools/providers/triton/backend/src/mslite_model_state.h @@ -25,8 +25,8 @@ #include "triton/backend/backend_model.h" #include "triton/backend/backend_model_instance.h" #include "triton/core/tritonserver.h" -#include "include/cxx_api/context.h" -#include "include/cxx_api/model.h" +#include "include/api/context.h" +#include "include/api/model.h" #include "triton/backend/backend_input_collector.h" #include "triton/backend/backend_output_responder.h" diff --git a/mindspore-lite/tools/providers/triton/backend/src/mslite_utils.h b/mindspore-lite/tools/providers/triton/backend/src/mslite_utils.h index 834b6993b..ad7d39879 100644 --- a/mindspore-lite/tools/providers/triton/backend/src/mslite_utils.h +++ b/mindspore-lite/tools/providers/triton/backend/src/mslite_utils.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_TOOLS_PROVIDERS_TRITON_BACKEND_SRC_MSLITE_UTILS_H_ #include -#include "include/cxx_api/data_type.h" +#include "include/api/data_type.h" #include "triton/core/tritonserver.h" namespace triton { -- Gitee