mirror of
https://github.com/pytorch/pytorch.git
synced 2025-10-20 21:14:14 +08:00
8b37eff69f
Currently there is a potential conflict for `GLIBCXX_USE_CXX11_ABI` configuration if users don't explicitly set this variable. In `caffe2/CMakeLists.txt`, if the variable is not set, an `abi checker` will be used to retrieve the ABI configuration from compiler. https://github.com/pytorch/pytorch/blob/master/caffe2/CMakeLists.txt#L1165-L1183 However, in 'torch/csrc/Module.cpp`, if the variable is not set, it will be set to `0`. The conflict happens when the default ABI of the compiler is `1`. https://github.com/pytorch/pytorch/blob/master/torch/csrc/Module.cpp#L1612 This PR eliminate this uncertainty and potential conflict. The ABI will be checked and set in `CMakeLists.txt`, and pass the value to `caffe2/CMakeLists.txt`. Meanwhile, in case the `caffe2/CMakeLists.txt` is directly invoked from a `cmake` command, The original GLIBC check logic is kept in this file. If users doesn't explicitly assign a value to `GLIBCXX_USE_CXX11_ABI`, the `abi checker` will be executed and set the value accordingly. If the `abi checker` failed to compile or execute, the value will be set to `0`. If users explicitly assigned a value, then the provided value will be used. Moreover, if `GLIBCXX_USE_CXX11_ABI` is set to `0`, the '-DGLIBCXX_USE_CXX11_ABI=0' flag won't be appended to `CMAKE_CXX_FLAGS`. Thus, whether to use ABI=0 or ABI=1 fully depends on compiler's default configuration. It could cause an issue that even users explicitly set `GLIBCXX_USE_CXX11_ABI` to `0`, the compiler still builds the binaries with ABI=1. https://github.com/pytorch/pytorch/blob/master/CMakeLists.txt#L44-L51 Pull Request resolved: https://github.com/pytorch/pytorch/pull/94306 Approved by: https://github.com/malfet
28 lines
1014 B
CMake
28 lines
1014 B
CMake
if(DEFINED GLIBCXX_USE_CXX11_ABI)
|
|
message(STATUS "_GLIBCXX_USE_CXX11_ABI=${GLIBCXX_USE_CXX11_ABI} is already defined as a cmake variable")
|
|
return()
|
|
endif()
|
|
|
|
# XXX This ABI check cannot be run with arm-linux-androideabi-g++
|
|
message(STATUS "${CMAKE_CXX_COMPILER} ${PROJECT_SOURCE_DIR}/torch/abi-check.cpp -o ${CMAKE_BINARY_DIR}/abi-check")
|
|
execute_process(
|
|
COMMAND
|
|
"${CMAKE_CXX_COMPILER}"
|
|
"${PROJECT_SOURCE_DIR}/torch/abi-check.cpp"
|
|
"-o"
|
|
"${CMAKE_BINARY_DIR}/abi-check"
|
|
RESULT_VARIABLE ABI_CHECK_COMPILE_RESULT)
|
|
if(ABI_CHECK_COMPILE_RESULT)
|
|
message(FATAL_ERROR "Could not compile ABI Check: ${ABI_CHECK_COMPILE_RESULT}")
|
|
set(GLIBCXX_USE_CXX11_ABI 0)
|
|
endif()
|
|
execute_process(
|
|
COMMAND "${CMAKE_BINARY_DIR}/abi-check"
|
|
RESULT_VARIABLE ABI_CHECK_RESULT
|
|
OUTPUT_VARIABLE GLIBCXX_USE_CXX11_ABI)
|
|
if(ABI_CHECK_RESULT)
|
|
message(WARNING "Could not run ABI Check: ${ABI_CHECK_RESULT}")
|
|
set(GLIBCXX_USE_CXX11_ABI 0)
|
|
endif()
|
|
message(STATUS "Determined _GLIBCXX_USE_CXX11_ABI=${GLIBCXX_USE_CXX11_ABI}")
|