Update MakeList MPI, OpenMP code

feelpp · Sep 12, 2023 · c20d76b · c20d76b
1 parent b2a5d59
commit c20d76b
Show file tree

Hide file tree

Showing 12 changed files with 841 additions and 135 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -21,3 +21,14 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 #
+
+
+#set(PARALLELPROGRAMMING_TARGET_NAME pp)
+#add_library(${PARALLELPROGRAMMING_TARGET} INTERFACE)
+#target_include_directories(${PARALLELPROGRAMMING_TARGET} INTERFACE
+#  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+#  $<INSTALL_INTERFACE:include>
+#  )
+#target_link_libraries(${PARALLELPROGRAMMING_TARGET} INTERFACE Feelpp::feelpp)
+
+
diff --git a/src/MPI/MPI_1/CMakeLists.txt b/src/MPI/MPI_1/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-project(MPI_bcast)
+#project(MPI_bcast)
 
 ######## A simple cmakelists.txt file for ... #############  
 
@@ -9,8 +9,16 @@ cmake_minimum_required(VERSION 3.17)
 set(CMAKE_BUILD_TYPE Release)
 #set(CMAKE_CXX_COMPILER "/usr/local/bin/g++")
 
+#set(CMAKE_CXX_STANDARD 14)
+#set(CMAKE_CXX_COMPILER "/usr/local/bin/g++")
+#set(CMAKE_C_COMPILER    "/usr/bin/clang-14")
+#set(CMAKE_CXX_COMPILER  "/usr/bin/clang++-14")
+#set(CMAKE_CXX_COMPILER "/usr/bin/gcc")
+#set(CMAKE_CXX_COMPILER "/usr/bin/g++-11")
+
+
+
 
-add_executable(MPI_bcast MPI_bcast.cpp)
 
 find_package(MPI REQUIRED)
 if (MPI_FOUND)
@@ -29,10 +37,25 @@ endif(OpenMP_CXX_FOUND)
 
 
 
-include_directories(SYSTEM ${MPI_INCLUDES_PATH})
-target_include_directories(MPI_bcast PUBLIC ${MPI_CXX_INCLUDE_DIRS})
-target_link_libraries(MPI_bcast PUBLIC ${MPI_CXX_LIBRARIES} )
+file(GLOB WFOPenMP_SRC
+     "*.h"
+     "*.c"
+)
+
+foreach (myfile ${WFOPenMP_SRC})
+    get_filename_component(myname ${myfile} NAME_WLE)
+    get_filename_component(dirname ${myfile} DIRECTORY)
+    message("${myname}.c | ${dir_src}")
+    add_executable(${myname} "${myname}.c")
+    #if(MPI_FOUND)
+        include_directories(SYSTEM ${MPI_INCLUDES_PATH})
+        target_include_directories(${myname}  PUBLIC ${MPI_CXX_INCLUDE_DIRS})
+        target_link_libraries(${myname}  PUBLIC ${MPI_CXX_LIBRARIES} )
+    #endif()
 
-# traget_link_libraries(A PUBLIC OpenMP::OpenMP_CXX)
+    #if(OpenMP_CXX_FOUND)
+    #    target_link_libraries(${myname} PUBLIC OpenMP::OpenMP_CXX ${OpenCV_LIBS})
+    #endif()
+endforeach (file ${WFOPenMP_SRC})
 
 ########### end ####################################  
