Merge branch 'issue57/fix-parallel-build' into 'master'

Issue57/fix parallel build

Closes #57

See merge request !70

.gitlab-ci.yml

@@ -20,7 +20,7 @@ build_starpu_cuda_mpi:
     - mkdir -p build
     - cd build
     - cmake .. -DCHAMELEON_USE_CUDA=ON -DCHAMELEON_USE_MPI=ON -DCMAKE_INSTALL_PREFIX=${PWD}/install -DCMAKE_VERBOSE_MAKEFILE=ON -DMORSE_ENABLE_WARNING=ON -DMORSE_ENABLE_COVERAGE=ON
-    - make -j2 | tee ../chameleon-build-starpu.log
+    - make -j5 | tee ../chameleon-build-starpu.log
     - make install | tee -a ../chameleon-build-starpu.log && rm install/ -r
 
 build_starpu_simgrid:
@@ -37,7 +37,7 @@ build_starpu_simgrid:
     - mkdir -p build
     - cd build
     - cmake .. -DCHAMELEON_SIMULATION=ON -DCHAMELEON_USE_CUDA=ON -DCHAMELEON_USE_MPI=OFF -DCMAKE_INSTALL_PREFIX=${PWD}/install -DCMAKE_VERBOSE_MAKEFILE=ON -DMORSE_ENABLE_WARNING=ON -DMORSE_ENABLE_COVERAGE=ON
-    - make -j2 | tee ../chameleon-build-starpu-simgrid.log
+    - make -j5 | tee ../chameleon-build-starpu-simgrid.log
     - make install | tee -a ../chameleon-build-starpu-simgrid.log && rm install/ -r
 
 build_quark:
@@ -54,7 +54,7 @@ build_quark:
     - mkdir -p build
     - cd build
     - cmake .. -DCMAKE_INSTALL_PREFIX=${PWD}/install -DCMAKE_VERBOSE_MAKEFILE=ON -DMORSE_ENABLE_WARNING=ON -DMORSE_ENABLE_COVERAGE=ON -DCHAMELEON_SCHED_QUARK=ON
-    - make -j2 | tee ../chameleon-build-quark.log
+    - make -j5 | tee ../chameleon-build-quark.log
     - make install | tee -a ../chameleon-build-quark.log && rm install/ -r
 
 test_starpu_mpi:
@@ -142,7 +142,6 @@ doc:
     - mkdir -p build
     - cd build
     - cmake .. -DCHAMELEON_ENABLE_DOC=ON
-    - make doc
+    - make doc -j5
   only:
     - master@solverstack/chameleon
-

compute/CMakeLists.txt

@@ -311,6 +311,7 @@ list(INSERT CHAMELEON_DEP 0 -lchameleon)
 add_dependencies(chameleon
   chameleon_include
   control_include
+  chameleon_sources
 )
 
 set_property(TARGET chameleon PROPERTY LINKER_LANGUAGE Fortran)

coreblas/compute/CMakeLists.txt

@@ -114,7 +114,7 @@ set(CHAMELEON_SOURCES_TARGETS "${CHAMELEON_SOURCES_TARGETS};coreblas_sources" CA
 # ------------
 add_library(coreblas ${COREBLAS_SRCS})
 list(INSERT CHAMELEON_DEP 0 -lcoreblas)
-add_dependencies(coreblas coreblas_include)
+add_dependencies(coreblas coreblas_include coreblas_sources)
 set_property(TARGET coreblas PROPERTY LINKER_LANGUAGE Fortran)
 set_property(TARGET coreblas PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 

cudablas/compute/CMakeLists.txt

@@ -96,7 +96,7 @@ set(CHAMELEON_SOURCES_TARGETS "${CHAMELEON_SOURCES_TARGETS};cudablas_sources" CA
 # Compile step
 # ------------
 add_library(cudablas ${CUDABLAS_SRCS})
-add_dependencies(cudablas cudablas_include)
+add_dependencies(cudablas cudablas_include cudablas_sources)
 set_property(TARGET cudablas PROPERTY LINKER_LANGUAGE Fortran)
 set_property(TARGET cudablas PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 

runtime/parsec/CMakeLists.txt

@@ -131,6 +131,7 @@ add_dependencies(chameleon_parsec
   chameleon_include
   control_include
   runtime_parsec_include
+  parsec_sources
 )
 
 if (NOT CHAMELEON_SIMULATION)

runtime/quark/CMakeLists.txt

@@ -126,6 +126,7 @@ add_dependencies(chameleon_quark
   chameleon_include
   control_include
   runtime_quark_include
+  quark_sources
 )
 if (NOT CHAMELEON_SIMULATION)
     add_dependencies(chameleon_quark coreblas_include)

runtime/starpu/CMakeLists.txt

@@ -148,6 +148,7 @@ add_dependencies(chameleon_starpu
   chameleon_include
   control_include
   runtime_starpu_include
+  starpu_sources
   )
 if (NOT CHAMELEON_SIMULATION)
   add_dependencies(chameleon_starpu coreblas_include)

timing/CMakeLists.txt

@@ -59,12 +59,16 @@ if (NOT CHAMELEON_SIMULATION)
                         PRECISIONS "${CHAMELEON_PRECISION}")
 
     set(TIMING_SRCS ${TIMING_AUX_SRCS_GENERATED})
+    # Force generation of sources
+    # ---------------------------
+    add_custom_target(timing_aux_sources ALL SOURCES ${TIMINGS_SRCS})
+    set(CHAMELEON_SOURCES_TARGETS "${CHAMELEON_SOURCES_TARGETS};timing_aux_sources" CACHE INTERNAL "List of targets of sources")
 
     # Create libchameleon_timing.a
     # -----------------------------
     add_library(chameleon_timing STATIC ${TIMING_SRCS})
     set_property(TARGET chameleon_timing PROPERTY LINKER_LANGUAGE Fortran)
-    add_dependencies(chameleon_timing timing_include)
+    add_dependencies(chameleon_timing timing_include timing_aux_sources)
 endif()
 
 # Generate the morse testing sources for all possible precisions