Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 1f7476fe authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Remove magma from crontrol directory

parent 73b87ca5
No related branches found
No related tags found
1 merge request!44Magma
...@@ -69,17 +69,9 @@ ...@@ -69,17 +69,9 @@
#include <mpi.h> #include <mpi.h>
#endif #endif
/** ****************************************************************************
* Linear Algebra headers
**/
#if defined(CHAMELEON_USE_MAGMA) && !defined(CHAMELEON_SIMULATION)
#include <magma.h>
#endif
/** **************************************************************************** /** ****************************************************************************
* Line to avoid conflict with magma, because, we don't know why * Line to avoid conflict with other linear algebra libraries, because, we
* but lapacke provide a wrong interface of lapack in fortran * don't know why but lapacke provide a wrong interface of lapack in fortran
**/ **/
#ifndef LAPACK_NAME #ifndef LAPACK_NAME
#define LAPACK_NAME(a, b) lapackef77_##a #define LAPACK_NAME(a, b) lapackef77_##a
......
...@@ -42,7 +42,4 @@ ...@@ -42,7 +42,4 @@
#cmakedefine HAVE_STARPU_MPI_COMM_RANK #cmakedefine HAVE_STARPU_MPI_COMM_RANK
#cmakedefine HAVE_STARPU_MPI_CACHED_RECEIVE #cmakedefine HAVE_STARPU_MPI_CACHED_RECEIVE
/* MAGMA functions */
#cmakedefine HAVE_MAGMA_GETRF_INCPIV_GPU
#endif /* CONFIG_H_HAS_BEEN_INCLUDED */ #endif /* CONFIG_H_HAS_BEEN_INCLUDED */
...@@ -110,9 +110,6 @@ int MORSE_InitPar(int ncpus, int ncudas, int nthreads_per_worker) ...@@ -110,9 +110,6 @@ int MORSE_InitPar(int ncpus, int ncudas, int nthreads_per_worker)
} }
} }
# endif # endif
#endif
#if defined(CHAMELEON_USE_MAGMA) && !defined(CHAMELEON_SIMULATION)
magma_init();
#endif #endif
RUNTIME_init_scheduler( morse, ncpus, ncudas, nthreads_per_worker ); RUNTIME_init_scheduler( morse, ncpus, ncudas, nthreads_per_worker );
return MORSE_SUCCESS; return MORSE_SUCCESS;
...@@ -142,9 +139,6 @@ int MORSE_Finalize(void) ...@@ -142,9 +139,6 @@ int MORSE_Finalize(void)
RUNTIME_barrier(morse); RUNTIME_barrier(morse);
# endif # endif
RUNTIME_finalize_scheduler( morse ); RUNTIME_finalize_scheduler( morse );
#if defined(CHAMELEON_USE_MAGMA) && !defined(CHAMELEON_SIMULATION)
magma_finalize();
#endif
#if defined(CHAMELEON_USE_MPI) #if defined(CHAMELEON_USE_MPI)
if (!morse->mpi_outer_init) if (!morse->mpi_outer_init)
......
...@@ -133,10 +133,6 @@ int morse_alloc_ipiv(int M, int N, MORSE_enum func, int type, MORSE_desc_t **des ...@@ -133,10 +133,6 @@ int morse_alloc_ipiv(int M, int N, MORSE_enum func, int type, MORSE_desc_t **des
NB = MORSE_NB; NB = MORSE_NB;
IB = MORSE_IB; IB = MORSE_IB;
#if defined(CHAMELEON_USE_MAGMA)
/* IB *= 2; */
#endif
NT = (N%NB==0) ? (N/NB) : ((N/NB)+1); NT = (N%NB==0) ? (N/NB) : ((N/NB)+1);
MT = (M%NB==0) ? (M/NB) : ((M/NB)+1); MT = (M%NB==0) ? (M/NB) : ((M/NB)+1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment