From 13c9a60c75a999c67ba73aa86b84103f2569d9ec Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 31 Jul 2017 18:17:34 +0200
Subject: [PATCH] Attempt to replace in parsec but still under progress

---
 runtime/parsec/CMakeLists.txt                 | 76 +++++++++++--------
 runtime/parsec/codelets/codelet_dataflush.c   |  4 +-
 runtime/parsec/codelets/codelet_zasum.c       |  3 +-
 runtime/parsec/codelets/codelet_zaxpy.c       |  3 +-
 runtime/parsec/codelets/codelet_zbuild.c      |  3 +-
 runtime/parsec/codelets/codelet_zgeadd.c      |  3 +-
 runtime/parsec/codelets/codelet_zgelqt.c      |  3 +-
 runtime/parsec/codelets/codelet_zgemm.c       |  3 +-
 runtime/parsec/codelets/codelet_zgeqrt.c      |  3 +-
 runtime/parsec/codelets/codelet_zgessm.c      |  3 +-
 runtime/parsec/codelets/codelet_zgessq.c      |  3 +-
 runtime/parsec/codelets/codelet_zgetrf.c      |  3 +-
 .../parsec/codelets/codelet_zgetrf_incpiv.c   |  3 +-
 .../parsec/codelets/codelet_zgetrf_nopiv.c    |  3 +-
 runtime/parsec/codelets/codelet_zhe2ge.c      |  3 +-
 runtime/parsec/codelets/codelet_zhemm.c       |  3 +-
 runtime/parsec/codelets/codelet_zher2k.c      |  3 +-
 runtime/parsec/codelets/codelet_zherfb.c      |  3 +-
 runtime/parsec/codelets/codelet_zherk.c       |  3 +-
 runtime/parsec/codelets/codelet_zhessq.c      |  3 +-
 runtime/parsec/codelets/codelet_zlacpy.c      |  3 +-
 runtime/parsec/codelets/codelet_zlag2c.c      |  3 +-
 runtime/parsec/codelets/codelet_zlange.c      |  3 +-
 runtime/parsec/codelets/codelet_zlanhe.c      |  3 +-
 runtime/parsec/codelets/codelet_zlansy.c      |  3 +-
 runtime/parsec/codelets/codelet_zlantr.c      |  3 +-
 runtime/parsec/codelets/codelet_zlascal.c     |  3 +-
 runtime/parsec/codelets/codelet_zlaset.c      |  3 +-
 runtime/parsec/codelets/codelet_zlaset2.c     |  3 +-
 runtime/parsec/codelets/codelet_zlatro.c      |  3 +-
 runtime/parsec/codelets/codelet_zlauum.c      |  3 +-
 runtime/parsec/codelets/codelet_zpamm.c       |  3 +-
 runtime/parsec/codelets/codelet_zplghe.c      |  3 +-
 runtime/parsec/codelets/codelet_zplgsy.c      |  3 +-
 runtime/parsec/codelets/codelet_zplrnt.c      |  3 +-
 runtime/parsec/codelets/codelet_zplssq.c      |  3 +-
 runtime/parsec/codelets/codelet_zpotrf.c      |  3 +-
 runtime/parsec/codelets/codelet_zssssm.c      |  3 +-
 runtime/parsec/codelets/codelet_zsymm.c       |  3 +-
 runtime/parsec/codelets/codelet_zsyr2k.c      |  3 +-
 runtime/parsec/codelets/codelet_zsyrk.c       |  3 +-
 runtime/parsec/codelets/codelet_zsyssq.c      |  3 +-
 .../parsec/codelets/codelet_zsytrf_nopiv.c    |  3 +-
 runtime/parsec/codelets/codelet_ztile_zero.c  |  3 +-
 runtime/parsec/codelets/codelet_ztpmqrt.c     |  3 +-
 runtime/parsec/codelets/codelet_ztpqrt.c      |  3 +-
 runtime/parsec/codelets/codelet_ztradd.c      |  3 +-
 runtime/parsec/codelets/codelet_ztrasm.c      |  3 +-
 runtime/parsec/codelets/codelet_ztrmm.c       |  3 +-
 runtime/parsec/codelets/codelet_ztrsm.c       |  3 +-
 runtime/parsec/codelets/codelet_ztrssq.c      |  3 +-
 runtime/parsec/codelets/codelet_ztrtri.c      |  3 +-
 runtime/parsec/codelets/codelet_ztslqt.c      |  3 +-
 runtime/parsec/codelets/codelet_ztsmlq.c      |  3 +-
 .../parsec/codelets/codelet_ztsmlq_hetra1.c   |  3 +-
 runtime/parsec/codelets/codelet_ztsmqr.c      |  3 +-
 .../parsec/codelets/codelet_ztsmqr_hetra1.c   |  3 +-
 runtime/parsec/codelets/codelet_ztsqrt.c      |  3 +-
 runtime/parsec/codelets/codelet_ztstrf.c      |  3 +-
 runtime/parsec/codelets/codelet_zttlqt.c      |  3 +-
 runtime/parsec/codelets/codelet_zttmlq.c      |  3 +-
 runtime/parsec/codelets/codelet_zttmqr.c      |  3 +-
 runtime/parsec/codelets/codelet_zttqrt.c      |  3 +-
 runtime/parsec/codelets/codelet_zunmlq.c      |  3 +-
 runtime/parsec/codelets/codelet_zunmqr.c      |  3 +-
 runtime/parsec/control/runtime_async.c        |  2 +-
 runtime/parsec/control/runtime_context.c      |  2 +-
 runtime/parsec/control/runtime_control.c      |  2 +-
 runtime/parsec/control/runtime_descriptor.c   |  2 +-
 runtime/parsec/control/runtime_options.c      |  2 +-
 runtime/parsec/control/runtime_profiling.c    |  2 +-
 runtime/parsec/control/runtime_zlocality.c    |  2 +-
 runtime/parsec/control/runtime_zprofiling.c   |  2 +-
 .../{morse_parsec.h => chameleon_parsec.h}    |  8 +-
 74 files changed, 186 insertions(+), 107 deletions(-)
 rename runtime/parsec/include/{morse_parsec.h => chameleon_parsec.h} (78%)

