Moved all only cpu related source code into /src/cpu

4dd55354 · Soeren Peters · a4543bc8 · 4dd55354 · 4dd55354 · 4dd55354
Commit 4dd55354 authored 4 years ago by Soeren Peters
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,34 +17,14 @@ include("${CMAKE_PATH}/FileUtilities.cmake")
 include("${CMAKE_PATH}/VirtualFluidsMacros.cmake")


-SET(USE_ZOLTAN OFF CACHE BOOL "include Zoltan library support")
-SET(USE_METIS ON CACHE BOOL "include METIS library support")
-SET(USE_MPI ON CACHE BOOL "include MPI library support")
-SET(USE_VTK OFF CACHE BOOL "include VTK library support")
-SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
-SET(USE_BOOST OFF CACHE BOOL "include Boost support")
-#SET(USE_PYTHON OFF CACHE BOOL "include Python scripting support")
-#SET(USE_FETOL OFF CACHE BOOL "include FETOL library support")
-SET(USE_INTEL OFF CACHE BOOL "include Intel compiler support")
-SET(USE_GCC OFF CACHE BOOL "include gcc compiler support")
-SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
-SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
-IF(${USE_MPI})
-    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_MPI)
-ENDIF()
-IF(${USE_METIS})
-    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_METIS)
-ENDIF()
-# FIND MPI
-IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MATCHES mpiicpc))# OR NOT ${CMAKE_CXX_COMPILER} MATCHES cc OR NOT ${CMAKE_CXX_COMPILER} MATCHES mpiCC)
-    FIND_PACKAGE(MPI REQUIRED)
-ENDIF()
+

 add_subdirectory(src/basics)

 #if (BUILD_VF_CPU)
-    add_subdirectory(3rdParty/MuParser)
-    add_subdirectory(cpu)
+#    add_subdirectory(3rdParty/MuParser)
+#    add_subdirectory(cpu)
+include (cpu.cmake)
 #endif()
 #if(BUILD_VF_GPU)
 #    add_subdirectory(gpu)

--- a/apps/cpu/IncludsList.cmake
+++ b/apps/cpu/IncludsList.cmake
 INCLUDE_DIRECTORIES(${APPS_ROOT_CPU})
-INCLUDE(${CMAKE_SOURCE_DIR}/cpu/VirtualFluidsCore/IncludsList.cmake)
+INCLUDE(${CMAKE_SOURCE_DIR}/src/cpu/VirtualFluidsCore/IncludsList.cmake)

 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d)

