Skip to content

use pypi lammps to test lammps plugin #2548

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
wanghan-iapcm merged 3 commits into from
May 22, 2023
Merged

use pypi lammps to test lammps plugin #2548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e138a94
use pypi lammps to test lammps plugin
njzjz May 19, 2023
89fc396
set _GLIBCXX_USE_CXX11_ABI to 0
njzjz May 20, 2023
1ac79d4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 21, 2023
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
9 changes: 6 additions & 3 deletions .github/workflows/test_cc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,21 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: '3.11'
- name: Setup MPI
uses: mpi4py/setup-mpi@v1
with:
mpi: mpich
- run: python -m pip install tensorflow
- run: source/install/test_cc_local.sh
env:
OMP_NUM_THREADS: 1
TF_INTRA_OP_PARALLELISM_THREADS: 1
TF_INTER_OP_PARALLELISM_THREADS: 1
tensorflow_root: /usr/local
LMP_CXX11_ABI_0: 1
# test lammps
- run: source/install/build_lammps.sh
- run: |
python -m pip install -U pip
python -m pip install -e .[cpu,test]
python -m pip install -e .[cpu,test,lmp]
env:
DP_BUILD_TESTING: 1
- run: pytest --cov=deepmd source/lmp/tests
Expand Down
3 changes: 2 additions & 1 deletion source/lmp/plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ if(DEFINED LAMMPS_SOURCE_ROOT OR DEFINED LAMMPS_VERSION)
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")
if("$ENV{CIBUILDWHEEL}" STREQUAL "1" OR "$ENV{LMP_CXX11_ABI_0}" STREQUAL
"1")
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
endif()
else()
Expand Down