diff --git a/runtime/parsec/CMakeLists.txt b/runtime/parsec/CMakeLists.txt
index 41ee03942..f6ea641c8 100644
--- a/runtime/parsec/CMakeLists.txt
+++ b/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
diff --git a/runtime/parsec/codelets/codelet_dataflush.c b/runtime/parsec/codelets/codelet_dataflush.c
index 0a01e0cd9..606f8dc7d 100644
--- a/runtime/parsec/codelets/codelet_dataflush.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zasum.c b/runtime/parsec/codelets/codelet_zasum.c
index 401bede89..652824d6a 100644
--- a/runtime/parsec/codelets/codelet_zasum.c
+++ b/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,
diff --git a/runtime/parsec/codelets/codelet_zaxpy.c b/runtime/parsec/codelets/codelet_zaxpy.c
index ef3e8983f..be1c2a24e 100644
--- a/runtime/parsec/codelets/codelet_zaxpy.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zbuild.c b/runtime/parsec/codelets/codelet_zbuild.c
index 0adbbe29c..9b6c3f8dc 100644
--- a/runtime/parsec/codelets/codelet_zbuild.c
+++ b/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,
diff --git a/runtime/parsec/codelets/codelet_zgeadd.c b/runtime/parsec/codelets/codelet_zgeadd.c
index 3f3fcbad8..4fdfe8ac1 100644
--- a/runtime/parsec/codelets/codelet_zgeadd.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zgelqt.c b/runtime/parsec/codelets/codelet_zgelqt.c
index eebd02cc0..cc98f0c6f 100644
--- a/runtime/parsec/codelets/codelet_zgelqt.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zgemm.c b/runtime/parsec/codelets/codelet_zgemm.c
index 5d100cf5d..983a5090a 100644
--- a/runtime/parsec/codelets/codelet_zgemm.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zgeqrt.c b/runtime/parsec/codelets/codelet_zgeqrt.c
index f9d9b5588..a0832e214 100644
--- a/runtime/parsec/codelets/codelet_zgeqrt.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zgessm.c b/runtime/parsec/codelets/codelet_zgessm.c
index d06acae87..28a588f23 100644
--- a/runtime/parsec/codelets/codelet_zgessm.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zgessq.c b/runtime/parsec/codelets/codelet_zgessq.c
index 7f5784c0f..52555cda1 100644
--- a/runtime/parsec/codelets/codelet_zgessq.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zgetrf.c b/runtime/parsec/codelets/codelet_zgetrf.c
index c5a5d2028..c774b4512 100644
--- a/runtime/parsec/codelets/codelet_zgetrf.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
index 775fbc0ab..d6575ea16 100644
--- a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c
index 3b6b7ddc7..3e8640fa7 100644
--- a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zhe2ge.c b/runtime/parsec/codelets/codelet_zhe2ge.c
index 8e16a10e4..b9300a1e9 100644
--- a/runtime/parsec/codelets/codelet_zhe2ge.c
+++ b/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"
 
 /**
  *
diff --git a/runtime/parsec/codelets/codelet_zhemm.c b/runtime/parsec/codelets/codelet_zhemm.c
index 628849093..b6426c1d5 100644
--- a/runtime/parsec/codelets/codelet_zhemm.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zher2k.c b/runtime/parsec/codelets/codelet_zher2k.c
index ffef4285d..e854efd0d 100644
--- a/runtime/parsec/codelets/codelet_zher2k.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zherfb.c b/runtime/parsec/codelets/codelet_zherfb.c
index 4071608ad..fc1221af9 100644
--- a/runtime/parsec/codelets/codelet_zherfb.c
+++ b/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,
diff --git a/runtime/parsec/codelets/codelet_zherk.c b/runtime/parsec/codelets/codelet_zherk.c
index e97808c90..ab3058548 100644
--- a/runtime/parsec/codelets/codelet_zherk.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zhessq.c b/runtime/parsec/codelets/codelet_zhessq.c
index 6e39d8099..e0c7122ec 100644
--- a/runtime/parsec/codelets/codelet_zhessq.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zlacpy.c b/runtime/parsec/codelets/codelet_zlacpy.c
index 7f287535b..30bceac04 100644
--- a/runtime/parsec/codelets/codelet_zlacpy.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zlag2c.c b/runtime/parsec/codelets/codelet_zlag2c.c
index 7b5c30af3..70503d8c3 100644
--- a/runtime/parsec/codelets/codelet_zlag2c.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zlange.c b/runtime/parsec/codelets/codelet_zlange.c
index 5d1bd5dd0..3db3544c8 100644
--- a/runtime/parsec/codelets/codelet_zlange.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zlanhe.c b/runtime/parsec/codelets/codelet_zlanhe.c
index fc50a9938..d89ca25e3 100644
--- a/runtime/parsec/codelets/codelet_zlanhe.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zlansy.c b/runtime/parsec/codelets/codelet_zlansy.c
index 62cf55851..f177a499a 100644
--- a/runtime/parsec/codelets/codelet_zlansy.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zlantr.c b/runtime/parsec/codelets/codelet_zlantr.c
index ed0cb3216..74c28ee21 100644
--- a/runtime/parsec/codelets/codelet_zlantr.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zlascal.c b/runtime/parsec/codelets/codelet_zlascal.c
index eb373c70d..c3596615a 100644
--- a/runtime/parsec/codelets/codelet_zlascal.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zlaset.c b/runtime/parsec/codelets/codelet_zlaset.c
index 8f81ee9a3..51207d2f9 100644
--- a/runtime/parsec/codelets/codelet_zlaset.c
+++ b/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"
 
 /**
  *
diff --git a/runtime/parsec/codelets/codelet_zlaset2.c b/runtime/parsec/codelets/codelet_zlaset2.c
index 00986ce77..8dc8313ae 100644
--- a/runtime/parsec/codelets/codelet_zlaset2.c
+++ b/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"
 
 /**
  *
diff --git a/runtime/parsec/codelets/codelet_zlatro.c b/runtime/parsec/codelets/codelet_zlatro.c
index 290b8be17..28de87c15 100644
--- a/runtime/parsec/codelets/codelet_zlatro.c
+++ b/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,
diff --git a/runtime/parsec/codelets/codelet_zlauum.c b/runtime/parsec/codelets/codelet_zlauum.c
index d11bd483f..d8f769420 100644
--- a/runtime/parsec/codelets/codelet_zlauum.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zpamm.c b/runtime/parsec/codelets/codelet_zpamm.c
index f8f86af48..32bdd2275 100644
--- a/runtime/parsec/codelets/codelet_zpamm.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zplghe.c b/runtime/parsec/codelets/codelet_zplghe.c
index 00bc531a3..f483d28a2 100644
--- a/runtime/parsec/codelets/codelet_zplghe.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zplgsy.c b/runtime/parsec/codelets/codelet_zplgsy.c
index fa4d61fc6..39007484b 100644
--- a/runtime/parsec/codelets/codelet_zplgsy.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zplrnt.c b/runtime/parsec/codelets/codelet_zplrnt.c
index 52cf2efb8..a2ad71294 100644
--- a/runtime/parsec/codelets/codelet_zplrnt.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zplssq.c b/runtime/parsec/codelets/codelet_zplssq.c
index 935bb1528..d524bdf2d 100644
--- a/runtime/parsec/codelets/codelet_zplssq.c
+++ b/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"
 
 /*****************************************************************************
  *
diff --git a/runtime/parsec/codelets/codelet_zpotrf.c b/runtime/parsec/codelets/codelet_zpotrf.c
index bd3f02642..7189b1cf3 100644
--- a/runtime/parsec/codelets/codelet_zpotrf.c
+++ b/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"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zssssm.c b/runtime/parsec/codelets/codelet_zssssm.c
index 0e44386e2..05373998b 100644
--- a/runtime/parsec/codelets/codelet_zssssm.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zsymm.c b/runtime/parsec/codelets/codelet_zsymm.c
index 63eeb6625..24ee2e226 100644
--- a/runtime/parsec/codelets/codelet_zsymm.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zsyr2k.c b/runtime/parsec/codelets/codelet_zsyr2k.c
index 72fdbb1fc..04f4a02e8 100644
--- a/runtime/parsec/codelets/codelet_zsyr2k.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zsyrk.c b/runtime/parsec/codelets/codelet_zsyrk.c
index 510e096f8..ccec96554 100644
--- a/runtime/parsec/codelets/codelet_zsyrk.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zsyssq.c b/runtime/parsec/codelets/codelet_zsyssq.c
index 5db5be616..6a4964562 100644
--- a/runtime/parsec/codelets/codelet_zsyssq.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c
index 1c70a7c1f..589852cf8 100644
--- a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_ztile_zero.c b/runtime/parsec/codelets/codelet_ztile_zero.c
index 366777c23..8534663bf 100644
--- a/runtime/parsec/codelets/codelet_ztile_zero.c
+++ b/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)
diff --git a/runtime/parsec/codelets/codelet_ztpmqrt.c b/runtime/parsec/codelets/codelet_ztpmqrt.c
index 612e9d54a..e5e1c64f4 100644
--- a/runtime/parsec/codelets/codelet_ztpmqrt.c
+++ b/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,
diff --git a/runtime/parsec/codelets/codelet_ztpqrt.c b/runtime/parsec/codelets/codelet_ztpqrt.c
index 6b8a3fe2d..f88c74a2d 100644
--- a/runtime/parsec/codelets/codelet_ztpqrt.c
+++ b/runtime/parsec/codelets/codelet_ztpqrt.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_ztpqrt_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_ztradd.c b/runtime/parsec/codelets/codelet_ztradd.c
index 6cc12eaa1..7ff9a1412 100644
--- a/runtime/parsec/codelets/codelet_ztradd.c
+++ b/runtime/parsec/codelets/codelet_ztradd.c
@@ -24,7 +24,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_ztradd_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztrasm.c b/runtime/parsec/codelets/codelet_ztrasm.c
index 91646d1df..0ab0002b2 100644
--- a/runtime/parsec/codelets/codelet_ztrasm.c
+++ b/runtime/parsec/codelets/codelet_ztrasm.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_ztrasm_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztrmm.c b/runtime/parsec/codelets/codelet_ztrmm.c
index 8b67404ab..0ba484ca0 100644
--- a/runtime/parsec/codelets/codelet_ztrmm.c
+++ b/runtime/parsec/codelets/codelet_ztrmm.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_ztrmm_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztrsm.c b/runtime/parsec/codelets/codelet_ztrsm.c
index aadddb98c..d04856576 100644
--- a/runtime/parsec/codelets/codelet_ztrsm.c
+++ b/runtime/parsec/codelets/codelet_ztrsm.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_ztrsm_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztrssq.c b/runtime/parsec/codelets/codelet_ztrssq.c
index 0dd120420..85bbe1d90 100644
--- a/runtime/parsec/codelets/codelet_ztrssq.c
+++ b/runtime/parsec/codelets/codelet_ztrssq.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_ztrssq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztrtri.c b/runtime/parsec/codelets/codelet_ztrtri.c
index d296e2105..9b8695510 100644
--- a/runtime/parsec/codelets/codelet_ztrtri.c
+++ b/runtime/parsec/codelets/codelet_ztrtri.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_ztrtri_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztslqt.c b/runtime/parsec/codelets/codelet_ztslqt.c
index bebbb862f..cb5146acd 100644
--- a/runtime/parsec/codelets/codelet_ztslqt.c
+++ b/runtime/parsec/codelets/codelet_ztslqt.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_ztslqt_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztsmlq.c b/runtime/parsec/codelets/codelet_ztsmlq.c
index eaae120c5..c569fbd96 100644
--- a/runtime/parsec/codelets/codelet_ztsmlq.c
+++ b/runtime/parsec/codelets/codelet_ztsmlq.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_ztsmlq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c
index 5ec643a18..691722e3b 100644
--- a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.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 inline int
 CORE_ztsmlq_hetra1_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_ztsmqr.c b/runtime/parsec/codelets/codelet_ztsmqr.c
index 7369c2002..5b7223efd 100644
--- a/runtime/parsec/codelets/codelet_ztsmqr.c
+++ b/runtime/parsec/codelets/codelet_ztsmqr.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_ztsmqr_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c
index 72045d8f1..b1a5af94d 100644
--- a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c
+++ b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.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 inline int
 CORE_ztsmqr_hetra1_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_ztsqrt.c b/runtime/parsec/codelets/codelet_ztsqrt.c
index 22a01de1f..39a8f8e9a 100644
--- a/runtime/parsec/codelets/codelet_ztsqrt.c
+++ b/runtime/parsec/codelets/codelet_ztsqrt.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_ztsqrt_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztstrf.c b/runtime/parsec/codelets/codelet_ztstrf.c
index fccfd0397..b6d412ef5 100644
--- a/runtime/parsec/codelets/codelet_ztstrf.c
+++ b/runtime/parsec/codelets/codelet_ztstrf.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_ztstrf_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zttlqt.c b/runtime/parsec/codelets/codelet_zttlqt.c
index cbd733ded..2f49bb9ce 100644
--- a/runtime/parsec/codelets/codelet_zttlqt.c
+++ b/runtime/parsec/codelets/codelet_zttlqt.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_zttlqt_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zttmlq.c b/runtime/parsec/codelets/codelet_zttmlq.c
index a12ed573b..d74d593a0 100644
--- a/runtime/parsec/codelets/codelet_zttmlq.c
+++ b/runtime/parsec/codelets/codelet_zttmlq.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_zttmlq_parsec(dague_execution_unit_t *context, dague_execution_context_t * this_task)
diff --git a/runtime/parsec/codelets/codelet_zttmqr.c b/runtime/parsec/codelets/codelet_zttmqr.c
index 9d66160ef..b38c27bc2 100644
--- a/runtime/parsec/codelets/codelet_zttmqr.c
+++ b/runtime/parsec/codelets/codelet_zttmqr.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_zttmqr_parsec(dague_execution_unit_t *context, dague_execution_context_t * this_task)
diff --git a/runtime/parsec/codelets/codelet_zttqrt.c b/runtime/parsec/codelets/codelet_zttqrt.c
index c6a706982..2ebd820ef 100644
--- a/runtime/parsec/codelets/codelet_zttqrt.c
+++ b/runtime/parsec/codelets/codelet_zttqrt.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_zttqrt_parsec(dague_execution_unit_t *context, dague_execution_context_t * this_task)
diff --git a/runtime/parsec/codelets/codelet_zunmlq.c b/runtime/parsec/codelets/codelet_zunmlq.c
index 8a9142db8..145e63267 100644
--- a/runtime/parsec/codelets/codelet_zunmlq.c
+++ b/runtime/parsec/codelets/codelet_zunmlq.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_zunmlq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zunmqr.c b/runtime/parsec/codelets/codelet_zunmqr.c
index c07e46c11..a1394dcc1 100644
--- a/runtime/parsec/codelets/codelet_zunmqr.c
+++ b/runtime/parsec/codelets/codelet_zunmqr.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_zunmqr_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/control/runtime_async.c b/runtime/parsec/control/runtime_async.c
index d101ba7c1..8941100d1 100644
--- a/runtime/parsec/control/runtime_async.c
+++ b/runtime/parsec/control/runtime_async.c
@@ -8,7 +8,7 @@
  *
  **/
 #include <stdlib.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 /*******************************************************************************
  *  Create a sequence
