Commit dc27a851 authored by Mathieu Faverge's avatar Mathieu Faverge

Things compiles (at least on my machine)

parent 93c00d68
......@@ -1012,6 +1012,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
# Coreblas library (kernels for CPUs) #
#######################################
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/coreblas/include)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/coreblas/include)
add_subdirectory(coreblas)
#------------------------------------------------------------------------------
......@@ -1021,6 +1023,8 @@ add_subdirectory(coreblas)
########################################
if(CHAMELEON_USE_CUDA)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/cudablas/include)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/cudablas/include)
add_subdirectory(cudablas)
endif()
#------------------------------------------------------------------------------
......
......@@ -23,7 +23,7 @@
* @precisions normal z -> s d c
*
**/
#include <coreblas/include/lapacke.h>
#include <coreblas/lapacke.h>
#include "control/common.h"
/***************************************************************************//**
......
......@@ -23,7 +23,7 @@
* @precisions normal z -> s d c
*
**/
#include <coreblas/include/lapacke.h>
#include <coreblas/lapacke.h>
#include "control/common.h"
/***************************************************************************//**
......
......@@ -25,7 +25,7 @@
* @precisions normal z -> s d c
*
**/
#include <coreblas/include/lapacke.h>
#include <coreblas/lapacke.h>
#include "control/common.h"
/***************************************************************************//**
......
......@@ -77,9 +77,9 @@
**/
#include "morse.h"
#include "coreblas/include/coreblas.h"
#include "coreblas.h"
#if defined(CHAMELEON_USE_CUDA) && !defined(CHAMELEON_SIMULATION)
#include "cudablas/include/cudablas.h"
#include "cudablas.h"
#endif
#include "control/global.h"
......
......@@ -24,7 +24,7 @@
#ifndef _MORSE_F77_H_
#define _MORSE_F77_H_
#include "include/morse_mangling.h"
#include "chameleon/morse_mangling.h"
/** ****************************************************************************
* Determine FORTRAN names
......
......@@ -47,10 +47,10 @@
#include <sys/resource.h>
#endif
#include <coreblas/include/cblas.h>
#include <coreblas/include/lapacke.h>
#include <coreblas/cblas.h>
#include <coreblas/lapacke.h>
#include <morse.h>
#include <coreblas/include/coreblas.h>
#include <coreblas.h>
#if defined(CHAMELEON_USE_MPI)
#include <mpi.h>
......
......@@ -23,7 +23,7 @@
**/
#include "step0.h"
#include <coreblas/include/coreblas.h>
#include <coreblas.h>
/*
* @brief step0 is a simple Cholesky example using the C interface of
......
......@@ -32,8 +32,8 @@
#ifndef CBLAS_SADDR
#define CBLAS_SADDR( _val_ ) &(_val_)
#endif
#include <coreblas/include/cblas.h>
#include <coreblas/include/lapacke.h>
#include <coreblas/cblas.h>
#include <coreblas/lapacke.h>
/* Integer parameters for step0 */
enum iparam_step0 {
......
......@@ -29,7 +29,7 @@
#include "lapack_to_morse.h"
/* Specific includes for step 1 */
#include <coreblas/include/lapacke.h>
#include <coreblas/lapacke.h>
#include <morse.h>
/* Integer parameters for step1 */
......
......@@ -29,7 +29,7 @@
#include "lapack_to_morse.h"
/* Specific includes for step 2 */
#include <coreblas/include/lapacke.h>
#include <coreblas/lapacke.h>
#include "morse.h"
/* Integer parameters for step2 */
......
......@@ -29,7 +29,7 @@
#include "lapack_to_morse.h"
/* Specific includes for step 3 */
#include <coreblas/include/lapacke.h>
#include <coreblas/lapacke.h>
#include <morse.h>
/* Integer parameters for step3 */
......
......@@ -29,7 +29,7 @@
#include "lapack_to_morse.h"
/* Specific includes for step 4 */
#include <coreblas/include/lapacke.h>
#include <coreblas/lapacke.h>
#include <morse.h>
/* Integer parameters for step4 */
......
......@@ -29,7 +29,7 @@
#include "lapack_to_morse.h"
/* Specific includes for step 5 */
#include <coreblas/include/lapacke.h>
#include <coreblas/lapacke.h>
#include <morse.h>
/* Integer parameters for step5 */
......
......@@ -29,7 +29,7 @@
#include "lapack_to_morse.h"
/* Specific includes for step 6 */
#include <coreblas/include/lapacke.h>
#include <coreblas/lapacke.h>
#include <morse.h>
#if defined(CHAMELEON_USE_MPI)
#include <mpi.h>
......
......@@ -30,8 +30,8 @@
#include "lapack_to_morse.h"
/* Specific includes for step 7 */
#include <coreblas/include/lapacke.h>
#include <coreblas/include/coreblas.h>
#include <coreblas/lapacke.h>
#include <coreblas.h>
#include <morse.h>
#if defined(CHAMELEON_USE_MPI)
#include <mpi.h>
......
......@@ -100,7 +100,7 @@ double cWtime(void)
gettimeofday( &tp, NULL );
return tp.tv_sec + 1e-6 * tp.tv_usec;
}
#include <coreblas/include/lapacke.h>
#include <coreblas/lapacke.h>
#include <morse.h>
/* Integer parameters for step1 */
......
......@@ -48,7 +48,7 @@
#endif
#include <starpu.h>
#include "coreblas/include/lapacke.h"
#include "coreblas/lapacke.h"
#include "morse.h"
#include "control/common.h"
......
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include/chameleon
includedir=${exec_prefix}/include
Name: chameleon
Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_MICRO@
Cflags: @CHAMELEON_PKGCONFIG_DEFINITIONS@ -I${includedir} -I${includedir}/coreblas/include
Cflags: @CHAMELEON_PKGCONFIG_DEFINITIONS@ -I${includedir}
Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
Requires: @CHAMELEON_PKGCONFIG_REQUIRED@
......
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include/chameleon/coreblas/include
includedir=${exec_prefix}/include
Name: coreblas
Description: Interface to CBLAS/LAPACKE routines + some other auxiliary routines
......
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include/chameleon/cudablas/include
includedir=${exec_prefix}/include
Name: cudablas
Description: Interface to cuBLAS/MAGMA routines + some other auxiliary routines
......
......@@ -28,7 +28,7 @@
* @precisions normal z -> c d s
*
**/
#include "coreblas/include/cblas.h"
#include "coreblas/cblas.h"
#include "runtime/quark/include/morse_quark.h"
......
......@@ -27,7 +27,7 @@
* @precisions normal z -> c d s
*
**/
#include "coreblas/include/cblas.h"
#include "coreblas/cblas.h"
#include "runtime/quark/include/morse_quark.h"
......
......@@ -28,7 +28,7 @@
* @precisions normal z -> c d s
*
**/
#include "coreblas/include/cblas.h"
#include "coreblas/cblas.h"
#include "runtime/quark/include/morse_quark.h"
/***************************************************************************//**
......
......@@ -29,7 +29,7 @@
*
**/
#include "runtime/quark/include/morse_quark.h"
#include "coreblas/include/cblas.h"
#include "coreblas/cblas.h"
#include <math.h>
/***************************************************************************//**
......
......@@ -27,7 +27,7 @@
#define _MORSE_QUARK_H_
#include <quark.h>
#include "coreblas/include/coreblas.h"
#include "coreblas/coreblas.h"
#include "runtime/quark/include/quark_blas.h"
#include "runtime/quark/include/core_blas_dag.h"
......
......@@ -25,7 +25,7 @@
#ifndef _QUARK_BLAS_H_
#define _QUARK_BLAS_H_
#include "coreblas/include/cblas.h"
#include "coreblas/cblas.h"
#include "runtime/quark/include/quark_zblas.h"
#include "runtime/quark/include/quark_dblas.h"
......
......@@ -26,7 +26,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "runtime_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_dzasum(const MORSE_option_t *options,
MORSE_enum storev, MORSE_enum uplo, int M, int N,
......
......@@ -24,6 +24,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zaxpy(const MORSE_option_t *options,
int M, MORSE_Complex64_t alpha,
......
......@@ -31,8 +31,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zbuild( const MORSE_option_t *options,
const MORSE_desc_t *A, int Am, int An, int lda,
......
......@@ -28,6 +28,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
******************************************************************************
......
......@@ -28,9 +28,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -30,6 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -28,9 +28,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -28,10 +28,10 @@
* @precisions normal z -> c d s
*
**/
#include "coreblas/include/cblas.h"
#include "coreblas/cblas.h"
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -26,6 +26,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zgessq( const MORSE_option_t *options,
int m, int n,
......
......@@ -26,9 +26,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zgetrf(const MORSE_option_t *options,
int m, int n, int nb,
......
......@@ -28,9 +28,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -27,6 +27,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -22,6 +22,7 @@
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -30,6 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -30,6 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -24,6 +24,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -30,6 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -26,6 +26,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zhessq( const MORSE_option_t *options,
MORSE_enum uplo, int n,
......
......@@ -28,9 +28,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -26,9 +26,9 @@
* @precisions mixed zc -> ds
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -26,9 +26,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zlange(const MORSE_option_t *options,
MORSE_enum norm, int M, int N, int NB,
......
......@@ -28,6 +28,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zlanhe(const MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, int N, int NB,
......
......@@ -26,9 +26,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zlansy(const MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, int N, int NB,
......
......@@ -26,6 +26,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zlantr(const MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,
......
......@@ -26,6 +26,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -27,9 +27,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
......
......@@ -27,9 +27,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
......
......@@ -28,9 +28,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -28,9 +28,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -30,6 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/* MORSE_TASK_zplghe - Generate a tile for random hermitian (positive definite if bump is large enough) matrix. */
......
......@@ -30,7 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/* MORSE_TASK_zplgsy - Generate a tile for random symmetric (positive definite if 'bump' is large enough) matrix. */
......
......@@ -30,7 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/* MORSE_TASK_zplrnt - Generate a tile for random matrix. */
......
......@@ -27,6 +27,7 @@
#include <math.h>
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/*****************************************************************************
*
......
......@@ -28,9 +28,9 @@
* @precisions normal z -> c d s
*
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -28,9 +28,10 @@
* @precisions normal z -> c d s
*
**/
#include "coreblas/include/cblas.h"
#include "coreblas/cblas.h"
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -30,6 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -30,6 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -30,6 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
......
......@@ -26,6 +26,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zsyssq( const MORSE_option_t *options,
MORSE_enum uplo, int n,
......
......@@ -30,7 +30,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options,
MORSE_enum uplo, int n, int nb,
......
......@@ -26,6 +26,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/*****************************************************************************
*
......
......@@ -24,6 +24,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_ztpmqrt( const MORSE_option_t *options,
MORSE_enum side, MORSE_enum trans,
......
......@@ -24,6 +24,7 @@
**/
#include "runtime/starpu/include/morse_starpu.h"