diff --git a/setup.py b/setup.py index e67321ac2b..b08fe391df 100644 --- a/setup.py +++ b/setup.py @@ -129,7 +129,7 @@ def get_tag(self): "sphinxcontrib-bibtex", ], "lmp": [ - "lammps-manylinux-2-28~=2022.6.23.4.0; platform_system=='Linux'", + "lammps~=2022.6.23.4.0; platform_system=='Linux'", "lammps~=2022.6.23.4.0; platform_system!='Linux'", *find_libpython_requires, ], diff --git a/source/gmx/CMakeLists.txt b/source/gmx/CMakeLists.txt index fdb500c7ee..c119e4b212 100644 --- a/source/gmx/CMakeLists.txt +++ b/source/gmx/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(${libgmxname} SHARED ${LIB_SRC}) if(DP_USING_C_API) target_link_libraries(${libgmxname} PUBLIC ${LIB_DEEPMD_C}) target_precompile_headers(${libgmxname} PUBLIC [["deepmd.hpp"]]) + remove_definitions(-D_GLIBCXX_USE_CXX11_ABI=${OP_CXX_ABI}) else() target_link_libraries(${libgmxname} PUBLIC ${LIB_DEEPMD_CC}) target_compile_definitions(${libgmxname} PUBLIC "DP_USE_CXX_API") diff --git a/source/ipi/CMakeLists.txt b/source/ipi/CMakeLists.txt index 3608686048..09adee425f 100644 --- a/source/ipi/CMakeLists.txt +++ b/source/ipi/CMakeLists.txt @@ -16,6 +16,7 @@ if(DP_USING_C_API) # SimulationRegion.h target_link_libraries(${ipiname} PRIVATE ${LIB_DEEPMD_C} ${LIB_DEEPMD}) target_precompile_headers(${ipiname} PRIVATE [["deepmd.hpp"]]) + remove_definitions(-D_GLIBCXX_USE_CXX11_ABI=${OP_CXX_ABI}) else() target_link_libraries(${ipiname} PRIVATE ${LIB_DEEPMD_CC}) target_compile_definitions(${ipiname} PRIVATE "DP_USE_CXX_API") diff --git a/source/lmp/plugin/CMakeLists.txt b/source/lmp/plugin/CMakeLists.txt index f0089d4b44..b76635e5f7 100644 --- a/source/lmp/plugin/CMakeLists.txt +++ b/source/lmp/plugin/CMakeLists.txt @@ -63,6 +63,10 @@ if(DEFINED LAMMPS_SOURCE_ROOT OR DEFINED LAMMPS_VERSION) if(DP_USING_C_API) target_link_libraries(${libname} PUBLIC ${LIB_DEEPMD_C}) target_precompile_headers(${libname} PUBLIC [["deepmd.hpp"]]) + remove_definitions(-D_GLIBCXX_USE_CXX11_ABI=${OP_CXX_ABI}) + if("$ENV{CIBUILDWHEEL}" STREQUAL "1") + add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) + endif() else() target_link_libraries(${libname} PUBLIC ${LIB_DEEPMD_CC}) target_compile_definitions(${libname} PUBLIC "DP_USE_CXX_API")