Mentions légales du service

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

Add migration and swith to TP kernels in unglq algorithms

parent 38742581
Branches
Tags
1 merge request!81Migration QR/LQ
Hide whitespace changes
Inline Side-by-side
compute/pzunglq.c
+ 19
− 8
View file @ 39ca5137
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
#define Q(m,n) Q, m, n #define Q(m,n) Q, m, n
#define T(m,n) T, m, n #define T(m,n) T, m, n
#if defined(CHAMELEON_COPY_DIAG) #if defined(CHAMELEON_COPY_DIAG)
#define D(k) D, k, 0 #define D(k) D, k, 0
#else #else
#define D(k) A, k, k #define D(k) D, k, k
#endif #endif
/******************************************************************************* /*******************************************************************************
...@@ -69,6 +69,10 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc ...@@ -69,6 +69,10 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
minMT = A->mt; minMT = A->mt;
} }
if (D == NULL) {
D = A;
}
/* /*
* zunmlq = A->nb * ib * zunmlq = A->nb * ib
* ztsmlq = A->nb * ib * ztsmlq = A->nb * ib
...@@ -103,14 +107,18 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc ...@@ -103,14 +107,18 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
for (m = 0; m < Q->mt; m++) { for (m = 0; m < Q->mt; m++) {
tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb; tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb;
ldqm = BLKLDD(Q, m); ldqm = BLKLDD(Q, m);
MORSE_TASK_ztsmlq(
RUNTIME_data_migrate( sequence, Q(m, k),
Q->get_rankof( Q, m, n ) );
MORSE_TASK_ztpmlqt(
&options, &options,
MorseRight, MorseNoTrans, MorseRight, MorseNoTrans,
tempmm, Q->nb, tempmm, tempnn, tempAkm, ib, T->nb, tempmm, tempnn, tempAkm, 0, ib, T->nb,
Q(m, k), ldqm,
Q(m, n), ldqm,
A(k, n), ldak, A(k, n), ldak,
T(k, n), T->mb); T(k, n), T->mb,
Q(m, k), ldqm,
Q(m, n), ldqm);
} }
} }
#if defined(CHAMELEON_COPY_DIAG) #if defined(CHAMELEON_COPY_DIAG)
...@@ -130,6 +138,10 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc ...@@ -130,6 +138,10 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
for (m = k; m < Q->mt; m++) { for (m = k; m < Q->mt; m++) {
tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb; tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb;
ldqm = BLKLDD(Q, m); ldqm = BLKLDD(Q, m);
RUNTIME_data_migrate( sequence, Q(m, k),
Q->get_rankof( Q, m, k ) );
MORSE_TASK_zunmlq( MORSE_TASK_zunmlq(
&options, &options,
MorseRight, MorseNoTrans, MorseRight, MorseNoTrans,
...@@ -144,5 +156,4 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc ...@@ -144,5 +156,4 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
RUNTIME_options_ws_free(&options); RUNTIME_options_ws_free(&options);
RUNTIME_options_finalize(&options, morse); RUNTIME_options_finalize(&options, morse);
(void)D;
} }
compute/pzunglq_param.c
+ 42
− 40
View file @ 39ca5137
...@@ -25,15 +25,10 @@ ...@@ -25,15 +25,10 @@
#include "control/common.h" #include "control/common.h"
#include <stdlib.h> #include <stdlib.h>
#define A(m,n) A, (m), (n) #define A(m,n) A, (m), (n)
#define Q(m,n) Q, (m), (n) #define Q(m,n) Q, (m), (n)
#define TS(m,n) TS, (m), (n) #define T(m,n) T, (m), (n)
#define TT(m,n) TT, (m), (n)
#if defined(CHAMELEON_COPY_DIAG)
#define D(m,n) D, (m), (n) #define D(m,n) D, (m), (n)
#else
#define D(m,n) A, (m), (n)
#endif
/** /**
* Parallel construction of Q using tile V - dynamic scheduling * Parallel construction of Q using tile V - dynamic scheduling
...@@ -44,11 +39,12 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des ...@@ -44,11 +39,12 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des
{ {
MORSE_context_t *morse; MORSE_context_t *morse;
MORSE_option_t options; MORSE_option_t options;
MORSE_desc_t *T;
size_t ws_worker = 0; size_t ws_worker = 0;
size_t ws_host = 0; size_t ws_host = 0;
int k, m, n, i, p; int k, m, n, i, p;
int K; int K, L;
int ldak, ldqm; int ldak, ldqm;
int tempkm, tempkmin, temppn, tempnn, tempmm; int tempkm, tempkmin, temppn, tempnn, tempmm;
int ib; int ib;
...@@ -61,6 +57,10 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des ...@@ -61,6 +57,10 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des
ib = MORSE_IB; ib = MORSE_IB;
if (D == NULL) {
D = A;
}
/* /*
* zunmqr = A->nb * ib * zunmqr = A->nb * ib
* ztsmqr = A->nb * ib * ztsmqr = A->nb * ib
...@@ -103,37 +103,36 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des ...@@ -103,37 +103,36 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des
tempnn = n == Q->nt-1 ? Q->n-n*Q->nb : Q->nb; tempnn = n == Q->nt-1 ? Q->n-n*Q->nb : Q->nb;
/* TT or TS */ /* TS or TT */
if(qrtree->gettype(qrtree, k, n) == 0){ if(qrtree->gettype(qrtree, k, n) == 0){
for (m = k; m < Q->mt; m++) { L = 0;
tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb; T = TS;
ldqm = BLKLDD(Q, m);
MORSE_TASK_ztsmlq(
&options,
MorseRight, MorseNoTrans,
tempmm, Q->nb, tempmm, tempnn, tempkm, ib, TS->nb,
Q( m, p), ldqm,
Q( m, n), ldqm,
A( k, n), ldak,
TS(k, n), TS->mb);
}
} }
else { else {
for (m = k; m < Q->mt; m++) { L = tempnn;
tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb; T = TT;
ldqm = BLKLDD(Q, m); }
MORSE_TASK_zttmlq( for (m = k; m < Q->mt; m++) {
&options, tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb;
MorseRight, MorseNoTrans, ldqm = BLKLDD(Q, m);
tempmm, Q->nb, tempmm, tempnn, tempkm, ib, TT->nb,
Q( m, p), ldqm, RUNTIME_data_migrate( sequence, Q(m, p),
Q( m, n), ldqm, Q->get_rankof( Q, m, n ) );
A( k, n), ldak, RUNTIME_data_migrate( sequence, Q(m, n),
TT(k, n), TT->mb); Q->get_rankof( Q, m, n ) );
}
MORSE_TASK_ztpmlqt(
&options,
MorseRight, MorseNoTrans,
tempmm, tempnn, tempkm, L, ib, T->nb,
A(k, n), ldak,
T(k, n), T->mb,
Q(m, p), ldqm,
Q(m, n), ldqm);
} }
} }
T = TS;
for (i = 0; i < qrtree->getnbgeqrf(qrtree, k); i++) { for (i = 0; i < qrtree->getnbgeqrf(qrtree, k); i++) {
p = qrtree->getm(qrtree, k, i); p = qrtree->getm(qrtree, k, i);
...@@ -157,13 +156,17 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des ...@@ -157,13 +156,17 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des
for (m = k; m < Q->mt; m++) { for (m = k; m < Q->mt; m++) {
tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb; tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb;
ldqm = BLKLDD(Q, m); ldqm = BLKLDD(Q, m);
RUNTIME_data_migrate( sequence, Q(m, p),
Q->get_rankof( Q, m, p ) );
MORSE_TASK_zunmlq( MORSE_TASK_zunmlq(
&options, &options,
MorseRight, MorseNoTrans, MorseRight, MorseNoTrans,
tempmm, temppn, tempkmin, ib, TS->nb, tempmm, temppn, tempkmin, ib, T->nb,
D( k, p), ldak, D(k, p), ldak,
TS(k, p), TS->mb, T(k, p), T->mb,
Q( m, p), ldqm); Q(m, p), ldqm);
} }
} }
RUNTIME_iteration_pop(morse); RUNTIME_iteration_pop(morse);
...@@ -172,5 +175,4 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des ...@@ -172,5 +175,4 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des
free(tiles); free(tiles);
RUNTIME_options_ws_free(&options); RUNTIME_options_ws_free(&options);
RUNTIME_options_finalize(&options, morse); RUNTIME_options_finalize(&options, morse);
(void)D;
} }
compute/pzunglqrh.c
+ 26
− 12
View file @ 39ca5137
...@@ -102,15 +102,20 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q, ...@@ -102,15 +102,20 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q,
for (m = k; m < Q->mt; m++) { for (m = k; m < Q->mt; m++) {
tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb; tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb;
ldqm = BLKLDD(Q, m ); ldqm = BLKLDD(Q, m );
MORSE_TASK_zttmlq(
RUNTIME_data_migrate( sequence, Q(m, N),
Q->get_rankof( Q, m, N+RD ) );
RUNTIME_data_migrate( sequence, Q(m, N+RD),
Q->get_rankof( Q, m, N+RD ) );
MORSE_TASK_ztpmlqt(
&options, &options,
MorseRight, MorseNoTrans, MorseRight, MorseNoTrans,
tempmm, Q->nb, tempmm, tempNRDn, tempmm, tempNRDn, tempkm, tempNRDn, ib, T->nb,
tempkm, ib, T->nb,
Q (m, N ), ldqm,
Q (m, N+RD), ldqm,
A (k, N+RD), ldak, A (k, N+RD), ldak,
T2(k, N+RD), T->mb); T2(k, N+RD), T->mb,
Q (m, N ), ldqm,
Q (m, N+RD), ldqm);
} }
} }
} }
...@@ -123,15 +128,20 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q, ...@@ -123,15 +128,20 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q,
for (m = k; m < Q->mt; m++) { for (m = k; m < Q->mt; m++) {
tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb; tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb;
ldqm = BLKLDD(Q, m); ldqm = BLKLDD(Q, m);
MORSE_TASK_ztsmlq(
RUNTIME_data_migrate( sequence, Q(m, N),
Q->get_rankof( Q, m, n ) );
RUNTIME_data_migrate( sequence, Q(m, n),
Q->get_rankof( Q, m, n ) );
MORSE_TASK_ztpmlqt(
&options, &options,
MorseRight, MorseNoTrans, MorseRight, MorseNoTrans,
tempmm, Q->nb, tempmm, tempnn, tempmm, tempnn, tempkm, 0, ib, T->nb,
tempkm, ib, T->nb,
Q(m, N), ldqm,
Q(m, n), ldqm,
A(k, n), ldak, A(k, n), ldak,
T(k, n), T->mb); T(k, n), T->mb,
Q(m, N), ldqm,
Q(m, n), ldqm);
} }
} }
#if defined(CHAMELEON_COPY_DIAG) #if defined(CHAMELEON_COPY_DIAG)
...@@ -151,6 +161,10 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q, ...@@ -151,6 +161,10 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q,
for (m = k; m < Q->mt; m++) { for (m = k; m < Q->mt; m++) {
tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb; tempmm = m == Q->mt-1 ? Q->m-m*Q->mb : Q->mb;
ldqm = BLKLDD(Q, m); ldqm = BLKLDD(Q, m);
RUNTIME_data_migrate( sequence, Q(m, N),
Q->get_rankof( Q, m, N ) );
MORSE_TASK_zunmlq( MORSE_TASK_zunmlq(
&options, &options,
MorseRight, MorseNoTrans, MorseRight, MorseNoTrans,
......
compute/pzunmlqrh.c
+ 4
− 0
View file @ 39ca5137
...@@ -259,6 +259,10 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans, ...@@ -259,6 +259,10 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
#endif #endif
for (n = 0; n < B->nt; n++) { for (n = 0; n < B->nt; n++) {
tempnn = n == B->nt-1 ? B->n-n*B->nb : B->nb; tempnn = n == B->nt-1 ? B->n-n*B->nb : B->nb;
RUNTIME_data_migrate( sequence, B(N, n),
B->get_rankof( B, N, n ) );
MORSE_TASK_zunmlq( MORSE_TASK_zunmlq(
&options, &options,
side, trans, side, trans,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment