Commit 13c9a60c authored by Mathieu Faverge's avatar Mathieu Faverge

Attempt to replace in parsec but still under progress

parent e9ec1a9d
......@@ -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
......
......@@ -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)
......
......@@ -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,
......
......@@ -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)
......
......@@ -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,
......
......@@ -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)
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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)
......
......@@ -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)
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -20,7 +20,8 @@
*
**/
#include "runtime/parsec/include/morse_parsec.h"
#include "chameleon_parsec.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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,
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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)
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -29,7 +29,8 @@
*
**/
#include "runtime/parsec/include/morse_parsec.h"
#include "chameleon_parsec.h"
#include "chameleon/morse_tasks_z.h"
/***************************************************************************//**
*
......
......@@ -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"
/**
*
......
......@@ -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"
/**
*
......
......@@ -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,
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -21,7 +21,8 @@
*
**/
#include <math.h>
#include "runtime/parsec/include/morse_parsec.h"
#include "chameleon_parsec.h"
#include "chameleon/morse_tasks_z.h"
/*****************************************************************************
*
......
......@@ -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"
/***************************************************************************//**
*
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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,
......
......@@ -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,
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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,
......
......@@ -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