Merge pull request #1583 from andlaus/more_flow_build_parallelism

make the build of flow fully parallelizable
OPM · Sep 28, 2018 · 9ac269a · 9ac269a
2 parents 949b88d + d7efb36
commit 9ac269a
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 36 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,11 +113,26 @@ if (NOT EIGEN3_FOUND)
 	add_dependencies (opmsimulators Eigen3)
 endif (NOT EIGEN3_FOUND)
 
-
-
 if (HAVE_OPM_TESTS)
     include (${CMAKE_CURRENT_SOURCE_DIR}/compareECLFiles.cmake)
 endif()
 
+opm_add_test(flow
+  ONLY_COMPILE
+  ALWAYS_ENABLE
+  DEPENDS "opmsimulators"
+  LIBRARIES "opmsimulators"
+  SOURCES
+    flow/flow.cpp
+    flow/flow_ebos_blackoil.cpp
+    flow/flow_ebos_gasoil.cpp
+    flow/flow_ebos_oilwater.cpp
+    flow/flow_ebos_polymer.cpp
+    flow/flow_ebos_solvent.cpp
+    flow/flow_ebos_energy.cpp
+    flow/flow_ebos_oilwater_polymer.cpp)
+install(TARGETS flow DESTINATION bin)
+
 include(OpmBashCompletion)
 opm_add_bash_completion(flow)
