diff --git a/compute/pzgelqf.c b/compute/pzgelqf.c
index 712ded8af103e0b98a4e4fcc26237b04f5f8c8f2..36cf19e1b672bb219fdbd2eb6f28f0e221ebeb28 100644
--- a/compute/pzgelqf.c
+++ b/compute/pzgelqf.c
@@ -86,23 +86,6 @@ void morse_pzgelqf(MORSE_desc_t *A, MORSE_desc_t *T,
ws_worker = chameleon_max( ws_worker, ib * A->nb * 2 );
#endif
-#if defined(CHAMELEON_USE_MAGMA)
- /* Worker space
- *
- * zgeqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- * ztsqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- */
- ws_worker = chameleon_max( ws_worker, ib * (ib + A->nb) );
-
- /* Host space
- *
- * zgelqt = ib * A->nb + 3 * ib * ib + A->nb
- * ztslqt = 3 * ib * A->nb + ib * ib + A->nb
- */
- ws_host = chameleon_max( ws_host, ib * A->nb + 3 * ib * ib + A->nb );
- ws_host = chameleon_max( ws_host, 3 * ib * A->nb + ib * ib + A->nb );
-#endif
-
ws_worker *= sizeof(MORSE_Complex64_t);
ws_host *= sizeof(MORSE_Complex64_t);
diff --git a/compute/pzgelqfrh.c b/compute/pzgelqfrh.c
index b24b6db8919a3426e3471d61fd1e866583bd3711..57b1d613cd415ba91dee83c99dfc968d8d15bc58 100644
--- a/compute/pzgelqfrh.c
+++ b/compute/pzgelqfrh.c
@@ -87,23 +87,6 @@ void morse_pzgelqfrh(MORSE_desc_t *A, MORSE_desc_t *T, int BS,
ws_worker = chameleon_max( ws_worker, ib * A->nb * 2 );
#endif
-#if defined(CHAMELEON_USE_MAGMA)
- /* Worker space
- *
- * zgeqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- * ztsqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- */
- ws_worker = chameleon_max( ws_worker, ib * (ib + A->nb) );
-
- /* Host space
- *
- * zgelqt = ib * A->nb + 3 * ib * ib + A->nb
- * ztslqt = 3 * ib * A->nb + ib * ib + A->nb
- */
- ws_host = chameleon_max( ws_host, ib * A->nb + 3 * ib * ib + A->nb );
- ws_host = chameleon_max( ws_host, 3 * ib * A->nb + ib * ib + A->nb );
-#endif
-
ws_worker *= sizeof(MORSE_Complex64_t);
ws_host *= sizeof(MORSE_Complex64_t);
diff --git a/compute/pzgeqrf.c b/compute/pzgeqrf.c
index a54aa885338de18240b261d50f746cbcbf220b5b..6e061f0ed2fdf05f64649c31c677f55928f7dd51 100644
--- a/compute/pzgeqrf.c
+++ b/compute/pzgeqrf.c
@@ -81,23 +81,6 @@ void morse_pzgeqrf(MORSE_desc_t *A, MORSE_desc_t *T,
ws_worker = chameleon_max( ws_worker, ib * A->nb * 2 );
#endif
-#if defined(CHAMELEON_USE_MAGMA)
- /* Worker space
- *
- * zgeqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- * ztsqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- */
- ws_worker = chameleon_max( ws_worker, ib * (ib + A->nb) );
-
- /* Host space
- *
- * zgeqrt = ib * (A->mb+3*ib) + A->mb )
- * ztsqrt = 2 * ib * (A->nb+ib) + A->nb
- */
- ws_host = chameleon_max( ws_host, ib * (A->mb + 3 * ib) + A->mb );
- ws_host = chameleon_max( ws_host, 2 * ib * (A->nb + ib) + A->nb );
-#endif
-
ws_worker *= sizeof(MORSE_Complex64_t);
ws_host *= sizeof(MORSE_Complex64_t);
diff --git a/compute/pzgeqrfrh.c b/compute/pzgeqrfrh.c
index a5e828c8b41c0b16b20bb39a9cc40b3d90bb254e..c5b026358376ce0d2e06481bd166e760983aa90c 100644
--- a/compute/pzgeqrfrh.c
+++ b/compute/pzgeqrfrh.c
@@ -85,23 +85,6 @@ void morse_pzgeqrfrh(MORSE_desc_t *A, MORSE_desc_t *T, int BS,
ws_worker = chameleon_max( ws_worker, ib * A->nb * 2 );
#endif
-#if defined(CHAMELEON_USE_MAGMA)
- /* Worker space
- *
- * zgeqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- * ztsqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- */
- ws_worker = chameleon_max( ws_worker, ib * (ib + A->nb) );
-
- /* Host space
- *
- * zgeqrt = ib * (A->nb+3*ib) + A->nb )
- * ztsqrt = 2 * ib * (A->nb+ib) + A->nb
- */
- ws_host = chameleon_max( ws_host, ib * (A->mb + 3 * ib) + A->mb );
- ws_host = chameleon_max( ws_host, 2 * ib * (A->nb + ib) + A->nb );
-#endif
-
ws_worker *= sizeof(MORSE_Complex64_t);
ws_host *= sizeof(MORSE_Complex64_t);
diff --git a/compute/pzgetrf_incpiv.c b/compute/pzgetrf_incpiv.c
index f960873e6d6382cdb13b9594f1cebe459f7cad5e..5da79407cf9855db1d9c97ed607c53b6c0094516 100644
--- a/compute/pzgetrf_incpiv.c
+++ b/compute/pzgetrf_incpiv.c
@@ -64,13 +64,9 @@ void morse_pzgetrf_incpiv(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV,
RUNTIME_options_init(&options, morse, sequence, request);
ib = MORSE_IB;
-#if defined(CHAMELEON_USE_MAGMA)
- h_work_size = sizeof(MORSE_Complex64_t)*( 2*ib + 2*L->nb )*2*A->mb;
- d_work_size = sizeof(MORSE_Complex64_t)*( ib )*2*A->mb;
-#else
h_work_size = sizeof(MORSE_Complex64_t)*( ib*L->nb );
d_work_size = 0;
-#endif
+
RUNTIME_options_ws_alloc( &options, h_work_size, d_work_size );
/* necessary to avoid dependencies between tasks regarding the diag tile */
diff --git a/compute/pzhetrd_he2hb.c b/compute/pzhetrd_he2hb.c
index 497b574d4b812e9b7f36e86975da76e3d120b608..2173faa09def0a8a31440baf84f563dbce432f6f 100644
--- a/compute/pzhetrd_he2hb.c
+++ b/compute/pzhetrd_he2hb.c
@@ -85,23 +85,6 @@ void morse_pzhetrd_he2hb(MORSE_enum uplo,
ws_worker = chameleon_max( ws_worker, ib * A->nb * 2 );
#endif
-#if defined(CHAMELEON_USE_MAGMA)
- /* Worker space
- *
- * zgeqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- * ztsqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- */
- ws_worker = chameleon_max( ws_worker, ib * (ib + A->nb) );
-
- /* Host space
- *
- * zgeqrt = ib * (A->mb+3*ib) + A->mb )
- * ztsqrt = 2 * ib * (A->nb+ib) + A->nb
- */
- ws_host = chameleon_max( ws_host, ib * (A->mb + 3 * ib) + A->mb );
- ws_host = chameleon_max( ws_host, 2 * ib * (A->nb + ib) + A->nb );
-#endif
-
ws_worker *= sizeof(MORSE_Complex64_t);
ws_host *= sizeof(MORSE_Complex64_t);
diff --git a/compute/pzpotrf.c b/compute/pzpotrf.c
index 44b7d25f58f0dd5d51a64082e7fa55223f013ca5..bc648c74cc5e60867dae15ac5c6d32594a358742 100644
--- a/compute/pzpotrf.c
+++ b/compute/pzpotrf.c
@@ -54,16 +54,6 @@ void morse_pzpotrf(MORSE_enum uplo, MORSE_desc_t *A,
return;
RUNTIME_options_init(&options, morse, sequence, request);
-#ifdef CHAMELEON_USE_MAGMA
- if (0) /* Disable the workspace as long as it is is not used (See StarPU codelet) */
- {
- int nb = MORSE_IB; /* Approximate nb for simulation */
-#if !defined(CHAMELEON_SIMULATION)
- nb = magma_get_zpotrf_nb(A->nb);
-#endif
- ws_host = sizeof(MORSE_Complex64_t)*nb*nb;
- }
-#endif
RUNTIME_options_ws_alloc( &options, 0, ws_host );
/*
diff --git a/compute/pzpotrimm.c b/compute/pzpotrimm.c
index d1b7323c1718a52d1a49eed776e6337e0b30b822..a9d779b3049f23beaf128bd0bea2fadeb74f016b 100644
--- a/compute/pzpotrimm.c
+++ b/compute/pzpotrimm.c
@@ -57,17 +57,6 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
return;
RUNTIME_options_init(&options, morse, sequence, request);
-#ifdef CHAMELEON_USE_MAGMA
- {
-#if !defined(CHAMELEON_SIMULATION)
- int nb = magma_get_zpotrf_nb(A->nb);
-#else
- int nb = A->nb;
-#endif
- RUNTIME_options_ws_alloc( &options, nb*nb, 0 );
- }
-#endif
-
/*
* MorseLower
*/
@@ -489,8 +478,5 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
}
}
-#ifdef CHAMELEON_USE_MAGMA
- RUNTIME_options_ws_free(&options);
-#endif
RUNTIME_options_finalize(&options, morse);
}
diff --git a/compute/pztpqrt.c b/compute/pztpqrt.c
index 1807857a266542ca2a902ea6511df151fcee439c..d20512803bd4d269d2cb28a0e77800d26f9d9e0a 100644
--- a/compute/pztpqrt.c
+++ b/compute/pztpqrt.c
@@ -70,21 +70,6 @@ void morse_pztpqrt( int L, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_desc_t *T,
ws_worker = chameleon_max( ws_worker, ib * A->nb * 2 );
#endif
-#if defined(CHAMELEON_USE_MAGMA)
- /* Worker space
- *
- * ztpqrt = max( A->nb * (ib+1), ib * (ib + A->nb) )
- */
- ws_worker = chameleon_max( ws_worker, ib * (ib + A->nb) );
-
- /* Host space
- *
- * ztpqrt = 2 * ib * (A->nb+ib) + A->nb
- */
- ws_host = chameleon_max( ws_host, ib * (A->mb + 3 * ib) + A->mb );
- ws_host = chameleon_max( ws_host, 2 * ib * (A->nb + ib) + A->nb );
-#endif
-
ws_worker *= sizeof(MORSE_Complex64_t);
ws_host *= sizeof(MORSE_Complex64_t);