Restructure headers in coreblas directory

coreblas/compute/core_zttmqr.c

@@ -27,7 +27,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *

coreblas/compute/core_zttqrt.c

@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 #undef REAL
 #define COMPLEX
 

coreblas/compute/core_zunmlq.c

@@ -29,8 +29,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *

coreblas/compute/core_zunmqr.c

@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *

coreblas/include/CMakeLists.txt

@@ -30,36 +30,41 @@
 # ---------------------
 set(COREBLAS_HDRS_GENERATED "")
 set(ZHDR
-    coreblas_z.h
-    coreblas_zc.h
+  coreblas/coreblas_z.h
+  coreblas/coreblas_zc.h
 )
-precisions_rules_py(COREBLAS_HDRS_GENERATED "${ZHDR}"
-                    PRECISIONS "s;d;c;z;zc;ds" )
+precisions_rules_py(
+  COREBLAS_HDRS_GENERATED "${ZHDR}"
+  TARGETDIR  coreblas
+  PRECISIONS "s;d;c;z;zc;ds" )
 
 # Define the list of headers
 # --------------------------
 set(COREBLAS_HDRS
-    cblas.h
     coreblas.h
-    lapacke.h
-    lapacke_config.h
-    lapacke_mangling.h
-    ${COREBLAS_HDRS_GENERATED}
+    coreblas/cblas.h
+    coreblas/lapacke.h
+    coreblas/lapacke_config.h
+    coreblas/lapacke_mangling.h
     )
 
+# Add generated headers
+# ---------------------
+foreach( hdr_file ${COREBLAS_HDRS_GENERATED} )
+  list(APPEND COREBLAS_HDRS ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
+endforeach()
+
 # Force generation of headers
 # ---------------------------
 add_custom_target(coreblas_include ALL SOURCES ${COREBLAS_HDRS})
 
-set(HDR_INSTALL "cblas.h;coreblas.h;lapacke.h;lapacke_config.h;lapacke_mangling.h")
-foreach( hdr_file ${COREBLAS_HDRS_GENERATED} )
-    list(APPEND HDR_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
-endforeach()
-
-# installation
+# Installation
 # ------------
-install(FILES ${HDR_INSTALL}
-        DESTINATION include/chameleon/coreblas/include)
+install( FILES coreblas.h
+         DESTINATION include )
+
+install( FILES ${COREBLAS_HDRS}
+         DESTINATION include/coreblas )
 
 ###
 ### END CMakeLists.txt

coreblas/include/coreblas.h

@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
+#include <assert.h>
 
 /** ****************************************************************************
  *  CBLAS requires for scalar arguments to be passed
@@ -37,11 +38,12 @@
 #ifndef CBLAS_SADDR
 #define CBLAS_SADDR( _val_ ) &(_val_)
 #endif
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
 
 /** ****************************************************************************
  * MORSE types and constants
  **/
+#include "chameleon/chameleon_config.h"
 #include "chameleon/morse_types.h"
 #include "chameleon/morse_struct.h"
 #include "chameleon/morse_constants.h"
@@ -49,17 +51,16 @@
 /** ****************************************************************************
  * CORE BLAS headers
  **/
-#include "coreblas/include/coreblas_z.h"
-#include "coreblas/include/coreblas_d.h"
-#include "coreblas/include/coreblas_c.h"
-#include "coreblas/include/coreblas_s.h"
-#include "coreblas/include/coreblas_zc.h"
-#include "coreblas/include/coreblas_ds.h"
-#include <assert.h>
+BEGIN_C_DECLS
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "coreblas/coreblas_z.h"
+#include "coreblas/coreblas_d.h"
+#include "coreblas/coreblas_c.h"
+#include "coreblas/coreblas_s.h"
+#include "coreblas/coreblas_zc.h"
+#include "coreblas/coreblas_ds.h"
+
+END_C_DECLS
 
 /** ****************************************************************************
  * Coreblas Error
@@ -80,14 +81,14 @@ extern "C" {
 /** ****************************************************************************
  *  LAPACK Constants
  **/
+BEGIN_C_DECLS
+
 extern char *morse_lapack_constants[];
 #define morse_lapack_const(morse_const) morse_lapack_constants[morse_const][0]
 
-void set_coreblas_gemm3m_enabled(int v) ;
-int get_coreblas_gemm3m_enabled(void) ;
+void set_coreblas_gemm3m_enabled( int v );
+int  get_coreblas_gemm3m_enabled( void );
 
-#ifdef __cplusplus
-}
-#endif
+END_C_DECLS
 
 #endif

coreblas/include/coreblas_z.h → coreblas/include/coreblas/coreblas_z.h

@@ -34,10 +34,6 @@
 
 #define COMPLEX
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** ****************************************************************************
  *  Declarations of serial kernels - alphabetical order
  **/
@@ -403,13 +399,6 @@ int  CORE_zunmqr(MORSE_enum side, MORSE_enum trans,
                  MORSE_Complex64_t *C, int LDC,
                  MORSE_Complex64_t *WORK, int LDWORK);
 
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
 #undef COMPLEX
 
 #endif

coreblas/include/coreblas_zc.h → coreblas/include/coreblas/coreblas_zc.h

@@ -31,10 +31,6 @@
 #ifndef _MORSE_CORE_ZCBLAS_H_
 #define _MORSE_CORE_ZCBLAS_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** ****************************************************************************
  *  Declarations of serial kernels - alphabetical order
  **/
@@ -45,10 +41,4 @@ void CORE_zlag2c(int m, int n,
                  const MORSE_Complex64_t *A, int lda,
                  MORSE_Complex32_t *B, int ldb, int *info);
 
-
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif

coreblas/include/lapacke.h → coreblas/include/coreblas/lapacke.h

@@ -48,7 +48,7 @@
 *  Turn on HAVE_LAPACK_CONFIG_H to redefine C-LAPACK datatypes
 */
 #ifdef HAVE_LAPACK_CONFIG_H
-#include "lapacke_config.h"
+#include "coreblas/lapacke_config.h"
 #endif
 #include <stdlib.h>
@@ -150,7 +150,7 @@ typedef lapack_logical (*LAPACK_Z_SELECT1) ( const lapack_complex_double* );
 typedef lapack_logical (*LAPACK_Z_SELECT2)
     ( const lapack_complex_double*, const lapack_complex_double* );
-#include "lapacke_mangling.h"
+#include "coreblas/lapacke_mangling.h"
 #define LAPACK_lsame LAPACK_GLOBAL(lsame,LSAME)
 lapack_logical LAPACK_lsame( char* ca,  char* cb,