Skip to content

fix(cmake): set C++ standard according to the PyTorch version #3973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
njzjz merged 3 commits into from
Jul 13, 2024
Merged

fix(cmake): set C++ standard according to the PyTorch version #3973

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4c30c3
fix(cmake): set C++ standard according to the PyTorch version
njzjz Jul 13, 2024
5c1cd02
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 13, 2024
b215b16
set a global value
njzjz Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ set(DEEPMD_C_ROOT
""
CACHE PATH "Path to imported DeePMD-kit C library")

set(CMAKE_CXX_STANDARD 11)
macro(set_if_higher VARIABLE VALUE)
if("${VARIABLE}" LESS "${VALUE}")
set(${VARIABLE} ${VALUE})
endif()
endmacro()

if(BUILD_TESTING)
enable_testing()
add_subdirectory(${CMAKE_SOURCE_DIR}/cmake/coverage_config coverage_config)
Expand Down Expand Up @@ -183,6 +190,11 @@ if(BUILD_CPP_IF
endif()
if(ENABLE_PYTORCH AND NOT DEEPMD_C_ROOT)
find_package(Torch REQUIRED)
if(NOT Torch_VERSION VERSION_LESS "2.1.0")
set_if_higher(CMAKE_CXX_STANDARD 17)
elseif(NOT Torch_VERSION VERSION_LESS "1.5.0")
set_if_higher(CMAKE_CXX_STANDARD 14)
endif()
string(REGEX MATCH "_GLIBCXX_USE_CXX11_ABI=([0-9]+)" CXXABI_PT_MATCH
"${TORCH_CXX_FLAGS}")
if(CXXABI_PT_MATCH)
Expand Down