Browse Source

fix(mge/build): move version.ld to src under project source root

GitOrigin-RevId: 04f39943c4
release-1.1
Megvii Engine Team 4 years ago
parent
commit
165798bf9c
4 changed files with 6 additions and 5 deletions
  1. +2
    -0
      CMakeLists.txt
  2. +3
    -4
      imperative/CMakeLists.txt
  3. +1
    -1
      src/CMakeLists.txt
  4. +0
    -0
      src/version.ld

+ 2
- 0
CMakeLists.txt View File

@@ -710,6 +710,8 @@ endif()

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MARCH}")

set(MGE_VERSION_SCRIPT ${PROJECT_SOURCE_DIR}/src/version.ld CACHE INTERNAL "Path to linker version script")

# Write out megbrain_build_config.h
# It defines macros needed by both megbrain and dnn
configure_file(src/megbrain_build_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/genfiles/megbrain_build_config.h)


+ 3
- 4
imperative/CMakeLists.txt View File

@@ -47,8 +47,7 @@ add_custom_target(gen_opr_py DEPENDS ${GEN_OPS_FILE})

##################### end of opdef generation #########################

set(VERSION_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/src/version.ld)
add_custom_target(_version_ld SOURCES ${VERSION_SCRIPT})
add_custom_target(_version_ld SOURCES ${MGE_VERSION_SCRIPT})

add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/pybind11 ${PROJECT_BINARY_DIR}/third_party/pybind11)
pybind11_add_module(${MODULE_NAME} NO_EXTRAS ${SRCS})
@@ -62,11 +61,11 @@ elseif (MSVC OR WIN32)
else()
if (MGE_WITH_PYTHON_MODULE)
# use to fix runtime crash when build both mgb(MGE_WITH_PYTHON_MODULE) and imperative(MGE_BUILD_IMPERATIVE_RT)
target_link_libraries(${MODULE_NAME} PRIVATE megengine_export -Wl,--version-script=${VERSION_SCRIPT})
target_link_libraries(${MODULE_NAME} PRIVATE megengine_export -Wl,--version-script=${MGE_VERSION_SCRIPT})
else()
# use to reduce whl size by depend on megbrain/dnn directly, caused by cmake create two cuda fatbin
# elf section on both megengine_export and target which depend on megengine_export
target_link_libraries(${MODULE_NAME} PRIVATE megbrain megdnn -Wl,--version-script=${VERSION_SCRIPT})
target_link_libraries(${MODULE_NAME} PRIVATE megbrain megdnn -Wl,--version-script=${MGE_VERSION_SCRIPT})
if (MGE_WITH_DISTRIBUTED)
message("-- Imperative configured to link megray")
target_link_libraries(${MODULE_NAME} PRIVATE megray)


+ 1
- 1
src/CMakeLists.txt View File

@@ -181,7 +181,7 @@ if(ANDROID)
target_link_libraries(megbrain PUBLIC log)
endif()

set (_VER_FILE ${PROJECT_SOURCE_DIR}/imperative/src/version.ld)
set (_VER_FILE ${PROJECT_SOURCE_DIR}/src/version.ld)

if(MGE_BUILD_IMPERATIVE_RT
)


imperative/src/version.ld → src/version.ld View File


Loading…
Cancel
Save