diff --git a/runtime/parsec/control/runtime_context.c b/runtime/parsec/control/runtime_context.c
index aba1e227d..dee863d4f 100644
--- a/runtime/parsec/control/runtime_context.c
+++ b/runtime/parsec/control/runtime_context.c
@@ -8,7 +8,7 @@
  *
  **/
 #include <stdlib.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 /*******************************************************************************
  *  Create new context
diff --git a/runtime/parsec/control/runtime_control.c b/runtime/parsec/control/runtime_control.c
index 9e6c2a3b1..14527d285 100644
--- a/runtime/parsec/control/runtime_control.c
+++ b/runtime/parsec/control/runtime_control.c
@@ -9,7 +9,7 @@
  **/
 #include <stdio.h>
 #include <stdlib.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 /*******************************************************************************
  * Thread rank.
diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c
index f0790d0d6..10f107ef0 100644
--- a/runtime/parsec/control/runtime_descriptor.c
+++ b/runtime/parsec/control/runtime_descriptor.c
@@ -8,7 +8,7 @@
  *
  **/
 #include <stdlib.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 #include <dague/data.h>
 
 void RUNTIME_user_tag_size(int user_tag_width, int user_tag_sep) {
diff --git a/runtime/parsec/control/runtime_options.c b/runtime/parsec/control/runtime_options.c
index b993dcea4..b9fd469a8 100644
--- a/runtime/parsec/control/runtime_options.c
+++ b/runtime/parsec/control/runtime_options.c
@@ -9,7 +9,7 @@
  **/
 #include <stdio.h>
 #include <stdlib.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 void RUNTIME_options_init( MORSE_option_t *options, MORSE_context_t *morse,
                            MORSE_sequence_t *sequence, MORSE_request_t *request )
