Restructure MPI solvers

TLCFEM · Jun 12, 2023 · d498211 · d498211
1 parent cccdc6e
commit d498211
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,28 +108,15 @@ target_link_libraries(${PROJECT_NAME} metis)
 set_property(TARGET ${PROJECT_NAME} PROPERTY ENABLE_EXPORTS 1)
 
 if (USE_MPI)
-    add_executable(solver.pardiso Toolbox/solver.pardiso.cpp)
-    add_executable(tester.pardiso Toolbox/tester.pardiso.cpp)
-    add_dependencies(tester.pardiso solver.pardiso)
-    if (COMPILER_IDENTIFIER MATCHES "(linux|mac)")
-        target_link_libraries(solver.pardiso mpi)
-        target_link_libraries(tester.pardiso mpi)
-        target_link_libraries(${PROJECT_NAME} mpi)
-        if (NOT USE_INTEL_MPI)
-            target_link_libraries(solver.pardiso mpi_cxx mpi_mpifh)
-            target_link_libraries(tester.pardiso mpi_cxx mpi_mpifh)
-            target_link_libraries(${PROJECT_NAME} mpi_cxx mpi_mpifh)
-        else ()
-            target_link_libraries(solver.pardiso mpifort)
-            target_link_libraries(tester.pardiso mpifort)
-            target_link_libraries(${PROJECT_NAME} mpifort)
-        endif ()
+    if (NOT COMPILER_IDENTIFIER MATCHES "(linux|mac)") # windows only support intel mpi
+        set(MPI_LIBS impi impicxx)
+    elseif (USE_INTEL_MPI)
+        set(MPI_LIBS mpi mpifort)
     else ()
-        target_link_libraries(solver.pardiso impi impicxx)
-        target_link_libraries(tester.pardiso impi impicxx)
-        target_link_libraries(${PROJECT_NAME} impi impicxx)
+        set(MPI_LIBS mpi mpi_cxx mpi_mpifh)
     endif ()
-    add_dependencies(${PROJECT_NAME} solver.pardiso)
+    add_subdirectory(MPI)
+    target_link_libraries(${PROJECT_NAME} ${MPI_LIBS})
 endif ()
 
 if (COMPILER_IDENTIFIER MATCHES "(linux|mac)")

diff --git a/MPI/CMakeLists.txt b/MPI/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(mpi-solver)
+
+add_executable(solver.pardiso solver.pardiso.cpp)
+add_executable(tester.pardiso tester.pardiso.cpp)
+
+target_link_libraries(solver.pardiso ${MPI_LIBS})
+target_link_libraries(tester.pardiso ${MPI_LIBS})
+
+add_dependencies(tester.pardiso solver.pardiso)
+
+add_dependencies(suanPan solver.pardiso)
diff --git a/Toolbox/solver.pardiso.cpp → MPI/solver.pardiso.cpp b/Toolbox/solver.pardiso.cpp → MPI/solver.pardiso.cpp
diff --git a/Toolbox/tester.pardiso.cpp → MPI/tester.pardiso.cpp b/Toolbox/tester.pardiso.cpp → MPI/tester.pardiso.cpp
diff --git a/MSVC/suanPan/solver.pardiso/solver.pardiso.vcxproj b/MSVC/suanPan/solver.pardiso/solver.pardiso.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\Toolbox\solver.pardiso.cpp" />
+    <ClCompile Include="..\..\..\MPI\solver.pardiso.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>

diff --git a/MSVC/suanPan/solver.pardiso/solver.pardiso.vcxproj.filters b/MSVC/suanPan/solver.pardiso/solver.pardiso.vcxproj.filters
@@ -7,7 +7,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\Toolbox\solver.pardiso.cpp">
+    <ClCompile Include="..\..\..\MPI\solver.pardiso.cpp">
       <Filter>SRC</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/MSVC/suanPan/tester.pardiso/tester.pardiso.vcxproj b/MSVC/suanPan/tester.pardiso/tester.pardiso.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\Toolbox\tester.pardiso.cpp" />
+    <ClCompile Include="..\..\..\MPI\tester.pardiso.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>

diff --git a/MSVC/suanPan/tester.pardiso/tester.pardiso.vcxproj.filters b/MSVC/suanPan/tester.pardiso/tester.pardiso.vcxproj.filters
@@ -7,7 +7,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\Toolbox\tester.pardiso.cpp">
+    <ClCompile Include="..\..\..\MPI\tester.pardiso.cpp">
       <Filter>SRC</Filter>
     </ClCompile>
   </ItemGroup>