diff --git a/src/MPI/MPI_1/MPI_iterFFTMPI.c → src/MPI/MPI_1/MPI_iterFFTMPI.c1 b/src/MPI/MPI_1/MPI_iterFFTMPI.c → src/MPI/MPI_1/MPI_iterFFTMPI.c1
diff --git a/src/MPI/MPI_1/Nota.txt b/src/MPI/MPI_1/Nota.txt
@@ -0,0 +1,2 @@
+Compilation OK ! :-)
+
diff --git a/src/MPI/MPI_2/CMakeLists.txt b/src/MPI/MPI_2/CMakeLists.txt
@@ -0,0 +1,61 @@
+
+#project(MPI_bcast)
+
+######## A simple cmakelists.txt file for ... #############  
+
+cmake_minimum_required(VERSION 3.17)
+#set(CMAKE_CXX_STANDARD 14)
+#set(CMAKE_BUILD_TYPE Debug)
+set(CMAKE_BUILD_TYPE Release)
+#set(CMAKE_CXX_COMPILER "/usr/local/bin/g++")
+
+#set(CMAKE_CXX_STANDARD 14)
+#set(CMAKE_CXX_COMPILER "/usr/local/bin/g++")
+#set(CMAKE_C_COMPILER    "/usr/bin/clang-14")
+#set(CMAKE_CXX_COMPILER  "/usr/bin/clang++-14")
+#set(CMAKE_CXX_COMPILER "/usr/bin/gcc")
+#set(CMAKE_CXX_COMPILER "/usr/bin/g++-11")
+
+
+
+
+
+find_package(MPI REQUIRED)
+if (MPI_FOUND)
+    MESSAGE("{MPI_CXX_LIBRARIES}")
+    else (MPI_FOUND)
+    MESSAGE (SEND_ERROR "This application cannot compile without MPI")
+endif(MPI_FOUND)
+
+
+find_package(OpenMP)
+if (OpenMP_CXX_FOUND)
+    MESSAGE("{OpenMP_CXX_LIBRARIES}")
+    else (OpenMP_CXX_FOUND)
+    MESSAGE (SEND_ERROR "This application cannot compile without OpenMPI")
+endif(OpenMP_CXX_FOUND)
+
+
+
+file(GLOB WFOPenMP_SRC
+     "*.h"
+     "*.c"
+)
+
+foreach (myfile ${WFOPenMP_SRC})
+    get_filename_component(myname ${myfile} NAME_WLE)
+    get_filename_component(dirname ${myfile} DIRECTORY)
+    message("${myname}.c | ${dir_src}")
+    add_executable(${myname} "${myname}.c")
+    #if(MPI_FOUND)
+        include_directories(SYSTEM ${MPI_INCLUDES_PATH})
+        target_include_directories(${myname}  PUBLIC ${MPI_CXX_INCLUDE_DIRS})
+        target_link_libraries(${myname}  PUBLIC ${MPI_CXX_LIBRARIES} )
+    #endif()
+
+    #if(OpenMP_CXX_FOUND)
+    #    target_link_libraries(${myname} PUBLIC OpenMP::OpenMP_CXX ${OpenCV_LIBS})
+    #endif()
+endforeach (file ${WFOPenMP_SRC})
+
+########### end ####################################  
diff --git a/src/MPI/MPI_2/MPI_Graph_create.c → src/MPI/MPI_2/MPI_Graph_create.cb b/src/MPI/MPI_2/MPI_Graph_create.c → src/MPI/MPI_2/MPI_Graph_create.cb
diff --git a/src/MPI/MPI_2/Nota.txt b/src/MPI/MPI_2/Nota.txt
@@ -0,0 +1,2 @@
+Compilation OK ! :-)
+
diff --git a/src/OpenMP/CMakeLists.txt b/src/OpenMP/CMakeLists.txt
@@ -1,5 +1,7 @@
 ######## A simple cmakelists.txt file for Open..() #############  
 
+
+
 cmake_minimum_required(VERSION 3.17)
 
 set(CMAKE_CXX_STANDARD 14)
@@ -9,7 +11,7 @@ set(CMAKE_CXX_STANDARD 14)
 #set(CMAKE_CXX_COMPILER "/usr/bin/gcc")
 #set(CMAKE_CXX_COMPILER "/usr/bin/g++-11")
 
-project( firstprivate )
+#project( firstprivate )
 
 #find_package( OpenCV REQUIRED )
 #include_directories( ${OpenCV_INCLUDE_DIRS} 
@@ -21,12 +23,25 @@ if (OPENMP_FOUND)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
 endif()
+
+
+file(GLOB WFOPenMP_SRC
+     "*.hpp"
+     "*.cpp"
 )
 
-add_executable(firstprivate firstprivate.cpp )
+foreach (myfile ${WFOPenMP_SRC})
+    get_filename_component(myname ${myfile} NAME_WLE)
+    get_filename_component(dirname ${myfile} DIRECTORY)
+    message("${myname}.cpp | ${dir_src}")
+    add_executable(${myname} "${myname}.cpp")
+    if(OpenMP_CXX_FOUND)
+        target_link_libraries(${myname} PUBLIC OpenMP::OpenMP_CXX ${OpenCV_LIBS})
+    endif()
+endforeach (file ${WFOPenMP_SRC})
+
+
+
 
-if(OpenMP_CXX_FOUND)
-    target_link_libraries(firstprivate PUBLIC OpenMP::OpenMP_CXX ${OpenCV_LIBS})
-endif()
 
 ########### end ####################################