Attempt to replace in parsec but still under progress

runtime/parsec/CMakeLists.txt

@@ -3,8 +3,8 @@
 # @copyright (c) 2009-2015 The University of Tennessee and The University
 #                          of Tennessee Research Foundation.
 #                          All rights reserved.
-# @copyright (c) 2012-2015 Inria. All rights reserved.
-# @copyright (c) 2012-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
+# @copyright (c) 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+#                          Univ. Bordeaux. All rights reserved.
 #
 ###
 #
@@ -26,9 +26,11 @@
 #  @date 13-07-2012
 #
 ###
-
 cmake_minimum_required(VERSION 2.8)
 
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include )
+include_directories( ${CMAKE_CURRENT_BINARY_DIR}/include )
+
 # Generate headers for all possible precisions
 # --------------------------------------------
 set(RUNTIME_HDRS_GENERATED "")
@@ -42,47 +44,61 @@ set(RUNTIME_HDRS_GENERATED "")
 # Define the list of headers
 # --------------------------
 set(RUNTIME_HDRS
-    include/morse_parsec.h
-    ${RUNTIME_HDRS_GENERATED}
+    include/chameleon_parsec.h
     )
 
+# Add generated headers
+# ---------------------
+foreach( hdr_file ${RUNTIME_HDRS_GENERATED} )
+  list(APPEND RUNTIME_HDRS ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
+endforeach()
+
 # Force generation of headers
 # ---------------------------
-add_custom_target(runtime_parsec_include ALL SOURCES ${RUNTIME_HDRS})
+add_custom_target(
+  runtime_parsec_include
+  ALL SOURCES ${RUNTIME_HDRS})
+
+# Installation
+# ------------
+install(
+  FILES ${RUNTIME_HDRS}
+  DESTINATION include/runtime/parsec )
 
-# Generate the morse common for all possible precisions
-# -----------------------------------------------------
+# Generate the Chameleon common for all possible precisions
+# ---------------------------------------------------------
 set(RUNTIME_COMMON_GENERATED "")
 set(ZSRC
-    control/runtime_zprofiling.c
-    control/runtime_zlocality.c
-    )
+  control/runtime_zprofiling.c
+  control/runtime_zlocality.c
+  )
 
-precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
-                    PRECISIONS "${CHAMELEON_PRECISION}"
-                    TARGETDIR "control")
+precisions_rules_py(
+  RUNTIME_COMMON_GENERATED "${ZSRC}"
+  PRECISIONS "${CHAMELEON_PRECISION}"
+  TARGETDIR "control")
 
 set(RUNTIME_COMMON
-    control/runtime_async.c
-    control/runtime_context.c
-    control/runtime_control.c
-    control/runtime_descriptor.c
-    control/runtime_options.c
-    control/runtime_profiling.c
-    codelets/codelet_dataflush.c
-    ${RUNTIME_COMMON_GENERATED}
-    )
+  control/runtime_async.c
+  control/runtime_context.c
+  control/runtime_control.c
+  control/runtime_descriptor.c
+  control/runtime_options.c
+  control/runtime_profiling.c
+  codelets/codelet_dataflush.c
+  ${RUNTIME_COMMON_GENERATED}
+  )
 
-# Generate the morse sources for all possible precisions
-# ------------------------------------------------------
+# Generate the Chameleon sources for all possible precisions
+# ----------------------------------------------------------
 set(RUNTIME_SRCS_GENERATED "")
 set(ZSRC
-    ${CODELETS_ZSRC}
-    )
+  ${CODELETS_ZSRC}
+  )
 
 precisions_rules_py(RUNTIME_SRCS_GENERATED "${ZSRC}"
-                    PRECISIONS "${CHAMELEON_PRECISION}"
-                    TARGETDIR "codelets")
+  PRECISIONS "${CHAMELEON_PRECISION}"
+  TARGETDIR "codelets")
 
 set(RUNTIME_SRCS
   ${RUNTIME_COMMON}
@@ -114,7 +130,7 @@ endif()
 # installation
 # ------------
 install(TARGETS chameleon_parsec
-        DESTINATION lib)
+  DESTINATION lib)
 
 ###
 ### END CMakeLists.txt

runtime/parsec/codelets/codelet_dataflush.c

@@ -19,8 +19,8 @@
  * @precisions normal z -> c d s
  *
  **/
-
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/chameleon_tasks.h"
 
 void MORSE_TASK_dataflush(const MORSE_option_t *options,
                           const MORSE_desc_t *A, int Am, int An)

runtime/parsec/codelets/codelet_zasum.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_dzasum_parsec(dague_execution_unit_t    *context,

runtime/parsec/codelets/codelet_zaxpy.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zaxpy_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zbuild.c

@@ -22,7 +22,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static inline int
 CORE_zbuild_parsec(dague_execution_unit_t    *context,

runtime/parsec/codelets/codelet_zgeadd.c

@@ -25,7 +25,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zgeadd_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zgelqt.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zgemm.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zgeqrt.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zgessm.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zgessq.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zgessq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zgetrf.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zgetrf_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zgetrf_incpiv.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zgetrf_nopiv.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zhe2ge.c

@@ -20,7 +20,8 @@
  *
  **/
 
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/parsec/codelets/codelet_zhemm.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zher2k.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zherfb.c

@@ -22,7 +22,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static inline int
 CORE_zherfb_parsec(dague_execution_unit_t    *context,

runtime/parsec/codelets/codelet_zherk.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zhessq.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zhessq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zlacpy.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zlag2c.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zlange.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zlange_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zlanhe.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zlanhe_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zlansy.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zlansy_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zlantr.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zlantr_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zlascal.c

@@ -29,7 +29,8 @@
  *
  **/
 
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zlaset.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/parsec/codelets/codelet_zlaset2.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *

runtime/parsec/codelets/codelet_zlatro.c

@@ -21,7 +21,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static inline int
 CORE_zlatro_parsec(dague_execution_unit_t    *context,

runtime/parsec/codelets/codelet_zlauum.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zpamm.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zplghe.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zplghe_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zplgsy.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zplgsy_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zplrnt.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zplrnt_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zplssq.c

@@ -21,7 +21,8 @@
  *
  **/
 #include <math.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /*****************************************************************************
  *

runtime/parsec/codelets/codelet_zpotrf.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *

runtime/parsec/codelets/codelet_zssssm.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zssssm_parsec(dague_execution_unit_t *context, dague_execution_context_t * this_task)

runtime/parsec/codelets/codelet_zsymm.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zsymm_parsec(dague_execution_unit_t *context, dague_execution_context_t * this_task)

runtime/parsec/codelets/codelet_zsyr2k.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zsyr2k_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zsyrk.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zsyrk_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zsyssq.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zsyssq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_zsytrf_nopiv.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zsytrf_nopiv_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_ztile_zero.c

@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztile_zero_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)

runtime/parsec/codelets/codelet_ztpmqrt.c

@@ -22,7 +22,8 @@
  * @precisions normal z -> s d c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztpmqrt_parsec(dague_execution_unit_t    *context,

runtime/parsec/codelets/codelet_ztpqrt.c

@@ -22,7 +22,8 @@
  * @precisions normal z -> s d c