Remove the coreblas_include dependency in compute directory

compute/CMakeLists.txt

@@ -303,12 +303,8 @@ list(INSERT CHAMELEON_DEP 0 -lchameleon)
 
 add_dependencies(chameleon
   chameleon_include
-  coreblas_include
   control_include
 )
-if (NOT CHAMELEON_SIMULATION)
-    add_dependencies(chameleon coreblas_include)
-endif()
 
 set_property(TARGET chameleon PROPERTY LINKER_LANGUAGE Fortran)
 set_property(TARGET chameleon PROPERTY Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/include")

compute/zgesvd.c

@@ -23,6 +23,8 @@
  * @precisions normal z -> s d c
  *
  **/
+#include <stdio.h>
+#include <string.h>
 #include <coreblas/lapacke.h>
 #include "control/common.h"
 

compute/zheevd.c

@@ -23,6 +23,7 @@
  * @precisions normal z -> s d c
  *
  **/
+#include <string.h>
 #include <coreblas/lapacke.h>
 #include "control/common.h"
 

control/common.h

@@ -74,11 +74,6 @@
  **/
 #include "morse.h"
 
-#include "coreblas.h"
-#if defined(CHAMELEON_USE_CUDA) && !defined(CHAMELEON_SIMULATION)
-#include "cudablas.h"
-#endif
-
 #include "control/global.h"
 #include "control/auxiliary.h"
 #include "control/context.h"

control/descriptor.c

@@ -29,9 +29,9 @@
  * @brief Group descriptor routines exposed to users
  *
  */
-
 #include <stdlib.h>
 #include <assert.h>
+#include <string.h>
 #include "control/common.h"
 #include "control/descriptor.h"
 #include "chameleon/morse_runtime.h"

runtime/parsec/CMakeLists.txt

@@ -44,8 +44,8 @@ set(RUNTIME_HDRS_GENERATED "")
 # Define the list of headers
 # --------------------------
 set(RUNTIME_HDRS
-    include/chameleon_parsec.h
-    )
+  include/chameleon_parsec.h
+  )
 
 # Add generated headers
 # ---------------------
