ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix MPI build

Browse Source
This commit is contained in:
Matthias Hochsteger 2019-07-10 10:56:55 +02:00
parent 05aafdc3b6
commit b848bdc237
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -287,13 +287,20 @@ if (USE_PYTHON)
endif (USE_PYTHON) endif (USE_PYTHON)
####################################################################### #######################################################################
add_library(netgen_mpi INTERFACE)
add_library(netgen_metis INTERFACE)
if (USE_MPI) if (USE_MPI)
find_package(MPI REQUIRED) find_package(MPI REQUIRED)
target_include_directories(netgen_mpi INTERFACE ${MPI_CXX_INCLUDE_PATH})
target_link_libraries(netgen_mpi INTERFACE ${MPI_mpi_LIBRARY} ${MPI_CXX_LIBRARIES} )
target_compile_definitions(netgen_mpi INTERFACE PARALLEL )
find_package(METIS REQUIRED) find_package(METIS REQUIRED)
add_definitions(-DPARALLEL -DMETIS) target_include_directories(netgen_metis INTERFACE ${METIS_INCLUDE_DIR})
include_directories(${MPI_CXX_INCLUDE_PATH}) target_link_libraries(netgen_metis INTERFACE ${METIS_LIBRARY} )
include_directories(${METIS_INCLUDE_DIR}) target_compile_definitions(netgen_metis INTERFACE METIS )
endif (USE_MPI) endif (USE_MPI)
install(TARGETS netgen_mpi netgen_metis ${NG_INSTALL_DIR})
####################################################################### #######################################################################
if (USE_OCC) if (USE_OCC)

1
libsrc/core/CMakeLists.txt
View File

@ -39,6 +39,7 @@ if(USE_PYTHON)
target_include_directories(ngcore PRIVATE ${PYTHON_INCLUDE_DIRS}) target_include_directories(ngcore PRIVATE ${PYTHON_INCLUDE_DIRS})
target_link_libraries(ngcore PRIVATE ${PYTHON_LIBRARIES}) target_link_libraries(ngcore PRIVATE ${PYTHON_LIBRARIES})
endif(USE_PYTHON) endif(USE_PYTHON)
target_link_libraries(ngcore PUBLIC netgen_mpi)
install(FILES ngcore.hpp archive.hpp type_traits.hpp version.hpp ngcore_api.hpp logging.hpp install(FILES ngcore.hpp archive.hpp type_traits.hpp version.hpp ngcore_api.hpp logging.hpp
exception.hpp symboltable.hpp paje_trace.hpp utils.hpp profiler.hpp mpi_wrapper.hpp exception.hpp symboltable.hpp paje_trace.hpp utils.hpp profiler.hpp mpi_wrapper.hpp

7
libsrc/core/mpi_wrapper.hpp
View File

@ -6,6 +6,7 @@
#include <mpi.h> #include <mpi.h>
#endif #endif
#include "exception.hpp"
namespace ngcore namespace ngcore
{ {
@ -191,7 +192,7 @@ namespace ngcore
}; };
#else #else // PARALLEL
class MPI_Comm { class MPI_Comm {
int nr; int nr;
public: public:
@ -240,7 +241,7 @@ namespace ngcore
void Bcast (T & s, int root = 0) const { ; } void Bcast (T & s, int root = 0) const { ; }
}; };
#endif #endif // PARALLEL
@ -252,5 +253,5 @@ namespace ngcore
} }
#endif #endif // NGCORE_MPIWRAPPER_HPP

1
libsrc/core/taskmanager.cpp
View File

@ -10,6 +10,7 @@
#include <chrono> #include <chrono>
#include "concurrentqueue.h" #include "concurrentqueue.h"
#include "mpi_wrapper.hpp"
#include "paje_trace.hpp" #include "paje_trace.hpp"
#include "profiler.hpp" #include "profiler.hpp"
#include "taskmanager.hpp" #include "taskmanager.hpp"

2
libsrc/meshing/CMakeLists.txt
View File

@ -23,7 +23,7 @@ endif(APPLE)
target_link_libraries( mesh PUBLIC ngcore PRIVATE gprim la gen ) target_link_libraries( mesh PUBLIC ngcore PRIVATE gprim la gen )
target_link_libraries( mesh PRIVATE ${ZLIB_LIBRARIES} ${MPI_CXX_LIBRARIES} ${PYTHON_LIBRARIES} ${METIS_LIBRARY}) target_link_libraries( mesh PRIVATE netgen_metis ${ZLIB_LIBRARIES} ${PYTHON_LIBRARIES} )
if(NOT WIN32) if(NOT WIN32)
install( TARGETS mesh ${NG_INSTALL_DIR}) install( TARGETS mesh ${NG_INSTALL_DIR})
endif(NOT WIN32) endif(NOT WIN32)