Skip to content

pt: fix compile error when use intel mpi #3919

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 10 commits into from
Jul 2, 2024
Merged

pt: fix compile error when use intel mpi #3919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ec0d920
fix compile error when use intel mpi
CaRoLZhangxy Jun 27, 2024
9cc67a7
use cmake instead
CaRoLZhangxy Jun 28, 2024
b8cce46
modify include path(still not found)
CaRoLZhangxy Jul 1, 2024
504bd29
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 1, 2024
4e30cd4
add include and lib
CaRoLZhangxy Jul 1, 2024
91e601f
add ompi
CaRoLZhangxy Jul 1, 2024
78cfa56
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 1, 2024
b63bf65
fix mpi include and lib
CaRoLZhangxy Jul 2, 2024
214ed8f
fix compile error
CaRoLZhangxy Jul 2, 2024
98c9937
Merge branch 'devel' into fix-intelmpi
CaRoLZhangxy Jul 2, 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
10 changes: 10 additions & 0 deletions source/op/pt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ endif()

find_package(MPI)
if(MPI_FOUND)
include(CheckCXXSymbolExists)
set(CMAKE_REQUIRED_INCLUDES ${MPI_CXX_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${MPI_CXX_LIBRARIES})
check_cxx_symbol_exists(MPIX_Query_cuda_support "mpi.h" CUDA_AWARE)
Comment thread
CaRoLZhangxy marked this conversation as resolved.
Comment thread
CaRoLZhangxy marked this conversation as resolved.
if(NOT CUDA_AWARE)
check_cxx_symbol_exists(MPIX_Query_cuda_support "mpi.h;mpi-ext.h" OMP_CUDA)
if(NOT OMP_CUDA)
target_compile_definitions(deepmd_op_pt PRIVATE NO_CUDA_AWARE)
endif()
endif()
target_link_libraries(deepmd_op_pt PRIVATE MPI::MPI_CXX)
target_compile_definitions(deepmd_op_pt PRIVATE USE_MPI)
endif()
Expand Down
8 changes: 8 additions & 0 deletions source/op/pt/comm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ class Border : public torch::autograd::Function<Border> {
int version, subversion;
MPI_Get_version(&version, &subversion);
if (version >= 4) {
#ifdef NO_CUDA_AWARE
cuda_aware = 0;
#else
cuda_aware = MPIX_Query_cuda_support();
#endif
} else {
cuda_aware = 0;
}
Expand Down Expand Up @@ -215,7 +219,11 @@ class Border : public torch::autograd::Function<Border> {
int version, subversion;
MPI_Get_version(&version, &subversion);
if (version >= 4) {
#ifdef NO_CUDA_AWARE
cuda_aware = 0;
#else
cuda_aware = MPIX_Query_cuda_support();
#endif
} else {
cuda_aware = 0;
}
Expand Down