Update headers

control/common.h

@@ -81,8 +81,6 @@
 #define MORSE_GRPSIZE     morse->group_size
 #define MORSE_NB          morse->nb
 #define MORSE_IB          morse->ib
-#define MORSE_NBNBSIZE    morse->nbnbsize
-#define MORSE_IBNBSIZE    morse->ibnbsize
 #define MORSE_SCHEDULING  morse->scheduling
 #define MORSE_RHBLK       morse->rhblock
 #define MORSE_TRANSLATION morse->translation

include/chameleon/chameleon_constants.h

@@ -47,7 +47,7 @@
 /**
  * @brief Transpostion
  */
-typedef enum cham_trans_e {
+typedef enum chameleon_trans_e {
     ChamNoTrans   = 111, /**< Use A         */
     ChamTrans     = 112, /**< Use A^t       */
     ChamConjTrans = 113  /**< Use conj(A^t) */
@@ -56,7 +56,7 @@ typedef enum cham_trans_e {
 /**
  * @brief Upper/Lower part
  */
-typedef enum cham_uplo_e {
+typedef enum chameleon_uplo_e {
     ChamUpper      = 121, /**< Use lower triangle of A */
     ChamLower      = 122, /**< Use upper triangle of A */
     ChamUpperLower = 123  /**< Use the full A          */
@@ -66,7 +66,7 @@ typedef enum cham_uplo_e {
 /**
  * @brief Diagonal
  */
-typedef enum cham_diag_e {
+typedef enum chameleon_diag_e {
     ChamNonUnit = 131, /**< Diagonal is non unitary */
     ChamUnit    = 132  /**< Diagonal is unitary     */
 } cham_diag_t;
@@ -74,7 +74,7 @@ typedef enum cham_diag_e {
 /**
  * @brief Side of the operation
  */
-typedef enum cham_side_e {
+typedef enum chameleon_side_e {
     ChamLeft  = 141, /**< Apply operator on the left  */
     ChamRight = 142  /**< Apply operator on the right */
 } cham_side_t;
@@ -82,7 +82,7 @@ typedef enum cham_side_e {
 /**
  * @brief Norms
  */
-typedef enum cham_normtype_e {
+typedef enum chameleon_normtype_e {
     ChamOneNorm       = 171, /**< One norm:       max_j( sum_i( |a_{ij}| ) )   */
     ChamRealOneNorm   = 172,
     ChamTwoNorm       = 173,
@@ -93,7 +93,6 @@ typedef enum cham_normtype_e {
     ChamRealMaxNorm   = 178
 } cham_normtype_t;
 
-
 #define ChameleonDistUniform     201
 #define ChameleonDistSymmetric   202
 #define ChameleonDistNormal      203
@@ -112,15 +111,32 @@ typedef enum cham_normtype_e {
 #define ChameleonPackUpeprBand   297
 #define ChameleonPackAll         298
 
-#define ChameleonNoVec           301
-#define ChameleonVec             302
-#define ChameleonIvec            303
+/**
+ * @brief Singular/Eigen vector job description
+ */
+typedef enum chameleon_job_e {
+    ChamNoVec = 301,
+    ChamVec   = 302,
+    ChamIvec  = 303,
+} cham_job_t;
+
+/**
+ * @brief Algorithm Direction
+ */
+typedef enum chameleon_dir_e {
+    ChamDirForward  = 391, /**< Forward direction   */
+    ChamDirBackward = 392, /**< Backward direction  */
+} cham_dir_t;
+
+/**
+ * @brief Direction of the main vectors as for the householder reflectors in QR/LQ factorizations.
+ */
+typedef enum chameleon_store_e {
+    ChamColumnwise  = 401, /**< Column wise storage  */
+    ChamRowwise     = 402, /**< Row wise storage     */
+} cham_store_t;
 
-#define ChameleonForward         391
-#define ChameleonBackward        392
 
-#define ChameleonColumnwise      401
-#define ChameleonRowwise         402
 #define ChameleonTrd            1001
 #define ChameleonBrd            1002
 

include/chameleon/chameleon_simulate.h

@@ -19,7 +19,7 @@
 #ifndef _chameleon_simulate_h_
 #define _chameleon_simulate_h_
 
-#include "chameleon/chameleon_config.h"
+#include "chameleon/config.h"
 
 /* we need this when starpu is compiled with simgrid enabled */
 #if defined(CHAMELEON_SCHED_STARPU) && defined(CHAMELEON_SIMULATION)

include/chameleon/chameleon_struct.h

@@ -18,11 +18,11 @@
  * @date 2011-06-01
  *
  */
-#ifndef _CHAMELEON_STRUCT_H_
-#define _CHAMELEON_STRUCT_H_
+#ifndef _chameleon_struct_h_
+#define _chameleon_struct_h_
 
-#include "chameleon/chameleon_config.h"
-#include "chameleon/chameleon_types.h"
+#include "chameleon/config.h"
+#include "chameleon/types.h"
 
 BEGIN_C_DECLS
 
@@ -44,22 +44,22 @@ BEGIN_C_DECLS
  *      +----------+---+
  *
  */
-struct matrix_desc_s;
-typedef struct matrix_desc_s MATRIX_desc_t;
+struct chameleon_desc_s;
+typedef struct chameleon_desc_s CHAM_desc_t;
 
-struct matrix_desc_s {
-    // function to get matrix tiles address
-    void *(*get_blkaddr)( const MATRIX_desc_t*, int, int );
-    // function to get matrix tiles leading dimension
-    int   (*get_blkldd )( const MATRIX_desc_t*, int );
-    // function to get matrix tiles MPI rank
-    int   (*get_rankof) ( const MATRIX_desc_t*, int, int );
+struct chameleon_desc_s {
+    // function to get chameleon tiles address
+    void *(*get_blkaddr)( const CHAM_desc_t*, int, int );
+    // function to get chameleon tiles leading dimension
+    int   (*get_blkldd )( const CHAM_desc_t*, int );
+    // function to get chameleon tiles MPI rank
+    int   (*get_rankof) ( const CHAM_desc_t*, int, int );
     void *mat;        // pointer to the beginning of the matrix
     size_t A21;       // pointer to the beginning of the matrix A21
     size_t A12;       // pointer to the beginning of the matrix A12
     size_t A22;       // pointer to the beginning of the matrix A22
-    CHAMELEON_enum styp;  // storage layout of the matrix
-    CHAMELEON_enum dtyp;  // precision of the matrix
+    cham_storage_t styp;  // storage layout of the matrix
+    cham_flttype_t dtyp;  // precision of the matrix
     int mb;           // number of rows in a tile
     int nb;           // number of columns in a tile
     int bsiz;         // size in elements including padding
@@ -111,19 +111,17 @@ typedef struct chameleon_context_s {
     int                group_size;
 
     /* Boolean flags */
-    CHAMELEON_bool         warnings_enabled;
-    CHAMELEON_bool         autotuning_enabled;
-    CHAMELEON_bool         parallel_enabled;
-    CHAMELEON_bool         profiling_enabled;
-    CHAMELEON_bool         progress_enabled;
+    cham_bool_t        warnings_enabled;
+    cham_bool_t        autotuning_enabled;
+    cham_bool_t        parallel_enabled;
+    cham_bool_t        profiling_enabled;
+    cham_bool_t        progress_enabled;
 
-    CHAMELEON_enum         householder;        // "domino" (flat) or tree-based (reduction) Householder
-    CHAMELEON_enum         translation;        // In place or Out of place layout conversion
+    cham_householder_t householder;        // "domino" (flat) or tree-based (reduction) Householder
+    cham_translation_t translation;        // In place or Out of place layout conversion
 
     int                nb;
     int                ib;
-    int                nbnbsize;           // tile size in elements (possibly padded)
-    int                ibnbsize;           // T or L tile size in elements (---''---)
     int                rhblock;            // block size for tree-based (reduction) Householder
     void              *schedopt;           // structure for runtimes
     int                mpi_outer_init;     // MPI has been initialized outside our functions

include/chameleon/chameleon_tasks.h

@@ -20,7 +20,7 @@
 #ifndef _chameleon_tasks_h_
 #define _chameleon_tasks_h_
 
-#include "chameleon/chameleon_config.h"
+#include "chameleon/config.h"
 
 BEGIN_C_DECLS
 
@@ -84,14 +84,14 @@ typedef enum chameleon_tasktype_e {
   TASK_TILE_ZERO,
 
   TASK_NBKERNELS
-} chameleon_tasktype_t;
+} cham_tasktype_t;
 
-#include "chameleon/chameleon_tasks_z.h"
-#include "chameleon/chameleon_tasks_d.h"
-#include "chameleon/chameleon_tasks_c.h"
-#include "chameleon/chameleon_tasks_s.h"
-#include "chameleon/chameleon_tasks_zc.h"
-#include "chameleon/chameleon_tasks_ds.h"
+#include "chameleon/tasks_z.h"
+#include "chameleon/tasks_d.h"
+#include "chameleon/tasks_c.h"
+#include "chameleon/tasks_s.h"
+#include "chameleon/tasks_zc.h"
+#include "chameleon/tasks_ds.h"
 
 END_C_DECLS
 

include/chameleon/chameleon_tasks_zc.h

@@ -31,11 +31,11 @@
  */
 void INSERT_TASK_clag2z( const RUNTIME_option_t *options,
                         int m, int n, int nb,
-                        MORSE_desc_t *A, int Am, int An, int lda,
-                        MORSE_desc_t *B, int Bm, int Bn, int ldb );
+                        CHAM_desc_t *A, int Am, int An, int lda,
+                        CHAM_desc_t *B, int Bm, int Bn, int ldb );
 void INSERT_TASK_zlag2c( const RUNTIME_option_t *options,
                         int m, int n, int nb,
-                        MORSE_desc_t *A, int Am, int An, int lda,
-                        MORSE_desc_t *B, int Bm, int Bn, int ldb );
+                        CHAM_desc_t *A, int Am, int An, int lda,
+                        CHAM_desc_t *B, int Bm, int Bn, int ldb );
 
 #endif

include/chameleon/chameleon_types.h

@@ -40,10 +40,7 @@
 /**
  *  CHAMELEON types
  */
-typedef int  CHAMELEON_enum;
-typedef int  CHAMELEON_bool;
-typedef long CHAMELEON_index;
-typedef long CHAMELEON_size;
+typedef int8_t cham_bool_t;
 
 
 /**

include/chameleon/chameleon_zc.h

@@ -21,8 +21,8 @@
  * @precisions mixed zc -> ds
  *
  */
-#ifndef _CHAMELEON_ZC_H_
-#define _CHAMELEON_ZC_H_
+#ifndef _chameleon_zc_h_
+#define _chameleon_zc_h_
 
 BEGIN_C_DECLS