@@ -111,10 +111,16 @@ add_library(chameleon_parsec ${RUNTIME_SRCS})
 set_property(TARGET chameleon_parsec PROPERTY LINKER_LANGUAGE Fortran)
 set_property(TARGET chameleon_parsec PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 
-target_link_libraries(chameleon_parsec coreblas ${PARSEC_LIBRARIES_DEP})
-if(CHAMELEON_USE_CUDA)
-  target_link_libraries(chameleon_parsec cudablas)
-endif(CHAMELEON_USE_CUDA)
+target_link_libraries(chameleon_parsec
+  ${PARSEC_LIBRARIES_DEP})
+if (NOT CHAMELEON_SIMULATION)
+  target_link_libraries(chameleon_parsec
+    coreblas)
+  if(CHAMELEON_USE_CUDA)
+    target_link_libraries(chameleon_parsec
+      cudablas)
+  endif(CHAMELEON_USE_CUDA)
+endif(NOT CHAMELEON_SIMULATION)
 
 add_dependencies(chameleon_parsec
   chameleon_include
@@ -123,14 +129,18 @@ add_dependencies(chameleon_parsec
   runtime_parsec_include
 )
 
-if (CHAMELEON_USE_CUDA AND NOT CHAMELEON_SIMULATION)
+if (NOT CHAMELEON_SIMULATION)
+  add_dependencies(chameleon_parsec coreblas_include)
+  if (CHAMELEON_USE_CUDA)
     add_dependencies(chameleon_parsec cudablas_include)
+  endif()
 endif()
 
 # installation
 # ------------
 install(TARGETS chameleon_parsec
-  DESTINATION lib)
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib)
 
 ###
 ### END CMakeLists.txt

runtime/starpu/CMakeLists.txt

@@ -75,7 +75,7 @@ install(
   DESTINATION include/runtime/starpu )
 
 # Generate the Chameleon common for all possible precisions
-# -----------------------------------------------------
+# ---------------------------------------------------------
 set(RUNTIME_COMMON_GENERATED "")
 set(ZSRC
   control/runtime_zprofiling.c
@@ -106,7 +106,7 @@ endforeach()
 set_source_files_properties(control/runtime_profiling.c PROPERTIES COMPILE_FLAGS "${flags_to_add}")
 
 # Generate the Chameleon sources for all possible precisions
-# ------------------------------------------------------
+# ----------------------------------------------------------
 set(RUNTIME_SRCS_GENERATED "")
 set(ZSRC
   codelets/codelet_zcallback.c

runtime/starpu/codelets/codelet_zasum.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_dzasum(const MORSE_option_t *options,
                        MORSE_enum storev, MORSE_enum uplo, int M, int N,

runtime/starpu/codelets/codelet_zaxpy.c

@@ -24,7 +24,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zaxpy(const MORSE_option_t *options,
                       int M, MORSE_Complex64_t alpha,

runtime/starpu/codelets/codelet_zbuild.c

@@ -31,7 +31,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zbuild( const MORSE_option_t *options,
                         const MORSE_desc_t *A, int Am, int An, int lda,

runtime/starpu/codelets/codelet_zgeadd.c

@@ -28,7 +28,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  ******************************************************************************

runtime/starpu/codelets/codelet_zgelqt.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgemm.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgeqrt.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgessm.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgessq.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zgessq( const MORSE_option_t *options,
                         int m, int n,

runtime/starpu/codelets/codelet_zgetrf.c

@@ -28,7 +28,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zgetrf(const MORSE_option_t *options,
                        int m, int n, int nb,

runtime/starpu/codelets/codelet_zgetrf_incpiv.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgetrf_nopiv.c

@@ -27,7 +27,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zhe2ge.c

@@ -22,7 +22,6 @@
 
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zhemm.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zher2k.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zherfb.c

@@ -24,7 +24,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zherk.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zhessq.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zhessq( const MORSE_option_t *options,
                         MORSE_enum uplo, int n,

runtime/starpu/codelets/codelet_zlacpy.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zlag2c.c

@@ -28,7 +28,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zlange.c

@@ -28,7 +28,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlange(const MORSE_option_t *options,
                        MORSE_enum norm, int M, int N, int NB,

runtime/starpu/codelets/codelet_zlanhe.c

@@ -28,7 +28,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlanhe(const MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, int N, int NB,

runtime/starpu/codelets/codelet_zlansy.c

@@ -28,7 +28,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlansy(const MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, int N, int NB,

runtime/starpu/codelets/codelet_zlantr.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlantr(const MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,

runtime/starpu/codelets/codelet_zlascal.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zlaset.c

@@ -29,7 +29,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 
 /**

runtime/starpu/codelets/codelet_zlaset2.c

@@ -29,7 +29,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 
 /**

runtime/starpu/codelets/codelet_zlatro.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zlauum.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zplghe.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /*   MORSE_TASK_zplghe - Generate a tile for random hermitian (positive definite if bump is large enough) matrix. */
 

runtime/starpu/codelets/codelet_zplgsy.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /*   MORSE_TASK_zplgsy - Generate a tile for random symmetric (positive definite if 'bump' is large enough) matrix. */
 

runtime/starpu/codelets/codelet_zplrnt.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /*   MORSE_TASK_zplrnt - Generate a tile for random matrix. */
 

runtime/starpu/codelets/codelet_zplssq.c

@@ -27,7 +27,6 @@
 #include <math.h>
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /*****************************************************************************
  *

runtime/starpu/codelets/codelet_zpotrf.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zssssm.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zsymm.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zsyr2k.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zsyrk.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zsyssq.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zsyssq( const MORSE_option_t *options,
                         MORSE_enum uplo, int n,

runtime/starpu/codelets/codelet_zsytrf_nopiv.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options,
                              MORSE_enum uplo, int n, int nb,

runtime/starpu/codelets/codelet_ztile_zero.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /*****************************************************************************
  *

runtime/starpu/codelets/codelet_ztpmqrt.c

@@ -24,7 +24,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztpmqrt( const MORSE_option_t *options,
                          MORSE_enum side, MORSE_enum trans,

runtime/starpu/codelets/codelet_ztpqrt.c

@@ -24,7 +24,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztpqrt( const MORSE_option_t *options,
                         int M, int N, int L, int ib, int nb,

runtime/starpu/codelets/codelet_ztradd.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  ******************************************************************************

runtime/starpu/codelets/codelet_ztrasm.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztrasm(const MORSE_option_t *options,
                        MORSE_enum storev, MORSE_enum uplo, MORSE_enum diag, int M, int N,

runtime/starpu/codelets/codelet_ztrmm.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztrsm.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztrssq.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztrssq( const MORSE_option_t *options,
                         MORSE_enum uplo, MORSE_enum diag,

runtime/starpu/codelets/codelet_ztrtri.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztslqt.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 #undef REAL
 #define COMPLEX
 

runtime/starpu/codelets/codelet_ztsmlq.c

@@ -32,7 +32,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztsmlq_hetra1.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztsmqr.c

@@ -32,7 +32,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztsmqr_hetra1.c

@@ -26,7 +26,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztsqrt.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 #undef REAL
 #define COMPLEX
 

runtime/starpu/codelets/codelet_ztstrf.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zttlqt.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zttmlq.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zttmqr.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zttqrt.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zunmlq.c

@@ -31,7 +31,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zunmqr.c

@@ -30,7 +30,6 @@
  **/
 #include "chameleon_starpu.h"
 #include "runtime_codelet_z.h"
-#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/starpu/include/runtime_codelet_z.h

@@ -32,6 +32,14 @@
 #include <stdio.h>
 #include "runtime_codelets.h"
 
+#include "chameleon/morse_tasks_z.h"
+#if !defined(CHAMELEON_SIMULATION)
+#include "coreblas/coreblas_z.h"
+#if defined(CHAMELEON_USE_CUDA)
+#include "cudablas/cudablas_z.h"
+#endif
+#endif
+
 /*
  * Management functions
  */