Fdy change dyn load #1301
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| macro(diopi_use_adapter cmd_extra_config) | ||
| # dependency | ||
| file(GLOB ADAPTOR_TEMPLATE_CODE RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${ADAPTOR_DIR}/codegen/*.py) | ||
| add_custom_target(adaptor_gen_dependency DEPENDS ${ADAPTOR_TEMPLATE_CODE}) | ||
| set(ADAPTOR_CSRC_PATH "${ADAPTOR_DIR}/csrc") | ||
|
|
||
| separate_arguments(GenArgs UNIX_COMMAND "--diopi_dir=${DIOPI_IMPL_DIR}/../ --output_dir=${ADAPTOR_CSRC_PATH} ${cmd_extra_config}") | ||
|
There was a problem hiding this comment. 用 list (set)的话传参的地方得改, 不能把几个参数放到一个变量里一起传了, 还要解析参数, There was a problem hiding this comment. 这个名字起的有些问题, 我改叫 cmd_extra_config's' 吧 There was a problem hiding this comment.
其实是可以的，CMake 里面形如 There was a problem hiding this comment. 确实, PS: 杨波要改些东西, 等他改完我把这个改了吧 |
||
| message(STATUS "diopi_use_adapter GenArgs is:" "${GenArgs}") | ||
| set(ADAPTER_GEN_FILES ${ADAPTOR_CSRC_PATH}/diopi_adaptor.cpp ${ADAPTOR_CSRC_PATH}/impl_functions.hpp) | ||
| add_custom_target(adaptor_code_gen | ||
| COMMAND python3 ${ADAPTOR_DIR}/codegen/gen.py ${GenArgs} | ||
| BYPRODUCTS ${ADAPTER_GEN_FILES} | ||
| DEPENDS adaptor_gen_dependency | ||
| VERBATIM | ||
| ) | ||
| list(APPEND REAL_IMPL_SRC ${ADAPTOR_CSRC_PATH}/convert.cpp ${ADAPTOR_CSRC_PATH}/diopi_adaptor.cpp ${ADAPTOR_CSRC_PATH}/composite_ops.cpp) | ||
|
There was a problem hiding this comment. 要不换成 concat 或者 set？万一 There was a problem hiding this comment. 用 macro 主要是改动少, 我直接把原来外边的代码搬过来了. 不用改啥东西. 你要有空都改了, 可以改成 function. There was a problem hiding this comment. 我找时间改下吧. macro 确实不太好 |
||
| endmacro() | ||
|
|
||
|
|
||
| macro(prep_dyn_load if_dynload) | ||
| if (${if_dynload}) | ||
| set(DYN_GEN_FILE ${CMAKE_BINARY_DIR}/src/impl/wrap_function.cpp) | ||
| set(DYN_HELP_DIR ${DIOPI_IMPL_DIR}/scripts/dyn_load_helper) | ||
| file(GLOB DYN_GEN_DEPS ${DYN_HELP_DIR}/dyn_wrap_gen.py) | ||
|
|
||
| add_custom_target(dyn_wrap_gen ALL | ||
| COMMAND python ${DYN_HELP_DIR}/dyn_wrap_gen.py -o ${DYN_GEN_FILE} | ||
| DEPENDS ${DYN_GEN_DEPS} | ||
| BYPRODUCTS ${DYN_GEN_FILE} | ||
| WORKING_DIRECTORY ${DYN_HELP_DIR}) | ||
| set(DYN_SRC ${DYN_GEN_FILE} ${DYN_HELP_DIR}/dyn_helper.cpp) | ||
|
|
||
| set(REAL_IMPL diopi_real_impl) | ||
| add_library(${DEVICEIMPL} SHARED ${DYN_SRC}) | ||
| target_link_libraries(${DEVICEIMPL} -ldl) | ||
| target_include_directories(${DEVICEIMPL} PRIVATE ${DYN_HELP_DIR}) | ||
| add_dependencies(${DEVICEIMPL} dyn_wrap_gen) | ||
| else() | ||
| set(REAL_IMPL ${DEVICEIMPL}) | ||
| endif() | ||
| endmacro() | ||
|
|
||
| macro(handle_dyn_torch if_dynload torch_dir) | ||
| if (${if_dynload}) | ||
| add_custom_target(dyn_torch | ||
| COMMAND ${DIOPI_IMPL_DIR}/scripts/dyn_load_helper/dyn_torch_handler.sh patch_diopi | ||
| ${LIBRARY_OUTPUT_PATH} ${torch_dir}/lib | ||
| DEPENDS ${REAL_IMPL} | ||
| WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} | ||
|
|
||
| ) | ||
| message(STATUS "handle_dyn_torch with torch: ${torch_dir}") | ||
| add_dependencies(${DEVICEIMPL} dyn_torch) | ||
| endif() | ||
| endmacro() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
|
|
||
| macro(diopi_find_torch) | ||
| execute_process( | ||
| COMMAND sh -c "python -c 'import torch;print(torch.utils.cmake_prefix_path)'" | ||
wiryls marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| OUTPUT_VARIABLE DIOPI_TORCH_CMAKE_PREFIX | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
| message(STATUS "DIOPI_TORCH_CMAKE_PREFIX:${DIOPI_TORCH_CMAKE_PREFIX}") | ||
| if(DIOPI_TORCH_CMAKE_PREFIX) | ||
| list(APPEND CMAKE_PREFIX_PATH ${DIOPI_TORCH_CMAKE_PREFIX}) | ||
| endif() | ||
|
|
||
| find_package(Torch REQUIRED) | ||
| if (Torch_FOUND) | ||
| message(STATUS "TORCH_CXX_FLAGS: ${TORCH_CXX_FLAGS}") | ||
| message(STATUS "TORCH_LIBRARIES: ${TORCH_LIBRARIES}") | ||
|
|
||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}") | ||
| add_definitions(-DTORCH_VERSION_MAJOR=${Torch_VERSION_MAJOR}) | ||
wiryls marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| add_definitions(-DTORCH_VERSION_MINOR=${Torch_VERSION_MINOR}) | ||
| add_definitions(-DTORCH_VERSION_PATCH=${Torch_VERSION_PATCH}) | ||
| add_definitions(-DTORCH_VERSION=${Torch_VERSION}) | ||
| message(STATUS "Found Torch Version: ${Torch_VERSION}") | ||
| endif() | ||
|
|
||
| endmacro() | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #include <dlfcn.h> | ||
|
|
||
| #include <cstdio> | ||
| #include <filesystem> | ||
| #include <stdexcept> | ||
|
|
||
| void* dynLoadFile(const char* diopiRealName) { | ||
| namespace fs = std::filesystem; | ||
| void* handle = dlopen(diopiRealName, RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND); | ||
| if (!handle) { | ||
| Dl_info info; | ||
| if (dladdr(reinterpret_cast<void*>(dynLoadFile), &info) != 0 && info.dli_fname != nullptr) { | ||
| fs::path fpath(info.dli_fname); | ||
| auto diopiInLoader = fpath.parent_path().append(diopiRealName).string(); | ||
| printf( | ||
| "diopi dyload fail, seems LD_LIBRARAY_PATH not contains %s, try to load " | ||
| "from loader current dir's %s \n", | ||
| diopiRealName, | ||
| diopiInLoader.c_str()); | ||
|
|
||
| handle = dlopen(diopiInLoader.c_str(), RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND); | ||
| } | ||
| } | ||
| if (!handle) { | ||
| fprintf(stderr, "%s ", dlerror()); | ||
| throw std::runtime_error("diopi_init err"); | ||
| } | ||
| return handle; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #pragma once | ||
|
|
||
| void* dynLoadFile(const char* diopiRealName); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| #!/usr/bin/env bash | ||
| set -eo pipefail | ||
|
|
||
| # pip install patchelf | ||
|
|
||
| diopi_suffix=".diopi" | ||
| torch_raws=("libtorch.so" "libtorch_cuda.so" "libtorch_cpu.so" "libc10_cuda.so" "libc10.so") | ||
| torch_4diopi=() | ||
| for ((i=0; i<${#torch_raws[@]}; i++)); do | ||
| torch_4diopi[i]=${torch_raws[$i]}${diopi_suffix} | ||
| done | ||
|
|
||
| # even using RTLD_DEEPBIND load, same name lib still has only one instance in the address space. | ||
| # RTLD_DEEPBIND just make same symbol name in different lib names be loaded as 2 instance but not | ||
| # symbol in same lib name. | ||
| function gen_versioned_torch() { | ||
| for ((i=0; i<${#torch_raws[@]}; i++)); do | ||
| cp ${torch_raws[$i]} ${torch_4diopi[$i]} | ||
| done | ||
|
|
||
| for ((i=0; i<${#torch_4diopi[@]}; i++)); do | ||
| libi=${torch_4diopi[$i]} | ||
| replace_items="" | ||
| for ((depIdx=i+1; depIdx<${#torch_4diopi[@]}; depIdx++)); do | ||
| dep_raw=${torch_raws[$depIdx]} | ||
| dep_4diopi=${torch_4diopi[$depIdx]} | ||
| replace_items=${replace_items}" --replace-needed ${dep_raw} ${dep_4diopi}" | ||
|
|
||
| done | ||
| patchelf ${replace_items} --set-soname ${libi} ${libi} | ||
| done | ||
| } | ||
|
|
||
| function check_correct_torch() { | ||
| echo "check diopi torch: $1" | ||
|
|
||
| # TODO: use an elf lib to remove unqiue flag in *so.diopi | ||
| # remove unique symbols of both cpu torch (dipu use) and device torch (diopi use). | ||
| # if you device torch is compiled by clang, which not supporting -fno-gnu-unique, | ||
| # just test if it works (eg: muxi torch with unique can coexist with no-uniqued cpu torch) | ||
|
|
||
| echo "please check if you torch builded with -fno-gnu-unique to support multi version torch coexist" | ||
| set +e | ||
| chk_ret=`cd $1 && ls -alh |grep .*\.so\.diopi | wc -l` | ||
| set -e | ||
| if [[ ${chk_ret} -ne ${#torch_4diopi[@]} ]]; then | ||
| echo "ret value: ${chk_ret}, in device-torch dir, not find dyn-load needed XX.so.diopi libs!" | ||
| echo "!! please manual run handle_dyload_torch.sh patch_torch {device_torch_dir} to gen dyn-load needed multi-version torch" | ||
| exit -1 | ||
| fi | ||
|
|
||
| echo "diopi torch version check ok" | ||
| } | ||
|
|
||
| function patch_diopi_torch() { | ||
| removed_items="" | ||
| added_items="" | ||
| for ((i=0; i<${#torch_4diopi[@]}; i++)); do | ||
| dep_raw=${torch_raws[$i]} | ||
| dep_4diopi=${torch_4diopi[$i]} | ||
| removed_items=${removed_items}" --remove-needed ${dep_raw}" | ||
| added_items=${added_items}" --add-needed ${dep_4diopi}" | ||
| done | ||
| patchelf ${removed_items} libdiopi_real_impl.so | ||
| patchelf ${added_items} libdiopi_real_impl.so | ||
| } | ||
|
|
||
| # 1.because dipu libs are loaded by python using dlload. so relative to python main, real_diopi_libs are | ||
| # 2-hop dynamic loaded. it cannot see first-hop loaded libs like torch_dipu (unless the lib is loaded | ||
| # using RTLD_GLOBAL, but it's not used when directly loading python lib). so diopi need maunal link | ||
| # torch_dipu.so lib. | ||
| # 2.although both the 1st hop dynamic-loaded lib and the 2ed's link to torch_dipu.so, they still share | ||
| # the same lib instance in addr space. | ||
| function patch_diopi_dipu() { | ||
| patchelf --remove-needed libtorch_dipu.so libdiopi_real_impl.so | ||
| patchelf --add-needed libtorch_dipu.so libdiopi_real_impl.so | ||
| } | ||
|
|
||
|
|
||
| WORK_DIR=$2 | ||
| cd ${WORK_DIR} | ||
| if [[ "$1" == "patch_torch" ]]; then | ||
| gen_versioned_torch | ||
| elif [[ "$1" == "patch_diopi" ]]; then | ||
| check_correct_torch $3 | ||
| # in dipoi link lib list, torch_dipu.so must be placed behind torch_XX libs. | ||
| # because both dipu and inner 'DEEPBIND' torch_cpu call Library.<CppFunction>fallback() which is | ||
| # a template function instantiated when parameter types CppFunction is first called | ||
| # (!!! not directly link to the template definition in external torch_cpu.so !!!). | ||
| # if torch_dipu.so is linked in front, <CppFunction>fallback() symbol is bind to the symbol | ||
| # in torch_dipu.so which use external torch template class that cannot work with inner torch CppFunction. | ||
| patch_diopi_dipu | ||
| patch_diopi_torch | ||
| fi |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
用 macro 是特意的吗，里面定义了很多变量，容易污染相关脚本；另外也通过参数以外的方式直接引用了一些外部定义的变量名，挺容易出错的。