Do not use magma for gemm or trsm, cublas is now already very good, and magma disturbs the cublas stream

examples/lu/complex_double.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux
+ * Copyright (C) 2009, 2010, 2014  Université de Bordeaux
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -24,15 +24,8 @@
 #define STARPU_LU(name)       starpu_zlu_##name
 #define COMPLEX_LU
 
-#ifdef STARPU_HAVE_MAGMA
-#include <magmablas.h>
-#define CUBLAS_GEMM	magmablas_zgemm
-#define CUBLAS_TRSM	magmablas_ztrsm
-#else
 #define CUBLAS_GEMM	cublasZgemm
 #define CUBLAS_TRSM	cublasZtrsm
-#endif
-
 #define CUBLAS_SCAL	cublasZscal
 #define CUBLAS_GER	cublasZgeru
 #define CUBLAS_SWAP	cublasZswap

examples/lu/complex_float.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux
+ * Copyright (C) 2009, 2010, 2014  Université de Bordeaux
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -24,15 +24,8 @@
 #define STARPU_LU(name)       starpu_clu_##name
 #define COMPLEX_LU
 
-#ifdef STARPU_HAVE_MAGMA
-#include <magmablas.h>
-#define CUBLAS_GEMM	magmablas_cgemm
-#define CUBLAS_TRSM	magmablas_ctrsm
-#else
 #define CUBLAS_GEMM	cublasCgemm
 #define CUBLAS_TRSM	cublasCtrsm
-#endif
-
 #define CUBLAS_SCAL	cublasCscal
 #define CUBLAS_GER	cublasCgeru
 #define CUBLAS_SWAP	cublasCswap

examples/lu/lu-double.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux
+ * Copyright (C) 2009, 2010, 2014  Université de Bordeaux
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -20,14 +20,8 @@
 
 #define STARPU_LU(name)       starpu_dlu_##name
 
-#ifdef STARPU_HAVE_MAGMA
-#include <magmablas.h>
-#define CUBLAS_GEMM	magmablas_dgemm
-#define CUBLAS_TRSM	magmablas_dtrsm
-#else
 #define CUBLAS_GEMM	cublasDgemm
 #define CUBLAS_TRSM	cublasDtrsm
-#endif
 #define CUBLAS_SCAL	cublasDscal
 #define CUBLAS_GER	cublasDger
 #define CUBLAS_SWAP	cublasDswap

examples/lu/lu-float.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux
+ * Copyright (C) 2009, 2010, 2014  Université de Bordeaux
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -21,15 +21,8 @@
 
 #define STARPU_LU(name)       starpu_slu_##name
 
-#ifdef STARPU_HAVE_MAGMA
-#include <magmablas.h>
-#define CUBLAS_GEMM	magmablas_sgemm
-#define CUBLAS_TRSM	magmablas_strsm
-#else
 #define CUBLAS_GEMM	cublasSgemm
 #define CUBLAS_TRSM	cublasStrsm
-#endif
-
 #define CUBLAS_SCAL	cublasSscal
 #define CUBLAS_GER	cublasSger
 #define CUBLAS_SWAP	cublasSswap