From a4c30c301905bd683b69a386bb4624e559212c83 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Fri, 12 Jul 2024 20:39:18 -0400 Subject: [PATCH 1/3] fix(cmake): set C++ standard according to the PyTorch version Copy from https://github.com/deepmodeling/abacus-develop/pull/3277 Signed-off-by: Jinzhe Zeng --- source/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index cf516b9755..a90a01f5f0 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -181,8 +181,18 @@ if(BUILD_CPP_IF list(APPEND BACKEND_LIBRARY_PATH ${Protobuf_LIBRARY_DIRECTORY}) endif() endif() +macro(set_if_higher VARIABLE VALUE) + if("${VARIABLE}" LESS "${VALUE}") + set(${VARIABLE} ${VALUE}) + endif() +endmacro() 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) From 5c1cd02788bd4ed2e4de1a07699b4af2b4c5bf07 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2024 00:40:19 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- source/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index a90a01f5f0..1a1a3be1af 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -182,9 +182,9 @@ if(BUILD_CPP_IF endif() endif() macro(set_if_higher VARIABLE VALUE) - if("${VARIABLE}" LESS "${VALUE}") - set(${VARIABLE} ${VALUE}) - endif() + if("${VARIABLE}" LESS "${VALUE}") + set(${VARIABLE} ${VALUE}) + endif() endmacro() if(ENABLE_PYTORCH AND NOT DEEPMD_C_ROOT) find_package(Torch REQUIRED) From b215b16bd2c27ab77e55bfc1680a3b5c39d163c6 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Fri, 12 Jul 2024 20:43:22 -0400 Subject: [PATCH 3/3] set a global value Signed-off-by: Jinzhe Zeng --- source/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 1a1a3be1af..02781d1b6b 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -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) @@ -181,11 +188,6 @@ if(BUILD_CPP_IF list(APPEND BACKEND_LIBRARY_PATH ${Protobuf_LIBRARY_DIRECTORY}) endif() endif() -macro(set_if_higher VARIABLE VALUE) - if("${VARIABLE}" LESS "${VALUE}") - set(${VARIABLE} ${VALUE}) - endif() -endmacro() if(ENABLE_PYTORCH AND NOT DEEPMD_C_ROOT) find_package(Torch REQUIRED) if(NOT Torch_VERSION VERSION_LESS "2.1.0")