diff --git a/runtime/parsec/control/runtime_profiling.c b/runtime/parsec/control/runtime_profiling.c
index 1062462ce..765621f2b 100644
--- a/runtime/parsec/control/runtime_profiling.c
+++ b/runtime/parsec/control/runtime_profiling.c
@@ -7,7 +7,7 @@
  * @copyright (c) 2012-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 #if defined( _WIN32 ) || defined( _WIN64 )
 #include <windows.h>
diff --git a/runtime/parsec/control/runtime_zlocality.c b/runtime/parsec/control/runtime_zlocality.c
index b10568860..8dc21a473 100644
--- a/runtime/parsec/control/runtime_zlocality.c
+++ b/runtime/parsec/control/runtime_zlocality.c
@@ -7,7 +7,7 @@
  * @copyright (c) 2012-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
  *
  **/
-#include "runtime/PaRSEC/include/morse_parsec.h"
+#include "runtime/PaRSEC/include/chameleon_parsec.h"
 
 void RUNTIME_zlocality_allrestrict( uint32_t where )
 {
diff --git a/runtime/parsec/control/runtime_zprofiling.c b/runtime/parsec/control/runtime_zprofiling.c
index b9f052f06..1bcf7d0df 100644
--- a/runtime/parsec/control/runtime_zprofiling.c
+++ b/runtime/parsec/control/runtime_zprofiling.c
@@ -7,7 +7,7 @@
  * @copyright (c) 2012-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 void RUNTIME_zdisplay_allprofile()
 {
diff --git a/runtime/parsec/include/morse_parsec.h b/runtime/parsec/include/chameleon_parsec.h
similarity index 78%
rename from runtime/parsec/include/morse_parsec.h
rename to runtime/parsec/include/chameleon_parsec.h
index bdaaece06..0967a7287 100644
--- a/runtime/parsec/include/morse_parsec.h
+++ b/runtime/parsec/include/chameleon_parsec.h
@@ -3,16 +3,16 @@
  * @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.
  *
  **/
 
 #ifndef _MORSE_PARSEC_H_
 #define _MORSE_PARSEC_H_
 
-#include <dague.h>
-#include <dague/insert_function.h>
+#include <parsec.h>
+#include <parsec/insert_function.h>
 
 #include "control/common.h"
 
-- 
GitLab