--- a/cpu.cmake
+++ b/cpu.cmake
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+
+#workaround for machine with mpi compiler wrapper
+#it most define before project
+
+#MPI
+#set(CMAKE_C_COMPILER mpicc)
+#set(CMAKE_CXX_COMPILER mpicxx)
+
+#Intel MPI
+#set(CMAKE_C_COMPILER mpiicc)
+#set(CMAKE_CXX_COMPILER mpiicpc)
+
+#Cray
+#set(CMAKE_C_COMPILER cc)
+#set(CMAKE_CXX_COMPILER CC)
+
+#SuperMUC
+#set(CMAKE_C_COMPILER mpicc)
+#set(CMAKE_CXX_COMPILER mpiCC)
+
+PROJECT(VirtualFluids)
+set (SOURCE_DIR ${PROJECT_SOURCE_DIR})
+set(SOURCE_ROOT "../source")
+
+#debug build for unix
+#IF(UNIX)
+#SET(CMAKE_BUILD_TYPE DEBUG)
+#ENDIF()
+
+SET(USE_ZOLTAN OFF CACHE BOOL "include Zoltan library support")
+SET(USE_METIS ON CACHE BOOL "include METIS library support")
+SET(USE_MPI ON CACHE BOOL "include MPI library support")
+SET(USE_VTK OFF CACHE BOOL "include VTK library support")
+SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
+SET(USE_BOOST OFF CACHE BOOL "include Boost support")
+#SET(USE_PYTHON OFF CACHE BOOL "include Python scripting support")
+#SET(USE_FETOL OFF CACHE BOOL "include FETOL library support")
+SET(USE_INTEL OFF CACHE BOOL "include Intel compiler support")
+SET(USE_GCC OFF CACHE BOOL "include gcc compiler support")
+SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
+SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
+
+#CAB
+include("CMake/CMakeCABMacros.cmake")
+include("CMake/FileUtilities.cmake")
+include("CMake/VirtualFluidsMacros.cmake")
+
+#MPI
+IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MATCHES mpiicpc))# OR NOT ${CMAKE_CXX_COMPILER} MATCHES cc OR NOT ${CMAKE_CXX_COMPILER} MATCHES mpiCC)
+    FIND_PACKAGE(MPI REQUIRED)
+ENDIF()
+#SET(MPI_CXX_LINK_FLAGS -mpe=mpilog)
+
+#SET(BOOST_USE_MULTITHREAD ON)
+#SET(Boost_USE_STATIC_LIBS ON)
+#SET(Boost_DEBUG TRUE)
+
+#SET(bv ${BOOST_VERSION}) #hack for find boost, after next command ${BOOST_VERSION} would be set to 0
+#FIND_PACKAGE(Boost ${bv} COMPONENTS system date_time thread serialization chrono regex)
+#FIND_PACKAGE(Boost ${BOOST_VERSION} COMPONENTS system date_time thread serialization chrono regex)
+#FIND_PACKAGE(Boost ${bv} COMPONENTS system thread serialization date_time)
+#SET(BOOST_VERSION ${bv})
+#IF(${USE_PYTHON})
+#  FIND_PACKAGE(Boost ${BOOST_VERSION} COMPONENTS system date_time thread serialization chrono regex python)
+#ELSE(${USE_PYTHON})
+#    FIND_PACKAGE(Boost ${BOOST_VERSION} COMPONENTS system date_time thread serialization chrono regex)
+#ENDIF()
+
+IF(${USE_BOOST})
+    FIND_PACKAGE(Boost ${BOOST_VERSION})
+ENDIF()
+
+##################################################################################
+#  Java
+##############################################################################
+### FindJNI.cmake
+# IF(${USE_FETOL})
+# find_package(JNI REQUIRED)
+# ENDIF()
+
+#VTK
+IF(${USE_VTK})
+    #find_package(VTK 6.1 NO_MODULE)
+    FIND_PACKAGE(VTK REQUIRED)
+    INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
+    MESSAGE("VTK_INCLUDE_DIRS = " ${VTK_INCLUDE_DIRS})
+ENDIF()
+
+IF(${USE_CATALYST})
+    find_package(ParaView 4.3 REQUIRED COMPONENTS vtkPVPythonCatalyst)
+    include("${PARAVIEW_USE_FILE}")
+ENDIF()
+
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DCAB_BOOST)
+LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DNOMINMAX)
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DBOOST_SIGNALS_NO_DEPRECATION_WARNING)
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DCAB_RUBY)
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -mpe=mpilog)
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -noshlib)
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DSINGLEPRECISION)
+
+IF(${USE_ZOLTAN})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_ZOLTAN)
+ENDIF()
+IF(${USE_METIS})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_METIS)
+ENDIF()
+IF(${USE_MPI})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_MPI)
+ENDIF()
+# IF(${USE_FETOL})
+# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_FETOL)
+# ENDIF()
+IF(${USE_VTK})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_VTK)
+ENDIF()
+IF(${USE_CATALYST})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_CATALYST)
+ENDIF()
+
+IF(${USE_BOOST})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_BOOST)
+ENDIF()
+
+IF(${USE_HLRN_LUSTRE})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DHLRN_LUSTRE)
+ENDIF()
+
+IF(${USE_INTEL})
+    SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} -parallel)
+ENDIF()
+
+IF(${USE_GCC})
+    SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} -lgomp)
+ENDIF()
+
+
+# IF(${USE_PYTHON})
+# FIND_PACKAGE(PythonLibs)
+# INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
+# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_PYTHON)
+# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DBOOST_PYTHON_STATIC_LIB)
+# add_subdirectory(python)
+# ENDIF()
+
+# IF(${USE_INTEL})
+# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DMPICH_IGNORE_CXX_SEEK)
+# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DMPICH_SKIP_MPICXX)
+# ENDIF()
+#message("MPI_CXX_LIBRARY: " ${MPI_CXX_LIBRARY})
+#IF(MPI_CXX_LIBRARY)
+#SET(MPI_LIBRARY ${MPI_LIBRARY} ${MPI_CXX_LIBRARY})
+#message("MPI_LIBRARY: " ${MPI_LIBRARY})
+#ENDIF() 
+
+
+#IF(${USE_DEM_COUPLING})
+#    add_subdirectory(Plugins/dem_coupling)
+#ENDIF()
+
+add_subdirectory(3rdParty/MuParser)
+
+add_subdirectory(src/cpu/VirtualFluidsCore)
+#add_subdirectory(VirtualFluidsBasic)
+
+#set(APPS_ROOT "${SOURCE_ROOT}/cpu/Applications")
+#INCLUDE(${APPS_ROOT}/Applications.cmake)
\ No newline at end of file
--- a/gpu.cmake
+++ b/gpu.cmake
+cmake_minimum_required(VERSION 3.9..3.17 FATAL_ERROR)
+
+if(${CMAKE_VERSION} VERSION_LESS 3.12)
+    cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
+endif()
+
+project(VirtualFluids CXX)
+
+set (CMAKE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+
+option(BUILD_VF_CPU "Build VirtualFluids cpu variant" OFF)
+option(BUILD_VF_GPU "Build VirtualFluids gpu variant" ON)
+
+
+include("${CMAKE_PATH}/CMakeCABMacros.cmake")
+include("${CMAKE_PATH}/FileUtilities.cmake")
+include("${CMAKE_PATH}/VirtualFluidsMacros.cmake")
+
+
+SET(USE_ZOLTAN OFF CACHE BOOL "include Zoltan library support")
+SET(USE_METIS ON CACHE BOOL "include METIS library support")
+SET(USE_MPI ON CACHE BOOL "include MPI library support")
+SET(USE_VTK OFF CACHE BOOL "include VTK library support")
+SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
+SET(USE_BOOST OFF CACHE BOOL "include Boost support")
+#SET(USE_PYTHON OFF CACHE BOOL "include Python scripting support")
+#SET(USE_FETOL OFF CACHE BOOL "include FETOL library support")
+SET(USE_INTEL OFF CACHE BOOL "include Intel compiler support")
+SET(USE_GCC OFF CACHE BOOL "include gcc compiler support")
+SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
+SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
+IF(${USE_MPI})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_MPI)
+ENDIF()
+IF(${USE_METIS})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_METIS)
+ENDIF()
+# FIND MPI
+IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MATCHES mpiicpc))# OR NOT ${CMAKE_CXX_COMPILER} MATCHES cc OR NOT ${CMAKE_CXX_COMPILER} MATCHES mpiCC)
+    FIND_PACKAGE(MPI REQUIRED)
+ENDIF()
+
+add_subdirectory(src/basics)
+
+#if (BUILD_VF_CPU)
+    add_subdirectory(3rdParty/MuParser)
+    add_subdirectory(cpu)
+#endif()
+#if(BUILD_VF_GPU)
+#    add_subdirectory(gpu)
+#endif()
+
+set (APPS_ROOT_CPU "${CMAKE_SOURCE_DIR}/apps/cpu/")
+include(${APPS_ROOT_CPU}/Applications.cmake)
\ No newline at end of file
--- a/cpu/DemCoupling/CMakePackage.txt
+++ b/cpu/DemCoupling/CMakePackage.txt
--- a/cpu/DemCoupling/CreateDemObjectsCoProcessor.cpp
+++ b/cpu/DemCoupling/CreateDemObjectsCoProcessor.cpp
--- a/cpu/DemCoupling/CreateDemObjectsCoProcessor.h
+++ b/cpu/DemCoupling/CreateDemObjectsCoProcessor.h
--- a/cpu/DemCoupling/DemCoProcessor.cpp
+++ b/cpu/DemCoupling/DemCoProcessor.cpp
--- a/cpu/DemCoupling/DemCoProcessor.h
+++ b/cpu/DemCoupling/DemCoProcessor.h
--- a/cpu/DemCoupling/DemCoupling.cmake
+++ b/cpu/DemCoupling/DemCoupling.cmake
--- a/cpu/DemCoupling/IncludsList.cmake
+++ b/cpu/DemCoupling/IncludsList.cmake
--- a/cpu/DemCoupling/MovableObjectInteractor.cpp
+++ b/cpu/DemCoupling/MovableObjectInteractor.cpp
--- a/cpu/DemCoupling/MovableObjectInteractor.h
+++ b/cpu/DemCoupling/MovableObjectInteractor.h
--- a/cpu/DemCoupling/PePartitioningGridVisitor.cpp
+++ b/cpu/DemCoupling/PePartitioningGridVisitor.cpp
--- a/cpu/DemCoupling/PePartitioningGridVisitor.h
+++ b/cpu/DemCoupling/PePartitioningGridVisitor.h
--- a/cpu/DemCoupling/RestartDemObjectsCoProcessor.cpp
+++ b/cpu/DemCoupling/RestartDemObjectsCoProcessor.cpp
--- a/cpu/DemCoupling/RestartDemObjectsCoProcessor.h
+++ b/cpu/DemCoupling/RestartDemObjectsCoProcessor.h
--- a/cpu/DemCoupling/WriteDemObjectsCoProcessor.cpp
+++ b/cpu/DemCoupling/WriteDemObjectsCoProcessor.cpp
--- a/cpu/DemCoupling/WriteDemObjectsCoProcessor.h
+++ b/cpu/DemCoupling/WriteDemObjectsCoProcessor.h
--- a/cpu/DemCoupling/WritePeBlocksCoProcessor.cpp
+++ b/cpu/DemCoupling/WritePeBlocksCoProcessor.cpp