Restructure headers in cudablas directory

6513fcbf · Mathieu Faverge · 856b8030 · 6513fcbf · 6513fcbf · 6513fcbf
Commit 6513fcbf authored Jul 29, 2017 by Mathieu Faverge
35 changed files
--- a/cudablas/compute/cuda_zgeadd.c
+++ b/cudablas/compute/cuda_zgeadd.c
@@ -20,8 +20,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if !defined(CHAMELEON_USE_CUBLAS_V2)
 #error "This file requires cublas api v2 support"

--- a/cudablas/compute/cuda_zgelqt.c
+++ b/cudablas/compute/cuda_zgelqt.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA)
 int CUDA_zgelqt(

--- a/cudablas/compute/cuda_zgemerge.c
+++ b/cudablas/compute/cuda_zgemerge.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int
 CUDA_zgemerge( MORSE_enum side, MORSE_enum diag,

--- a/cudablas/compute/cuda_zgemm.c
+++ b/cudablas/compute/cuda_zgemm.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_zgemm(MORSE_enum transa, MORSE_enum transb,
               int m, int n, int k,

--- a/cudablas/compute/cuda_zgeqrt.c
+++ b/cudablas/compute/cuda_zgeqrt.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA)
 int CUDA_zgeqrt(

--- a/cudablas/compute/cuda_zgessm.c
+++ b/cudablas/compute/cuda_zgessm.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA)
 #if defined(HAVE_MAGMA_GETRF_INCPIV_GPU)

--- a/cudablas/compute/cuda_zgetrf.c
+++ b/cudablas/compute/cuda_zgetrf.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA)
 #if defined(HAVE_MAGMA_GETRF_INCPIV_GPU)

--- a/cudablas/compute/cuda_zhemm.c
+++ b/cudablas/compute/cuda_zhemm.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_zhemm(MORSE_enum side, MORSE_enum uplo,
               int m, int n,

--- a/cudablas/compute/cuda_zher2k.c
+++ b/cudablas/compute/cuda_zher2k.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_zher2k(MORSE_enum uplo, MORSE_enum trans,
                int n, int k,

--- a/cudablas/compute/cuda_zherfb.c
+++ b/cudablas/compute/cuda_zherfb.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int
 CUDA_zherfb( MORSE_enum uplo, int n,

--- a/cudablas/compute/cuda_zherk.c
+++ b/cudablas/compute/cuda_zherk.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_zherk( MORSE_enum uplo, MORSE_enum trans,
                int n, int k,

--- a/cudablas/compute/cuda_zlarfb.c
+++ b/cudablas/compute/cuda_zlarfb.c
@@ -24,8 +24,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int
 CUDA_zlarfb(MORSE_enum side, MORSE_enum trans,

--- a/cudablas/compute/cuda_zlauum.c
+++ b/cudablas/compute/cuda_zlauum.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA)
 int CUDA_zlauum(

--- a/cudablas/compute/cuda_zparfb.c
+++ b/cudablas/compute/cuda_zparfb.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 /**
 *****************************************************************************

--- a/cudablas/compute/cuda_zpotrf.c
+++ b/cudablas/compute/cuda_zpotrf.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA)
 int CUDA_zpotrf(

--- a/cudablas/compute/cuda_zssssm.c
+++ b/cudablas/compute/cuda_zssssm.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA)
 #if defined(HAVE_MAGMA_GETRF_INCPIV_GPU)

--- a/cudablas/compute/cuda_zsymm.c
+++ b/cudablas/compute/cuda_zsymm.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_zsymm(MORSE_enum side, MORSE_enum uplo,
               int m, int n,

--- a/cudablas/compute/cuda_zsyr2k.c
+++ b/cudablas/compute/cuda_zsyr2k.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_zsyr2k(
        MORSE_enum uplo, MORSE_enum trans,

--- a/cudablas/compute/cuda_zsyrk.c
+++ b/cudablas/compute/cuda_zsyrk.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_zsyrk(MORSE_enum uplo, MORSE_enum trans,
               int n, int k,

--- a/cudablas/compute/cuda_ztpmqrt.c
+++ b/cudablas/compute/cuda_ztpmqrt.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int
 CUDA_ztpmqrt( MORSE_enum side, MORSE_enum trans,

--- a/cudablas/compute/cuda_ztrmm.c
+++ b/cudablas/compute/cuda_ztrmm.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_ztrmm(
        MORSE_enum side, MORSE_enum uplo,

--- a/cudablas/compute/cuda_ztrsm.c
+++ b/cudablas/compute/cuda_ztrsm.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_ztrsm(MORSE_enum side, MORSE_enum uplo,
               MORSE_enum transa, MORSE_enum diag,

--- a/cudablas/compute/cuda_ztrtri.c
+++ b/cudablas/compute/cuda_ztrtri.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA)
 int CUDA_ztrtri(

--- a/cudablas/compute/cuda_ztslqt.c
+++ b/cudablas/compute/cuda_ztslqt.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA) && 0
 int CUDA_ztslqt(

--- a/cudablas/compute/cuda_ztsmlq.c
+++ b/cudablas/compute/cuda_ztsmlq.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_ztsmlq(
        MORSE_enum side, MORSE_enum trans,

--- a/cudablas/compute/cuda_ztsmqr.c
+++ b/cudablas/compute/cuda_ztsmqr.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_ztsmqr(
        MORSE_enum side, MORSE_enum trans,

--- a/cudablas/compute/cuda_ztsqrt.c
+++ b/cudablas/compute/cuda_ztsqrt.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA)
 int CUDA_ztsqrt(

--- a/cudablas/compute/cuda_ztstrf.c
+++ b/cudablas/compute/cuda_ztstrf.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 #if defined(CHAMELEON_USE_MAGMA) && 0
 int CUDA_ztstrf(

--- a/cudablas/compute/cuda_zttmqr.c
+++ b/cudablas/compute/cuda_zttmqr.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int CUDA_zttmqr(
        MORSE_enum side, MORSE_enum trans,

--- a/cudablas/compute/cuda_zunmlqt.c
+++ b/cudablas/compute/cuda_zunmlqt.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int
 CUDA_zunmlqt(MORSE_enum side, MORSE_enum trans,

--- a/cudablas/compute/cuda_zunmqrt.c
+++ b/cudablas/compute/cuda_zunmqrt.c
@@ -22,8 +22,8 @@
 * @precisions normal z -> c d s
 *
 **/
-#include "cudablas/include/cudablas.h"
-#include "cudablas/include/cudablas_z.h"
+#include "cudablas.h"
+#include "cudablas/cudablas_z.h"

 int
 CUDA_zunmqrt(MORSE_enum side, MORSE_enum trans,

--- a/cudablas/compute/cudaglobal.c
+++ b/cudablas/compute/cudaglobal.c
@@ -19,7 +19,7 @@
 * @date 2017-04-06
 *
 **/
-#include "cudablas/include/cudablas.h"
+#include "cudablas.h"

 /*******************************************************************************
 *  LAPACK Constants

--- a/cudablas/include/CMakeLists.txt
+++ b/cudablas/include/CMakeLists.txt
@@ -27,31 +27,36 @@
 # ---------------------
 set(CUDABLAS_HDRS_GENERATED "")
 set(ZHDR
-    cudablas_z.h
+    cudablas/cudablas_z.h
 )
-precisions_rules_py(CUDABLAS_HDRS_GENERATED "${ZHDR}"
-                    PRECISIONS "s;d;c;z;zc;ds" )
+precisions_rules_py(
+  CUDABLAS_HDRS_GENERATED "${ZHDR}"
+  TARGETDIR cudablas
+  PRECISIONS "s;d;c;z;zc;ds" )

 # Define the list of headers
 # --------------------------
 set(CUDABLAS_HDRS
    cudablas.h
-    ${CUDABLAS_HDRS_GENERATED}
    )

+# Add generated headers
+# ---------------------
+foreach( hdr_file ${CUDABLAS_HDRS_GENERATED} )
+  list(APPEND CUDABLAS_HDRS ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
+endforeach()
+
 # Force generation of headers
 # ---------------------------
 add_custom_target(cudablas_include ALL SOURCES ${CUDABLAS_HDRS})

-set(HDR_INSTALL "cudablas.h")
-foreach( hdr_file ${CUDABLAS_HDRS_GENERATED} )
-    list(APPEND HDR_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
-endforeach()
-
-# installation
+# Installation
 # ------------
-install(FILES ${HDR_INSTALL}
-        DESTINATION include/chameleon/cudablas/include)
+install( FILES cudablas.h
+         DESTINATION include )
+
+install( FILES ${CUDABLAS_HDRS}
+         DESTINATION include/cudablas )

 ###
 ### END CMakeLists.txt

--- a/cudablas/include/cudablas.h
+++ b/cudablas/include/cudablas.h
@@ -25,7 +25,7 @@
 #ifndef _CUDA_BLAS_H_
 #define _CUDA_BLAS_H_

-#include "include/chameleon_config.h"
+#include "chameleon/chameleon_config.h"

 #if !defined(CHAMELEON_USE_CUDA)
 #error "This file should not be included"
@@ -68,20 +68,21 @@
 /** ****************************************************************************
 * MORSE types and constants
 **/
-#include "morse_types.h"
-#include "morse_struct.h"
-#include "morse_constants.h"
-//#include "control/auxiliary.h"
-//#include "control/descriptor.h"
-//#include "control/tile.h"
+#include "chameleon/morse_types.h"
+#include "chameleon/morse_struct.h"
+#include "chameleon/morse_constants.h"

 /** ****************************************************************************
 * CUDA BLAS headers
 **/
-#include "cudablas/include/cudablas_z.h"
-#include "cudablas/include/cudablas_d.h"
-#include "cudablas/include/cudablas_c.h"
-#include "cudablas/include/cudablas_s.h"
+BEGIN_C_DECLS
+
+#include "cudablas/cudablas_z.h"
+#include "cudablas/cudablas_d.h"
+#include "cudablas/cudablas_c.h"
+#include "cudablas/cudablas_s.h"
+
+END_C_DECLS

 /** ****************************************************************************
 * Coreblas Error
@@ -91,6 +92,8 @@
 /** ****************************************************************************
 *  LAPACK Constants
 **/
+BEGIN_C_DECLS
+
 extern char *morse_lapack_constants[];
 #define morse_lapack_const(morse_const) morse_lapack_constants[morse_const][0]

@@ -102,4 +105,6 @@ extern int morse_cublas_constants[];
 #define morse_cublas_const(morse_const) morse_lapack_constants[morse_const][0]
 #endif

+END_C_DECLS
+
 #endif
--- a/cudablas/include/cudablas_z.h
+++ b/cudablas/include/cudablas_z.h
@@ -25,13 +25,6 @@
 #ifndef _MORSE_CUDA_ZBLAS_H_
 #define _MORSE_CUDA_ZBLAS_H_

-#include "include/chameleon_config.h"
-#include "morse_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** ****************************************************************************
 *  Declarations of cuda kernels - alphabetical order
 **/
@@ -56,8 +49,4 @@ int CUDA_zttmqr( MORSE_enum side, MORSE_enum trans, int M1, int N1, int M2, int
 int CUDA_zunmlqt(MORSE_enum side, MORSE_enum trans, int M, int N, int K, int IB, const cuDoubleComplex *A,    int LDA, const cuDoubleComplex *T,    int LDT, cuDoubleComplex *C,    int LDC, cuDoubleComplex *WORK, int LDWORK, CUBLAS_STREAM_PARAM );
 int CUDA_zunmqrt(MORSE_enum side, MORSE_enum trans, int M, int N, int K, int IB, const cuDoubleComplex *A,    int LDA, const cuDoubleComplex *T,    int LDT, cuDoubleComplex *C,    int LDC, cuDoubleComplex *WORK, int LDWORK, CUBLAS_STREAM_PARAM );

-#ifdef __cplusplus
-}
-#endif
-
 #endif