From 8f70e6128bfb8e4f11af69522632c2f04a722464 Mon Sep 17 00:00:00 2001 From: liuf9 Date: Tue, 12 Aug 2025 14:28:53 +0800 Subject: [PATCH 1/3] remove remaining available BUILD_LITE --- build.bat | 1 + mindspore-lite/ops/CMakeLists.txt | 2 + mindspore-lite/ops/OWNERS | 12 + mindspore-lite/src/CMakeLists.txt | 3 +- mindspore-lite/tools/converter/CMakeLists.txt | 3 +- scripts/build/build_lite.sh | 1 + .../0001-remove-lite-related-keyword.patch | 633 ++++++++++++++++++ 7 files changed, 653 insertions(+), 2 deletions(-) create mode 100644 mindspore-lite/ops/CMakeLists.txt create mode 100644 mindspore-lite/ops/OWNERS create mode 100644 third_party/patch/mindspore/0001-remove-lite-related-keyword.patch diff --git a/build.bat b/build.bat index 1405ccd7..ef9cbc93 100644 --- a/build.bat +++ b/build.bat @@ -34,6 +34,7 @@ set ENABLE_FFMPEG=ON set ENABLE_FFMPEG_DOWNLOAD=OFF for /f "tokens=1" %%a in (version.txt) do (set VERSION_STR=%%a) git submodule update --init --remote mindspore +pushd "%BASE_PATH%/mindspore" && git apply "%BASE_PATH%/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch" --whitespace=fix && popd ECHO %2%|FINDSTR "^[0-9][0-9]*$" IF %errorlevel% == 0 ( SET threads=%2% diff --git a/mindspore-lite/ops/CMakeLists.txt b/mindspore-lite/ops/CMakeLists.txt new file mode 100644 index 00000000..9cf336f6 --- /dev/null +++ b/mindspore-lite/ops/CMakeLists.txt @@ -0,0 +1,2 @@ +include(${OPS_DIR}/cmake/op_def.cmake) +include(${OPS_DIR}/cmake/ops.cmake) \ No newline at end of file diff --git a/mindspore-lite/ops/OWNERS b/mindspore-lite/ops/OWNERS new file mode 100644 index 00000000..e6f490b4 --- /dev/null +++ b/mindspore-lite/ops/OWNERS @@ -0,0 +1,12 @@ +approvers: +- jjfeing +- YeFeng_24 +- fatmouse007fatmouse007 +- xu_anyue +- jianghui58 + +reviewers: +- liuf9 # liufeiyang + +options: + no_parent_owners: true diff --git a/mindspore-lite/src/CMakeLists.txt b/mindspore-lite/src/CMakeLists.txt index 84895340..b4e761fd 100644 --- a/mindspore-lite/src/CMakeLists.txt +++ b/mindspore-lite/src/CMakeLists.txt @@ -318,7 +318,8 @@ set(TRAIN_SRC if(MSLITE_ENABLE_KERNEL_EXECUTOR AND NOT MSLITE_ENABLE_CONVERTER) add_subdirectory(${CORE_DIR} mindspore_core) - add_subdirectory(${OPS_DIR} mindspore_ops) + + add_subdirectory(${LITE_DIR}/ops mindspore_ops) endif() if(MSLITE_ENABLE_MINDRT) diff --git a/mindspore-lite/tools/converter/CMakeLists.txt b/mindspore-lite/tools/converter/CMakeLists.txt index fde87f08..861d05cc 100644 --- a/mindspore-lite/tools/converter/CMakeLists.txt +++ b/mindspore-lite/tools/converter/CMakeLists.txt @@ -86,7 +86,8 @@ add_subdirectory(config_parser) add_subdirectory(micro/coder) add_subdirectory(${CORE_DIR} mindspore_core) -add_subdirectory(${OPS_DIR} mindspore_ops) + +add_subdirectory(${LITE_DIR}/ops mindspore_ops) if(MSLITE_ENABLE_ACL) set(MODE_ASCEND_ACL ON) diff --git a/scripts/build/build_lite.sh b/scripts/build/build_lite.sh index 5ef24a8d..a4456611 100755 --- a/scripts/build/build_lite.sh +++ b/scripts/build/build_lite.sh @@ -925,6 +925,7 @@ if [[ "X$ENABLE_FAST_HASH_TABLE" == "Xon" ]]; then else CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_FAST_HASH_TABLE=OFF" fi +cd ${BASEPATH}/mindspore && git apply ../third_party/patch/mindspore/0001-remove-lite-related-keyword.patch --whitespace=fix get_version CMAKE_ARGS="${CMAKE_ARGS} -DVERSION_STR=${VERSION_STR}" diff --git a/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch b/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch new file mode 100644 index 00000000..91623814 --- /dev/null +++ b/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch @@ -0,0 +1,633 @@ +From 6d8f92fdf2473a04fcaf296a38b8e6e97afb0a56 Mon Sep 17 00:00:00 2001 +From: liuf9 +Date: Thu, 24 Jul 2025 17:24:52 +0800 +Subject: [PATCH] remove lite-related keyword + +--- + cmake/external_libs/securec.cmake | 57 +-------- + cmake/gencode.cmake | 108 +++++++++--------- + include/api/metrics/accuracy.h | 1 - + mindspore/ccsrc/include/common/utils/utils.h | 7 -- + .../ccsrc/memory/mem_pool/mem_tracker.cc | 43 +++++++ + .../ccsrc/minddata/mindrecord/CMakeLists.txt | 2 +- + .../ascend/symbol_interface/symbol_utils.h | 8 -- + mindspore/ccsrc/utils/utils.cc | 88 -------------- + mindspore/ops/CMakeLists.txt | 10 +- + mindspore/ops/cmake/op_def.cmake | 7 +- + mindspore/ops/cmake/ops.cmake | 29 +++-- + mindspore/ops/kernel/cpu/CMakeLists.txt | 10 +- + scripts/build/usage.sh | 9 +- + 13 files changed, 132 insertions(+), 247 deletions(-) + +diff --git a/cmake/external_libs/securec.cmake b/cmake/external_libs/securec.cmake +index a14c6d21120..115b238b67b 100644 +--- a/cmake/external_libs/securec.cmake ++++ b/cmake/external_libs/securec.cmake +@@ -1,22 +1,10 @@ + set(securec_USE_STATIC_LIBS ON) + +-if(BUILD_LITE) +- if(MSVC) +- set(securec_CXXFLAGS "${CMAKE_CXX_FLAGS}") +- set(securec_CFLAGS "${CMAKE_C_FLAGS}") +- set(securec_LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") +- else() +- set(securec_CXXFLAGS "${CMAKE_CXX_FLAGS}") +- set(securec_CFLAGS "${CMAKE_C_FLAGS}") +- set(securec_LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") +- endif() ++if(MSVC) ++ # add "/EHsc", for vs2019 warning C4530 about securec ++ set(securec_CXXFLAGS "${CMAKE_CXX_FLAGS} /EHsc") + else() +- if(MSVC) +- # add "/EHsc", for vs2019 warning C4530 about securec +- set(securec_CXXFLAGS "${CMAKE_CXX_FLAGS} /EHsc") +- else() +- set(securec_CXXFLAGS "${CMAKE_CXX_FLAGS}") +- endif() ++ set(securec_CXXFLAGS "${CMAKE_CXX_FLAGS}") + endif() + + if(TARGET_OHOS) +@@ -27,48 +15,13 @@ endif() + set(REQ_URL "https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.16.zip") + set(SHA256 "5119bda1ee96440c1a45e23f0cb8b079cc6697e052c4a78f27d0869f84ba312b") + +-string(REPLACE "/mindspore/lite" "" MS_TOP_DIR ${CMAKE_SOURCE_DIR}) +- +-if(BUILD_LITE) +- if(ANDROID_NDK) +- if(PLATFORM_ARM64) +- if(MSLITE_ENABLE_AOS) +- set(CMAKE_OPTION ${CMAKE_OPTION} -DCMAKE_C_COMPILER=${C_COMPILER} +- -DCMAKE_CXX_COMPILER=${CXX_COMPILER} +- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) +- else() +- set(CMAKE_OPTION -DCMAKE_TOOLCHAIN_FILE=$ENV{ANDROID_NDK}/build/cmake/android.toolchain.cmake +- -DANDROID_NATIVE_API_LEVEL=19 +- -DANDROID_NDK=$ENV{ANDROID_NDK} +- -DANDROID_ABI=arm64-v8a +- -DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang +- -DANDROID_STL=c++_shared -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) +- endif() +- endif() +- if(PLATFORM_ARM32) +- set(CMAKE_OPTION -DCMAKE_TOOLCHAIN_FILE=$ENV{ANDROID_NDK}/build/cmake/android.toolchain.cmake +- -DANDROID_NATIVE_API_LEVEL=19 +- -DANDROID_NDK=$ENV{ANDROID_NDK} +- -DANDROID_ABI=armeabi-v7a +- -DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang +- -DANDROID_STL=c++_shared -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) +- endif() +- else() +- if(PLATFORM_ARM64 AND MSLITE_ENABLE_AOS) +- set(CMAKE_OPTION ${CMAKE_OPTION} -DCMAKE_C_COMPILER=${C_COMPILER} +- -DCMAKE_CXX_COMPILER=${CXX_COMPILER} +- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) +- endif() +- endif() +-endif() +- + mindspore_add_pkg(securec + VER 1.1.16 + LIBS securec + URL ${REQ_URL} + SHA256 ${SHA256} + CMAKE_OPTION ${CMAKE_OPTION} -DTARGET_OHOS_LITE=OFF +- PATCHES ${MS_TOP_DIR}/third_party/patch/securec/securec.patch001 ++ PATCHES ${TOP_DIR}/third_party/patch/securec/securec.patch001 + ) + + include_directories(${securec_INC}) +diff --git a/cmake/gencode.cmake b/cmake/gencode.cmake +index 94f0799a9eb..49edadee12a 100755 +--- a/cmake/gencode.cmake ++++ b/cmake/gencode.cmake +@@ -7,7 +7,7 @@ endif() + # generate operation definition code, include python/mindspore/ops/auto_generate/gen_ops_def.py + # and ops/op_def/auto_generate/gen_ops_def.cc + execute_process(COMMAND "${PYTHON_EXECUTABLE}" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/python/mindspore/ops_generate/gen_ops.py" ++ "${OPS_DIR}/../../mindspore/python/mindspore/ops_generate/gen_ops.py" + RESULT_VARIABLE STATUS) + if(NOT STATUS EQUAL "0") + message(FATAL_ERROR "Generate operator python/c++ definitions FAILED.") +@@ -16,56 +16,56 @@ else() + endif() + + add_custom_target(generated_code DEPENDS +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/python/mindspore/ops/auto_generate/gen_ops_def.py" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/python/mindspore/ops/auto_generate/cpp_create_prim_instance_helper.py" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_deprecated_ops_def.cc" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_lite_ops.cc" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_lite_ops.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_a.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_b.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_c.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_d.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_e.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_f.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_g.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_h.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_i.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_k.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_l.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_m.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_n.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_o.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_p.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_q.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_r.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_s.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_t.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_u.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_v.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_w.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_x.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_z.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_a.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_b.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_c.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_d.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_e.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_f.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_g.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_h.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_i.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_k.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_l.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_m.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_n.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_o.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_p.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_q.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_r.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_s.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_t.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_u.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_v.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_w.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_x.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_z.h") ++ "${OPS_DIR}/../../mindspore/python/mindspore/ops/auto_generate/gen_ops_def.py" ++ "${OPS_DIR}/../../mindspore/python/mindspore/ops/auto_generate/cpp_create_prim_instance_helper.py" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_deprecated_ops_def.cc" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_lite_ops.cc" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_lite_ops.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_a.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_b.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_c.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_d.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_e.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_f.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_g.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_h.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_i.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_k.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_l.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_m.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_n.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_o.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_p.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_q.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_r.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_s.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_t.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_u.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_v.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_w.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_x.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_name_z.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_a.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_b.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_c.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_d.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_e.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_f.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_g.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_h.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_i.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_k.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_l.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_m.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_n.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_o.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_p.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_q.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_r.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_s.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_t.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_u.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_v.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_w.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_x.h" ++ "${OPS_DIR}/../../mindspore/ops/op_def/auto_generate/gen_ops_primitive_z.h") +diff --git a/include/api/metrics/accuracy.h b/include/api/metrics/accuracy.h +index 522fb2be7ab..d5b4720d0ab 100644 +--- a/include/api/metrics/accuracy.h ++++ b/include/api/metrics/accuracy.h +@@ -30,7 +30,6 @@ class MS_API AccuracyMetrics : public Metrics { + /// \param[in] accuracy_metrics The metrics of accuracy. + /// \param[in] input_indexes The indexes of inputs. + /// \param[in] output_indexes The indexes of outputs. +- + explicit AccuracyMetrics(int accuracy_metrics = METRICS_CLASSIFICATION, const std::vector &input_indexes = {1}, + const std::vector &output_indexes = {0}); + /// \brief Destructor of AccuracyMetrics. +diff --git a/mindspore/ccsrc/include/common/utils/utils.h b/mindspore/ccsrc/include/common/utils/utils.h +index 92855109d3d..69033fd014c 100644 +--- a/mindspore/ccsrc/include/common/utils/utils.h ++++ b/mindspore/ccsrc/include/common/utils/utils.h +@@ -339,10 +339,6 @@ constexpr auto kToNpu = "Ascend"; + constexpr auto kToCpu = "CPU"; + constexpr auto kToDisk = "Disk"; + +-// Return vec +-COMMON_EXPORT std::vector> GetPythonStack_(); +-COMMON_EXPORT std::string GetPythonStackStr_(); +- + COMMON_EXPORT bool IsOneOfCustomAkgType(const std::string &name); + COMMON_EXPORT bool IsOneOfOperator(const std::string &name); + COMMON_EXPORT bool IsOneOfNotSupportedTransFormat(const std::string &format); +@@ -370,9 +366,6 @@ COMMON_EXPORT AnfNodeWeakPtrList SuccDeeperWithAttrGraph(const AnfNodePtr &node) + COMMON_EXPORT bool SkipOrResetCopyAction(bool need_reset = false); + // only sync once flag + COMMON_EXPORT bool SkipOrResetSyncAction(bool need_reset = false); +-// Return vec +-COMMON_EXPORT std::vector> GetPythonStack(); +-COMMON_EXPORT std::string GetPythonStackStr(); + + // Return whether it is jit. + COMMON_EXPORT bool IsJit(); +diff --git a/mindspore/ccsrc/memory/mem_pool/mem_tracker.cc b/mindspore/ccsrc/memory/mem_pool/mem_tracker.cc +index 67f801fe159..da77e92d52e 100644 +--- a/mindspore/ccsrc/memory/mem_pool/mem_tracker.cc ++++ b/mindspore/ccsrc/memory/mem_pool/mem_tracker.cc +@@ -32,6 +32,9 @@ + #include "utils/distributed_meta.h" + #include "ir/device_type.h" + #include "include/common/utils/utils.h" ++#include "pybind11/pybind11.h" ++ ++namespace py = pybind11; + + namespace mindspore { + namespace device { +@@ -40,6 +43,46 @@ namespace { + constexpr int64_t kUserTaskNumThreshold = 1e6; + constexpr size_t kLogThreshold = 10; + constexpr size_t kLogPersentage = 100; ++ ++std::vector> GetPythonStack() { ++ std::vector> all_stacks; ++ try { ++ const size_t func_name_index = 2; ++ const size_t min_frame_info_size = 3; ++ py::gil_scoped_acquire gil_acquire; ++ py::module traceback_module = py::module::import("traceback"); ++ py::list extracted_stack = traceback_module.attr("extract_stack")(); ++ for (size_t i = 0; i < extracted_stack.size(); ++i) { ++ py::tuple frame_info = extracted_stack[i].cast(); ++ if (frame_info.size() < min_frame_info_size) { ++ MS_LOG(ERROR) << "frame_info size is invalid, frame_info size:" << frame_info.size(); ++ continue; ++ } ++ ++ // frame_info: (filename, line number, function name, code_context) ++ std::string file_name = frame_info[0].cast(); ++ int line_number = frame_info[1].cast(); ++ std::string func_name = frame_info[func_name_index].cast(); ++ (void)all_stacks.emplace_back(std::tuple(file_name, line_number, func_name)); ++ } ++ } catch (const std::exception &e) { ++ MS_LOG(ERROR) << "Error while accessing Python stack: " << e.what(); ++ } ++ ++ return all_stacks; ++} ++ ++std::string GetPythonStackStr() { ++ const auto &stacks = GetPythonStack(); ++ const size_t func_name_index = 2; ++ ++ std::stringstream ss; ++ for (const auto &stack_info : stacks) { ++ ss << "File:" << std::get<0>(stack_info) << ";Line:" << std::get<1>(stack_info) ++ << ";Function:" << std::get(stack_info) << '|'; ++ } ++ return ss.str(); ++} + } // namespace + + void MemoryTrackerEnabled::AddTask(const std::string &task_name, const std::string &node_name, +diff --git a/mindspore/ccsrc/minddata/mindrecord/CMakeLists.txt b/mindspore/ccsrc/minddata/mindrecord/CMakeLists.txt +index c72c30b788d..371adbf93e6 100644 +--- a/mindspore/ccsrc/minddata/mindrecord/CMakeLists.txt ++++ b/mindspore/ccsrc/minddata/mindrecord/CMakeLists.txt +@@ -60,6 +60,6 @@ else() + endif() + endif() + +-if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT MSLITE_ENABLE_CLOUD_MIND_DATA) ++if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + set_target_properties(_c_mindrecord PROPERTIES INSTALL_RPATH ${ORIGIN_PATH}:${ORIGIN_PATH}/lib) + endif() +diff --git a/mindspore/ccsrc/plugin/res_manager/ascend/symbol_interface/symbol_utils.h b/mindspore/ccsrc/plugin/res_manager/ascend/symbol_interface/symbol_utils.h +index 7e14dbe0d78..5036ffb7a93 100644 +--- a/mindspore/ccsrc/plugin/res_manager/ascend/symbol_interface/symbol_utils.h ++++ b/mindspore/ccsrc/plugin/res_manager/ascend/symbol_interface/symbol_utils.h +@@ -59,7 +59,6 @@ auto RunAscendApi(Function f, const char *file, int line, const char *call_f, co + if (f == nullptr) { + MS_LOG(EXCEPTION) << func_name << " is null."; + } +-#ifndef BUILD_LITE + if constexpr (std::is_same_v, int>) { + auto ret = f(args...); + if (ret != ACL_SUCCESS && aclrt_get_last_error != nullptr && +@@ -83,9 +82,6 @@ auto RunAscendApi(Function f, const char *file, int line, const char *call_f, co + } else { + return f(args...); + } +-#else +- return f(args...); +-#endif + } + + template +@@ -93,7 +89,6 @@ auto RunAscendApi(Function f, const char *file, int line, const char *call_f, co + if (f == nullptr) { + MS_LOG(EXCEPTION) << func_name << " is null."; + } +-#ifndef BUILD_LITE + if constexpr (std::is_same_v, int>) { + auto ret = f(); + if (ret != ACL_SUCCESS && aclrt_get_last_error != nullptr && +@@ -117,9 +112,6 @@ auto RunAscendApi(Function f, const char *file, int line, const char *call_f, co + } else { + return f(); + } +-#else +- return f(); +-#endif + } + + template +diff --git a/mindspore/ccsrc/utils/utils.cc b/mindspore/ccsrc/utils/utils.cc +index 20f47987abc..75401d44590 100644 +--- a/mindspore/ccsrc/utils/utils.cc ++++ b/mindspore/ccsrc/utils/utils.cc +@@ -42,11 +42,6 @@ + #include "ir/graph_utils.h" + #include "ir/func_graph_flag.h" + +-#if !defined(BUILD_LITE) +-#include "pybind11/pybind11.h" +-namespace py = pybind11; +-#endif +- + namespace mindspore { + namespace { + constexpr size_t kKBToByte = 1024; +@@ -67,47 +62,6 @@ bool IsOneOfCacheBlackList(const std::string &name) { + return iter != kOpCacheBlackList.end(); + } + +-std::vector> GetPythonStack_() { +- std::vector> all_stacks; +-#if !defined(BUILD_LITE) +- try { +- const size_t func_name_index = 2; +- const size_t min_frame_info_size = 3; +- py::gil_scoped_acquire gil_acquire; +- py::module traceback_module = py::module::import("traceback"); +- py::list extracted_stack = traceback_module.attr("extract_stack")(); +- for (size_t i = 0; i < extracted_stack.size(); ++i) { +- py::tuple frame_info = extracted_stack[i].cast(); +- if (frame_info.size() < min_frame_info_size) { +- MS_LOG(ERROR) << "frame_info size is invalid, frame_info size:" << frame_info.size(); +- continue; +- } +- // frame_info: (filename, line number, function name, code_context) +- std::string file_name = frame_info[0].cast(); +- int line_number = frame_info[1].cast(); +- std::string func_name = frame_info[func_name_index].cast(); +- (void)all_stacks.emplace_back(std::tuple(file_name, line_number, func_name)); +- } +- } catch (const std::exception &e) { +- MS_LOG(ERROR) << "Error while accessing Python stack: " << e.what(); +- } +-#endif +- +- return all_stacks; +-} +- +-std::string GetPythonStackStr_() { +- const auto &stacks = GetPythonStack_(); +- const size_t func_name_index = 2; +- +- std::stringstream ss; +- for (const auto &stack_info : stacks) { +- ss << "File:" << std::get<0>(stack_info) << ";Line:" << std::get<1>(stack_info) +- << ";Function:" << std::get(stack_info) << '|'; +- } +- return ss.str(); +-} +- + bool IsOneOf3DFormat(const std::string &format) { + static const std::set k3DFormatSet = {kOpFormat_NCDHW, kOpFormat_NDC1HWC0, kOpFormat_FRACTAL_Z_3D, + kOpFormat_NDHWC, kOpFormat_DHWCN, kOpFormat_DHWNC}; +@@ -407,48 +361,6 @@ bool SkipOrResetSyncAction(bool need_reset) { + return false; + } + +-std::vector> GetPythonStack() { +- std::vector> all_stacks; +-#if !defined(BUILD_LITE) +- try { +- const size_t func_name_index = 2; +- const size_t min_frame_info_size = 3; +- py::gil_scoped_acquire gil_acquire; +- py::module traceback_module = py::module::import("traceback"); +- py::list extracted_stack = traceback_module.attr("extract_stack")(); +- for (size_t i = 0; i < extracted_stack.size(); ++i) { +- py::tuple frame_info = extracted_stack[i].cast(); +- if (frame_info.size() < min_frame_info_size) { +- MS_LOG(ERROR) << "frame_info size is invalid, frame_info size:" << frame_info.size(); +- continue; +- } +- +- // frame_info: (filename, line number, function name, code_context) +- std::string file_name = frame_info[0].cast(); +- int line_number = frame_info[1].cast(); +- std::string func_name = frame_info[func_name_index].cast(); +- (void)all_stacks.emplace_back(std::tuple(file_name, line_number, func_name)); +- } +- } catch (const std::exception &e) { +- MS_LOG(ERROR) << "Error while accessing Python stack: " << e.what(); +- } +-#endif +- +- return all_stacks; +-} +- +-std::string GetPythonStackStr() { +- const auto &stacks = GetPythonStack(); +- const size_t func_name_index = 2; +- +- std::stringstream ss; +- for (const auto &stack_info : stacks) { +- ss << "File:" << std::get<0>(stack_info) << ";Line:" << std::get<1>(stack_info) +- << ";Function:" << std::get(stack_info) << '|'; +- } +- return ss.str(); +-} +- + bool IsJit() { + auto context = MsContext::GetInstance(); + MS_EXCEPTION_IF_NULL(context); +diff --git a/mindspore/ops/CMakeLists.txt b/mindspore/ops/CMakeLists.txt +index 10e21bb1f88..eecfde93847 100644 +--- a/mindspore/ops/CMakeLists.txt ++++ b/mindspore/ops/CMakeLists.txt +@@ -15,11 +15,9 @@ else() + include(cmake/ops.cmake) + endif() + +-if(NOT BUILD_LITE) +- # mindspore_ops_grad +- include(cmake/ops_grad.cmake) ++# mindspore_ops_grad ++include(cmake/ops_grad.cmake) + +- add_subdirectory(kernel) ++add_subdirectory(kernel) + +- include(cmake/ops_host.cmake) +-endif() +\ No newline at end of file ++include(cmake/ops_host.cmake) +diff --git a/mindspore/ops/cmake/op_def.cmake b/mindspore/ops/cmake/op_def.cmake +index 2bc31745935..bf774f92247 100644 +--- a/mindspore/ops/cmake/op_def.cmake ++++ b/mindspore/ops/cmake/op_def.cmake +@@ -1,6 +1,7 @@ +-set(OP_DEF_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ops/op_def) ++set(OP_DEF_DIR ${OPS_DIR}/op_def) + +-include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/gencode.cmake) ++message(STATUS "YYYYYYYYYYYYYY MINDSPORE: ${OPS_DIR}") ++include(${OPS_DIR}/../../cmake/gencode.cmake) + +-file(GLOB_RECURSE OP_DEF_SRC RELAITVE ${CMAKE_CURRENT_SOURCE_DIR} "${OP_DEF_DIR}/*.cc") ++file(GLOB_RECURSE OP_DEF_SRC RELAITVE ${OPS_DIR} "${OP_DEF_DIR}/*.cc") + list(REMOVE_ITEM CORE_OPS_LIST "${OP_DEF_DIR}/prim_def.cc") +\ No newline at end of file +diff --git a/mindspore/ops/cmake/ops.cmake b/mindspore/ops/cmake/ops.cmake +index f8f8d62e44e..07c3a4b3393 100644 +--- a/mindspore/ops/cmake/ops.cmake ++++ b/mindspore/ops/cmake/ops.cmake +@@ -1,4 +1,4 @@ +-# include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/gencode.cmake) ++# include(${OPS_DIR}/../../cmake/gencode.cmake) + set(INFER_DIR "infer") + set(VIEW_DIR "view") + set(UTILS_DIR "ops_utils") +@@ -20,31 +20,30 @@ endif() + + # ------- CORE_OPS_LIST, CORE_SYMBOL_OPS_LIST ------ + include(${OPS_DIR}/cmake/merge_ops.cmake) +-if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR NOT BUILD_LITE) +- file(GLOB_RECURSE INFER_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INFER_DIR}/*.cc") ++if(CMAKE_SIZEOF_VOID_P EQUAL 4) ++ file(GLOB_RECURSE INFER_LIST RELATIVE ${OPS_DIR} "${INFER_DIR}/*.cc") + + # merge infer/ops_func_impl/*.cc and infer/*.cc(no recursive) +- file(GLOB OLD_INFER_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INFER_DIR}/*.cc") +- file(GLOB_RECURSE INFER_FUNC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INFER_DIR}/ops_func_impl/*.cc") ++ file(GLOB OLD_INFER_LIST RELATIVE ${OPS_DIR} "${INFER_DIR}/*.cc") ++ file(GLOB_RECURSE INFER_FUNC_LIST RELATIVE ${OPS_DIR} "${INFER_DIR}/ops_func_impl/*.cc") + list(REMOVE_ITEM INFER_LIST ${INFER_FUNC_LIST} ${OLD_INFER_LIST}) + set(INFER_MERGE_DIR ${CMAKE_BINARY_DIR}/merge/mindspore/ops/infer) +- merge_ops_files(${CMAKE_CURRENT_SOURCE_DIR}/infer/ops_func_impl/ ${INFER_MERGE_DIR} infer_func_merge "") +- merge_ops_files(${CMAKE_CURRENT_SOURCE_DIR}/infer/ ${INFER_MERGE_DIR} old_infer_merge "" TRUE) # no recursive ++ merge_ops_files(${OPS_DIR}/infer/ops_func_impl/ ${INFER_MERGE_DIR} infer_func_merge "") ++ merge_ops_files(${OPS_DIR}/infer/ ${INFER_MERGE_DIR} old_infer_merge "" TRUE) # no recursive + file(GLOB_RECURSE INFER_MERGE_LIST "${INFER_MERGE_DIR}/*.cc") + +- file(GLOB_RECURSE CORE_SYMBOL_OPS_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INFER_DIR}/symbol_ops_impl/*.cc") +- file(GLOB_RECURSE VIEW_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${VIEW_DIR}/*.cc") +- file(GLOB_RECURSE UTILS_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${UTILS_DIR}/*.cc") ++ file(GLOB_RECURSE CORE_SYMBOL_OPS_LIST RELATIVE ${OPS_DIR} "${INFER_DIR}/symbol_ops_impl/*.cc") ++ file(GLOB_RECURSE VIEW_LIST RELATIVE ${OPS_DIR} "${VIEW_DIR}/*.cc") ++ file(GLOB_RECURSE UTILS_LIST RELATIVE ${OPS_DIR} "${UTILS_DIR}/*.cc") + set_property(SOURCE ${CORE_SYMBOL_OPS_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_SYMBOLIC_SHAPE) + + list(APPEND CORE_OPS_LIST ${VIEW_LIST} ${UTILS_LIST} ${OP_DEF_SRC} ${INFER_LIST} ${INFER_MERGE_LIST}) + else() +- # ------- LITE merge_files ----- +- merge_ops_files(${CMAKE_CURRENT_SOURCE_DIR}/infer/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops infer_merge "") +- merge_ops_files(${CMAKE_CURRENT_SOURCE_DIR}/view/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops view_merge "") +- merge_ops_files(${CMAKE_CURRENT_SOURCE_DIR}/ops_utils/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops utils_merge "") +- file(GLOB_RECURSE CORE_OPS_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ++ merge_ops_files(${OPS_DIR}/infer/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops infer_merge "") ++ merge_ops_files(${OPS_DIR}/view/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops view_merge "") ++ merge_ops_files(${OPS_DIR}/ops_utils/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops utils_merge "") ++ file(GLOB_RECURSE CORE_OPS_LIST RELATIVE ${OPS_DIR} + "${CMAKE_BINARY_DIR}/merge/mindspore/ops/*.cc") + list(APPEND CORE_OPS_LIST ${OP_DEF_SRC}) + endif() +diff --git a/mindspore/ops/kernel/cpu/CMakeLists.txt b/mindspore/ops/kernel/cpu/CMakeLists.txt +index f72ae4d8c7c..6833f7dd052 100644 +--- a/mindspore/ops/kernel/cpu/CMakeLists.txt ++++ b/mindspore/ops/kernel/cpu/CMakeLists.txt +@@ -47,12 +47,10 @@ file(GLOB_RECURSE PYBOOST_CPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + list(APPEND CPU_SRC_LIST "${PYBOOST_CPU_SRC_LIST}") + + # merge cpu kernel files, NOT recursively +-if(NOT BUILD_LITE) +- set(CPU_KERNEL_MERGE_DIR ${CMAKE_BINARY_DIR}/merge/mindspore/ops/kernel/cpu) +- merge_ops_files(${CMAKE_CURRENT_SOURCE_DIR} ${CPU_KERNEL_MERGE_DIR} cpu_kernel_merge "${EXCLUDE_PATTERN}" TRUE) +- file(GLOB_RECURSE CPU_KERNEL_MERGE_FILES ${CPU_KERNEL_MERGE_DIR}/*.cc) +- list(APPEND CPU_SRC_LIST ${CPU_KERNEL_MERGE_FILES}) +-endif() ++set(CPU_KERNEL_MERGE_DIR ${CMAKE_BINARY_DIR}/merge/mindspore/ops/kernel/cpu) ++merge_ops_files(${CMAKE_CURRENT_SOURCE_DIR} ${CPU_KERNEL_MERGE_DIR} cpu_kernel_merge "${EXCLUDE_PATTERN}" TRUE) ++file(GLOB_RECURSE CPU_KERNEL_MERGE_FILES ${CPU_KERNEL_MERGE_DIR}/*.cc) ++list(APPEND CPU_SRC_LIST ${CPU_KERNEL_MERGE_FILES}) + + if(PLATFORM_ARM64) + add_compile_definitions(ENABLE_ARM) +diff --git a/scripts/build/usage.sh b/scripts/build/usage.sh +index 29c0d6c9f96..602b36ef339 100755 +--- a/scripts/build/usage.sh ++++ b/scripts/build/usage.sh +@@ -21,9 +21,9 @@ usage() + echo "Usage:" + echo "bash build.sh [-d] [-r] [-v] [-c on|off] [-t ut|st] [-g on|off] [-h] [-b ge] [-m infer|train] \\" + echo " [-a on|off] [-p on|off] [-i] [-R] [-D on|off] [-j[n]] [-e gpu|ascend|d|cpu] \\" +- echo " [-P on|off] [-z [on|off]] [-M on|off] [-V 10.1|11.1|310|910|910b] [-I arm64|arm32|x86_64] [-K on|off] \\" +- echo " [-B on|off] [-E] [-l on|off] [-n full|lite|off] [-H on|off] \\" +- echo " [-A on|off] [-S on|off] [-k on|off] [-W sse|neon|avx|avx512|off] \\" ++ echo " [-P on|off] [-z [on|off]] [-M on|off] [-V 10.1|11.1|310|910|910b] [-K on|off] \\" ++ echo " [-B on|off] [-E] [-l on|off] [-H on|off] \\" ++ echo " [-S on|off] [-k on|off] [-W sse|neon|avx|avx512|off] \\" + echo " [-L Tensor-RT path] [-y on|off] [-F on|off] [-G common|auto|ptx] [-o]\\" + echo "" + echo "Options:" +@@ -47,11 +47,8 @@ usage() + echo " -P Enable dump anf graph to file in ProtoBuffer format, default on" + echo " -D Enable dumping of function graph ir, default on" + echo " -z Compile dataset & mindrecord, default on" +- echo " -n Compile minddata with mindspore lite, available: off, lite, full, lite_cv, full mode in lite train and lite_cv, wrapper mode in lite predict" + echo " -M Enable MPI and NCCL for GPU training, gpu default on" + echo " -V Specify the device version, if -e gpu, default CUDA 10.1, if -e ascend, default Ascend 910" +- echo " -I Enable compiling mindspore lite for arm64, arm32 or x86_64, default disable mindspore lite compilation" +- echo " -A Enable compiling mindspore lite aar package, option: on/off, default: off" + echo " -K Compile with AKG, default on" + echo " -B Enable debugger, default on" + echo " -E Enable IBVERBS for parameter server, default off" +-- +2.25.1 + -- Gitee From abd20d6d0236729fa21eaf8b0b2a3c7601c499f5 Mon Sep 17 00:00:00 2001 From: liuf9 Date: Sat, 16 Aug 2025 15:28:02 +0800 Subject: [PATCH 2/3] update --- mindspore-lite/ops/CMakeLists.txt | 3 +++ .../0001-remove-lite-related-keyword.patch | 20 +++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/mindspore-lite/ops/CMakeLists.txt b/mindspore-lite/ops/CMakeLists.txt index 9cf336f6..a2910eaa 100644 --- a/mindspore-lite/ops/CMakeLists.txt +++ b/mindspore-lite/ops/CMakeLists.txt @@ -1,2 +1,5 @@ +message(STATUS "AAAAAAAAAAAAAA ${OPS_DIR}") +set(OPS_DIR ${TOP_DIR}/mindspore/mindspore/ops) +message(STATUS "BBBBBBBBBBBBBB ${OPS_DIR}") include(${OPS_DIR}/cmake/op_def.cmake) include(${OPS_DIR}/cmake/ops.cmake) \ No newline at end of file diff --git a/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch b/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch index 91623814..e43c0acc 100644 --- a/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch +++ b/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch @@ -1,4 +1,4 @@ -From 6d8f92fdf2473a04fcaf296a38b8e6e97afb0a56 Mon Sep 17 00:00:00 2001 +From 2a1cc4594768e9f75908b7ae00cc7ebc534ffec9 Mon Sep 17 00:00:00 2001 From: liuf9 Date: Thu, 24 Jul 2025 17:24:52 +0800 Subject: [PATCH] remove lite-related keyword @@ -14,10 +14,10 @@ Subject: [PATCH] remove lite-related keyword mindspore/ccsrc/utils/utils.cc | 88 -------------- mindspore/ops/CMakeLists.txt | 10 +- mindspore/ops/cmake/op_def.cmake | 7 +- - mindspore/ops/cmake/ops.cmake | 29 +++-- + mindspore/ops/cmake/ops.cmake | 34 +++--- mindspore/ops/kernel/cpu/CMakeLists.txt | 10 +- scripts/build/usage.sh | 9 +- - 13 files changed, 132 insertions(+), 247 deletions(-) + 13 files changed, 137 insertions(+), 247 deletions(-) diff --git a/cmake/external_libs/securec.cmake b/cmake/external_libs/securec.cmake index a14c6d21120..115b238b67b 100644 @@ -524,7 +524,7 @@ index 2bc31745935..bf774f92247 100644 list(REMOVE_ITEM CORE_OPS_LIST "${OP_DEF_DIR}/prim_def.cc") \ No newline at end of file diff --git a/mindspore/ops/cmake/ops.cmake b/mindspore/ops/cmake/ops.cmake -index f8f8d62e44e..07c3a4b3393 100644 +index f8f8d62e44e..d9f56fd7b0a 100644 --- a/mindspore/ops/cmake/ops.cmake +++ b/mindspore/ops/cmake/ops.cmake @@ -1,4 +1,4 @@ @@ -578,6 +578,18 @@ index f8f8d62e44e..07c3a4b3393 100644 "${CMAKE_BINARY_DIR}/merge/mindspore/ops/*.cc") list(APPEND CORE_OPS_LIST ${OP_DEF_SRC}) endif() +@@ -88,6 +87,11 @@ endif() + include(CheckCXXCompilerFlag) + check_cxx_compiler_flag("-mlong-calls" SUPPORT_MLONG_CALLS) + set(OPS_OBJECT_COUNT 1) ++foreach(file_path IN LISTS CORE_OPS_LIST) ++ message(STATUS "CCCCCCCCC file: ${file_path}") ++endforeach() ++message(STATUS "DDDDDDDDDDDD current processed directory: ${CMAKE_CURRENT_LIST_DIR}") ++message(STATUS "DDDDDDDDDDDD current directory: ${CMAKE_CURRENT_SOURCE_DIR}") + src_separate_compile( + OBJECT_NAME ops_obj + OBJECT_SIZE OPS_OBJECT_COUNT diff --git a/mindspore/ops/kernel/cpu/CMakeLists.txt b/mindspore/ops/kernel/cpu/CMakeLists.txt index f72ae4d8c7c..6833f7dd052 100644 --- a/mindspore/ops/kernel/cpu/CMakeLists.txt -- Gitee From 02cac12d39346332e5628a4d7f331de3769024ec Mon Sep 17 00:00:00 2001 From: liuf9 Date: Sat, 16 Aug 2025 15:55:19 +0800 Subject: [PATCH 3/3] update --- .../0001-remove-lite-related-keyword.patch | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch b/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch index e43c0acc..dbc758aa 100644 --- a/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch +++ b/third_party/patch/mindspore/0001-remove-lite-related-keyword.patch @@ -1,4 +1,4 @@ -From 2a1cc4594768e9f75908b7ae00cc7ebc534ffec9 Mon Sep 17 00:00:00 2001 +From 02267ea0e1632ffaa87b256a08b95833a256e3fe Mon Sep 17 00:00:00 2001 From: liuf9 Date: Thu, 24 Jul 2025 17:24:52 +0800 Subject: [PATCH] remove lite-related keyword @@ -14,10 +14,10 @@ Subject: [PATCH] remove lite-related keyword mindspore/ccsrc/utils/utils.cc | 88 -------------- mindspore/ops/CMakeLists.txt | 10 +- mindspore/ops/cmake/op_def.cmake | 7 +- - mindspore/ops/cmake/ops.cmake | 34 +++--- + mindspore/ops/cmake/ops.cmake | 35 +++--- mindspore/ops/kernel/cpu/CMakeLists.txt | 10 +- scripts/build/usage.sh | 9 +- - 13 files changed, 137 insertions(+), 247 deletions(-) + 13 files changed, 137 insertions(+), 248 deletions(-) diff --git a/cmake/external_libs/securec.cmake b/cmake/external_libs/securec.cmake index a14c6d21120..115b238b67b 100644 @@ -524,7 +524,7 @@ index 2bc31745935..bf774f92247 100644 list(REMOVE_ITEM CORE_OPS_LIST "${OP_DEF_DIR}/prim_def.cc") \ No newline at end of file diff --git a/mindspore/ops/cmake/ops.cmake b/mindspore/ops/cmake/ops.cmake -index f8f8d62e44e..d9f56fd7b0a 100644 +index f8f8d62e44e..7bf3b4cf5d6 100644 --- a/mindspore/ops/cmake/ops.cmake +++ b/mindspore/ops/cmake/ops.cmake @@ -1,4 +1,4 @@ @@ -533,20 +533,20 @@ index f8f8d62e44e..d9f56fd7b0a 100644 set(INFER_DIR "infer") set(VIEW_DIR "view") set(UTILS_DIR "ops_utils") -@@ -20,31 +20,30 @@ endif() +@@ -20,32 +20,30 @@ endif() # ------- CORE_OPS_LIST, CORE_SYMBOL_OPS_LIST ------ include(${OPS_DIR}/cmake/merge_ops.cmake) -if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR NOT BUILD_LITE) - file(GLOB_RECURSE INFER_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INFER_DIR}/*.cc") +if(CMAKE_SIZEOF_VOID_P EQUAL 4) -+ file(GLOB_RECURSE INFER_LIST RELATIVE ${OPS_DIR} "${INFER_DIR}/*.cc") ++ file(GLOB_RECURSE INFER_LIST "${INFER_DIR}/*.cc") # merge infer/ops_func_impl/*.cc and infer/*.cc(no recursive) - file(GLOB OLD_INFER_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INFER_DIR}/*.cc") - file(GLOB_RECURSE INFER_FUNC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INFER_DIR}/ops_func_impl/*.cc") -+ file(GLOB OLD_INFER_LIST RELATIVE ${OPS_DIR} "${INFER_DIR}/*.cc") -+ file(GLOB_RECURSE INFER_FUNC_LIST RELATIVE ${OPS_DIR} "${INFER_DIR}/ops_func_impl/*.cc") ++ file(GLOB OLD_INFER_LIST "${INFER_DIR}/*.cc") ++ file(GLOB_RECURSE INFER_FUNC_LIST "${INFER_DIR}/ops_func_impl/*.cc") list(REMOVE_ITEM INFER_LIST ${INFER_FUNC_LIST} ${OLD_INFER_LIST}) set(INFER_MERGE_DIR ${CMAKE_BINARY_DIR}/merge/mindspore/ops/infer) - merge_ops_files(${CMAKE_CURRENT_SOURCE_DIR}/infer/ops_func_impl/ ${INFER_MERGE_DIR} infer_func_merge "") @@ -558,9 +558,9 @@ index f8f8d62e44e..d9f56fd7b0a 100644 - file(GLOB_RECURSE CORE_SYMBOL_OPS_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INFER_DIR}/symbol_ops_impl/*.cc") - file(GLOB_RECURSE VIEW_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${VIEW_DIR}/*.cc") - file(GLOB_RECURSE UTILS_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${UTILS_DIR}/*.cc") -+ file(GLOB_RECURSE CORE_SYMBOL_OPS_LIST RELATIVE ${OPS_DIR} "${INFER_DIR}/symbol_ops_impl/*.cc") -+ file(GLOB_RECURSE VIEW_LIST RELATIVE ${OPS_DIR} "${VIEW_DIR}/*.cc") -+ file(GLOB_RECURSE UTILS_LIST RELATIVE ${OPS_DIR} "${UTILS_DIR}/*.cc") ++ file(GLOB_RECURSE CORE_SYMBOL_OPS_LIST "${INFER_DIR}/symbol_ops_impl/*.cc") ++ file(GLOB_RECURSE VIEW_LIST "${VIEW_DIR}/*.cc") ++ file(GLOB_RECURSE UTILS_LIST "${UTILS_DIR}/*.cc") set_property(SOURCE ${CORE_SYMBOL_OPS_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_SYMBOLIC_SHAPE) @@ -571,14 +571,15 @@ index f8f8d62e44e..d9f56fd7b0a 100644 - merge_ops_files(${CMAKE_CURRENT_SOURCE_DIR}/view/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops view_merge "") - merge_ops_files(${CMAKE_CURRENT_SOURCE_DIR}/ops_utils/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops utils_merge "") - file(GLOB_RECURSE CORE_OPS_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} +- "${CMAKE_BINARY_DIR}/merge/mindspore/ops/*.cc") + merge_ops_files(${OPS_DIR}/infer/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops infer_merge "") + merge_ops_files(${OPS_DIR}/view/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops view_merge "") + merge_ops_files(${OPS_DIR}/ops_utils/ ${CMAKE_BINARY_DIR}/merge/mindspore/ops utils_merge "") -+ file(GLOB_RECURSE CORE_OPS_LIST RELATIVE ${OPS_DIR} - "${CMAKE_BINARY_DIR}/merge/mindspore/ops/*.cc") ++ file(GLOB_RECURSE CORE_OPS_LIST "${CMAKE_BINARY_DIR}/merge/mindspore/ops/*.cc") list(APPEND CORE_OPS_LIST ${OP_DEF_SRC}) endif() -@@ -88,6 +87,11 @@ endif() + +@@ -88,6 +86,11 @@ endif() include(CheckCXXCompilerFlag) check_cxx_compiler_flag("-mlong-calls" SUPPORT_MLONG_CALLS) set(OPS_OBJECT_COUNT 1) -- Gitee