From 4621946181a8c1a0beb3fe21767c568e7d85018b Mon Sep 17 00:00:00 2001 From: BourneSun0527 Date: Mon, 19 Jan 2026 17:26:10 +0800 Subject: [PATCH] deepep adapt custom cann installation path --- CMakeLists.txt | 2 +- csrc/deepep/ops/CMakeLists.txt | 2 +- csrc/deepep/ops/CMakePresets.json | 2 +- csrc/deepep/ops/cmake/func.cmake | 2 +- csrc/deepep/ops2/CMakeLists.txt | 2 +- csrc/deepep/ops2/CMakePresets.json | 2 +- csrc/deepep/ops2/cmake/func.cmake | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 247c77d95..238f051c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12 FATAL_ERROR) +cmake_minimum_required(VERSION 3.20 FATAL_ERROR) project(sgl-kernel-npu LANGUAGES CXX) option(BUILD_PYTHON "build python SDK" ON) diff --git a/csrc/deepep/ops/CMakeLists.txt b/csrc/deepep/ops/CMakeLists.txt index 69c2ecd55..b3211072b 100644 --- a/csrc/deepep/ops/CMakeLists.txt +++ b/csrc/deepep/ops/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16.0) +cmake_minimum_required(VERSION 3.20.0) project(opp) if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") diff --git a/csrc/deepep/ops/CMakePresets.json b/csrc/deepep/ops/CMakePresets.json index a480c51b3..da19711e6 100644 --- a/csrc/deepep/ops/CMakePresets.json +++ b/csrc/deepep/ops/CMakePresets.json @@ -39,7 +39,7 @@ }, "ASCEND_CANN_PACKAGE_PATH": { "type": "PATH", - "value": "/usr/local/Ascend/ascend-toolkit/latest" + "value": "$penv{ASCEND_HOME_PATH}" }, "ASCEND_PYTHON_EXECUTABLE": { "type": "STRING", diff --git a/csrc/deepep/ops/cmake/func.cmake b/csrc/deepep/ops/cmake/func.cmake index 367294f22..5ebfee3ef 100644 --- a/csrc/deepep/ops/cmake/func.cmake +++ b/csrc/deepep/ops/cmake/func.cmake @@ -224,7 +224,7 @@ function(ascendc_device_library) COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/tiling_sink/CMakeLists.txt ) execute_process( - COMMAND ${CMAKE_COMMAND} -E echo "cmake_minimum_required(VERSION 3.16.0)\nproject(cust_tiling_sink)\ninclude(${CMAKE_SOURCE_DIR}/cmake/device_task.cmake)\n" + COMMAND ${CMAKE_COMMAND} -E echo "cmake_minimum_required(VERSION 3.20.0)\nproject(cust_tiling_sink)\ninclude(${CMAKE_SOURCE_DIR}/cmake/device_task.cmake)\n" OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/tiling_sink/CMakeLists.txt RESULT_VARIABLE result ) diff --git a/csrc/deepep/ops2/CMakeLists.txt b/csrc/deepep/ops2/CMakeLists.txt index 359beca29..a27c0b46c 100644 --- a/csrc/deepep/ops2/CMakeLists.txt +++ b/csrc/deepep/ops2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16.0) +cmake_minimum_required(VERSION 3.20.0) project(opp) if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") diff --git a/csrc/deepep/ops2/CMakePresets.json b/csrc/deepep/ops2/CMakePresets.json index f87df921f..d1d1fdc25 100644 --- a/csrc/deepep/ops2/CMakePresets.json +++ b/csrc/deepep/ops2/CMakePresets.json @@ -39,7 +39,7 @@ }, "ASCEND_CANN_PACKAGE_PATH": { "type": "PATH", - "value": "/usr/local/Ascend/ascend-toolkit/latest" + "value": "$penv{ASCEND_HOME_PATH}" }, "ASCEND_PYTHON_EXECUTABLE": { "type": "STRING", diff --git a/csrc/deepep/ops2/cmake/func.cmake b/csrc/deepep/ops2/cmake/func.cmake index 19dc13986..749725e13 100644 --- a/csrc/deepep/ops2/cmake/func.cmake +++ b/csrc/deepep/ops2/cmake/func.cmake @@ -216,7 +216,7 @@ function(ascendc_device_library) COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/tiling_sink/CMakeLists.txt ) execute_process( - COMMAND ${CMAKE_COMMAND} -E echo "cmake_minimum_required(VERSION 3.16.0)\nproject(cust_tiling_sink)\ninclude(${CMAKE_SOURCE_DIR}/cmake/device_task.cmake)\n" + COMMAND ${CMAKE_COMMAND} -E echo "cmake_minimum_required(VERSION 3.20.0)\nproject(cust_tiling_sink)\ninclude(${CMAKE_SOURCE_DIR}/cmake/device_task.cmake)\n" OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/tiling_sink/CMakeLists.txt RESULT_VARIABLE result )