+
diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
@@ -23,17 +23,6 @@
 # originally generated with the command:
 # find opm -name '*.c*' -printf '\t%p\n' | sort
 list (APPEND MAIN_SOURCE_FILES
-	# place the flow_ebos_*.cpp files on top of the list because they
-	# take the longest to compile, and compiling them first speeds up
-	# parallel builds because it allows the jobserver to do better scheduling
-  opm/simulators/flow_ebos_blackoil.cpp
-  opm/simulators/flow_ebos_gasoil.cpp
-  opm/simulators/flow_ebos_oilwater.cpp
-  opm/simulators/flow_ebos_polymer.cpp
-  opm/simulators/flow_ebos_solvent.cpp
-  opm/simulators/flow_ebos_energy.cpp
-  opm/simulators/flow_ebos_oilwater_polymer.cpp
-
   opm/autodiff/Compat.cpp
   opm/autodiff/ExtractParallelGridInformationToISTL.cpp
   opm/autodiff/NewtonIterationBlackoilCPR.cpp
@@ -226,7 +215,6 @@ list (APPEND EXAMPLE_SOURCE_FILES
   examples/flow_legacy.cpp
   examples/flow_reorder.cpp
   examples/flow_sequential.cpp
-  examples/flow.cpp
   examples/sim_2p_incomp_ad.cpp
   examples/sim_2p_comp_reorder.cpp
   examples/sim_simple.cpp
@@ -252,7 +240,6 @@ list (APPEND PROGRAM_SOURCE_FILES
   examples/sim_2p_incomp.cpp
   examples/sim_2p_incomp_ad.cpp
   examples/sim_2p_comp_reorder.cpp
-  examples/flow.cpp
   examples/flow_legacy.cpp
   examples/flow_reorder.cpp
   examples/flow_sequential.cpp
@@ -447,13 +434,6 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/polymer/TransportSolverTwophaseCompressiblePolymer.hpp
   opm/polymer/Point2D.hpp
   opm/polymer/TransportSolverTwophasePolymer.hpp
-  opm/simulators/flow_ebos_blackoil.hpp
-  opm/simulators/flow_ebos_gasoil.hpp
-  opm/simulators/flow_ebos_oilwater.hpp
-  opm/simulators/flow_ebos_polymer.hpp
-  opm/simulators/flow_ebos_solvent.hpp
-  opm/simulators/flow_ebos_energy.hpp
-  opm/simulators/flow_ebos_oilwater_polymer.hpp
   opm/simulators/ensureDirectoryExists.hpp
   opm/simulators/ParallelFileMerger.hpp
   opm/simulators/SimulatorCompressibleTwophase.hpp

diff --git a/examples/flow.cpp → flow/flow.cpp b/examples/flow.cpp → flow/flow.cpp
@@ -20,13 +20,13 @@
 */
 #include "config.h"
 
-#include <opm/simulators/flow_ebos_blackoil.hpp>
-#include <opm/simulators/flow_ebos_gasoil.hpp>
-#include <opm/simulators/flow_ebos_oilwater.hpp>
-#include <opm/simulators/flow_ebos_solvent.hpp>
-#include <opm/simulators/flow_ebos_polymer.hpp>
-#include <opm/simulators/flow_ebos_energy.hpp>
-#include <opm/simulators/flow_ebos_oilwater_polymer.hpp>
+#include <flow/flow_ebos_blackoil.hpp>
+#include <flow/flow_ebos_gasoil.hpp>
+#include <flow/flow_ebos_oilwater.hpp>
+#include <flow/flow_ebos_solvent.hpp>
+#include <flow/flow_ebos_polymer.hpp>
+#include <flow/flow_ebos_energy.hpp>
+#include <flow/flow_ebos_oilwater_polymer.hpp>
 
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>

diff --git a/opm/simulators/flow_ebos_blackoil.cpp → flow/flow_ebos_blackoil.cpp b/opm/simulators/flow_ebos_blackoil.cpp → flow/flow_ebos_blackoil.cpp
@@ -19,7 +19,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG 1
 
-#include <opm/simulators/flow_ebos_blackoil.hpp>
+#include <flow/flow_ebos_blackoil.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

diff --git a/opm/simulators/flow_ebos_blackoil.hpp → flow/flow_ebos_blackoil.hpp b/opm/simulators/flow_ebos_blackoil.hpp → flow/flow_ebos_blackoil.hpp
diff --git a/opm/simulators/flow_ebos_energy.cpp → flow/flow_ebos_energy.cpp b/opm/simulators/flow_ebos_energy.cpp → flow/flow_ebos_energy.cpp
@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <opm/simulators/flow_ebos_energy.hpp>
+#include <flow/flow_ebos_energy.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

diff --git a/opm/simulators/flow_ebos_energy.hpp → flow/flow_ebos_energy.hpp b/opm/simulators/flow_ebos_energy.hpp → flow/flow_ebos_energy.hpp
diff --git a/opm/simulators/flow_ebos_gasoil.cpp → flow/flow_ebos_gasoil.cpp b/opm/simulators/flow_ebos_gasoil.cpp → flow/flow_ebos_gasoil.cpp
@@ -19,7 +19,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG 1
 
-#include <opm/simulators/flow_ebos_gasoil.hpp>
+#include <flow/flow_ebos_gasoil.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>

diff --git a/opm/simulators/flow_ebos_gasoil.hpp → flow/flow_ebos_gasoil.hpp b/opm/simulators/flow_ebos_gasoil.hpp → flow/flow_ebos_gasoil.hpp
diff --git a/opm/simulators/flow_ebos_oilwater.cpp → flow/flow_ebos_oilwater.cpp b/opm/simulators/flow_ebos_oilwater.cpp → flow/flow_ebos_oilwater.cpp
@@ -19,7 +19,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG 1
 
-#include <opm/simulators/flow_ebos_oilwater.hpp>
+#include <flow/flow_ebos_oilwater.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>

diff --git a/opm/simulators/flow_ebos_oilwater.hpp → flow/flow_ebos_oilwater.hpp b/opm/simulators/flow_ebos_oilwater.hpp → flow/flow_ebos_oilwater.hpp
diff --git a/...simulators/flow_ebos_oilwater_polymer.cpp → flow/flow_ebos_oilwater_polymer.cpp b/...simulators/flow_ebos_oilwater_polymer.cpp → flow/flow_ebos_oilwater_polymer.cpp
@@ -19,7 +19,7 @@
 // Define making clear that the simulator supports AMG
 #define FLOW_SUPPORT_AMG 1
 
-#include <opm/simulators/flow_ebos_oilwater_polymer.hpp>
+#include <flow/flow_ebos_oilwater_polymer.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>

diff --git a/...simulators/flow_ebos_oilwater_polymer.hpp → flow/flow_ebos_oilwater_polymer.hpp b/...simulators/flow_ebos_oilwater_polymer.hpp → flow/flow_ebos_oilwater_polymer.hpp
diff --git a/opm/simulators/flow_ebos_polymer.cpp → flow/flow_ebos_polymer.cpp b/opm/simulators/flow_ebos_polymer.cpp → flow/flow_ebos_polymer.cpp
@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <opm/simulators/flow_ebos_polymer.hpp>
+#include <flow/flow_ebos_polymer.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

diff --git a/opm/simulators/flow_ebos_polymer.hpp → flow/flow_ebos_polymer.hpp b/opm/simulators/flow_ebos_polymer.hpp → flow/flow_ebos_polymer.hpp
diff --git a/opm/simulators/flow_ebos_solvent.cpp → flow/flow_ebos_solvent.cpp b/opm/simulators/flow_ebos_solvent.cpp → flow/flow_ebos_solvent.cpp
@@ -16,7 +16,7 @@
 */
 #include "config.h"
 
-#include <opm/simulators/flow_ebos_solvent.hpp>
+#include <flow/flow_ebos_solvent.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>

diff --git a/opm/simulators/flow_ebos_solvent.hpp → flow/flow_ebos_solvent.hpp b/opm/simulators/flow_ebos_solvent.hpp → flow/flow_ebos_solvent.hpp