From acdef8d24c20eee2e792d5a12f340863aa55700b Mon Sep 17 00:00:00 2001 From: Mathieu Faverge <mathieu.faverge@inria.fr> Date: Tue, 31 Jan 2017 10:26:03 +0100 Subject: [PATCH] Dague to Parsec in sequential_z*.c --- sopalin/sequential_zdiag.c | 10 +++++----- sopalin/sequential_zgetrf.c | 18 +++++++----------- sopalin/sequential_zhetrf.c | 8 ++++---- sopalin/sequential_zpotrf.c | 10 +++++----- sopalin/sequential_zsytrf.c | 8 ++++---- sopalin/sequential_ztrsm.c | 10 +++++----- 6 files changed, 30 insertions(+), 34 deletions(-) diff --git a/sopalin/sequential_zdiag.c b/sopalin/sequential_zdiag.c index 26abf4e76..db737eec0 100644 --- a/sopalin/sequential_zdiag.c +++ b/sopalin/sequential_zdiag.c @@ -23,11 +23,11 @@ #include "pastix_zcores.h" #if defined(PASTIX_WITH_PARSEC) -#include <dague.h> -#include <dague/data.h> -#include <dague/data_distribution.h> +#include <parsec.h> +#include <parsec/data.h> +#include <parsec/data_distribution.h> -int dsparse_zdiag_sp( dague_context_t *dague, +int dsparse_zdiag_sp( parsec_context_t *parsec, sparse_matrix_desc_t *A, sopalin_data_t *sopalin_data, int nrhs, pastix_complex64_t *b, int ldb); @@ -148,7 +148,7 @@ void parsec_zdiag( pastix_data_t *pastix_data, sopalin_data_t *sopalin_data, int nrhs, pastix_complex64_t *b, int ldb ) { - dague_context_t *ctx; + parsec_context_t *ctx; /* Start PaRSEC */ if (pastix_data->parsec == NULL) { diff --git a/sopalin/sequential_zgetrf.c b/sopalin/sequential_zgetrf.c index 63c7585ed..044ff292c 100644 --- a/sopalin/sequential_zgetrf.c +++ b/sopalin/sequential_zgetrf.c @@ -23,16 +23,13 @@ #include "pastix_zcores.h" #if defined(PASTIX_WITH_PARSEC) -#include <dague.h> -#include <dague/data.h> -#include <dague/data_distribution.h> +#include <parsec.h> +#include <parsec/data.h> +#include <parsec/data_distribution.h> -int dsparse_zgetrf_1dplus_sp( dague_context_t *dague, +int dsparse_zgetrf_1dplus_sp( parsec_context_t *parsec, sparse_matrix_desc_t *A, sopalin_data_t *sopalin_data ); -int dsparse_zgetrf_2d_sp( dague_context_t *dague, - sparse_matrix_desc_t *A, - sopalin_data_t *sopalin_data ); #endif void @@ -120,7 +117,7 @@ void parsec_zgetrf_1dplus( pastix_data_t *pastix_data, sopalin_data_t *sopalin_data ) { - dague_context_t *ctx; + parsec_context_t *ctx; /* Start PaRSEC */ if (pastix_data->parsec == NULL) { @@ -142,7 +139,7 @@ void parsec_zgetrf_2d( pastix_data_t *pastix_data, sopalin_data_t *sopalin_data ) { - dague_context_t *ctx; + parsec_context_t *ctx; /* Start PaRSEC */ if (pastix_data->parsec == NULL) { @@ -165,12 +162,11 @@ static void (*zgetrf_table[4])(pastix_data_t *, sopalin_data_t *) = { sequential_zgetrf, thread_zgetrf, #if defined(PASTIX_WITH_PARSEC) - parsec_zgetrf_2d, parsec_zgetrf_1dplus, #else NULL, - NULL #endif + NULL }; void diff --git a/sopalin/sequential_zhetrf.c b/sopalin/sequential_zhetrf.c index 4ca2da3ae..52c3552c0 100644 --- a/sopalin/sequential_zhetrf.c +++ b/sopalin/sequential_zhetrf.c @@ -23,9 +23,9 @@ #include "pastix_zcores.h" #if defined(PASTIX_WITH_PARSEC) -#include <dague.h> -#include <dague/data.h> -#include <dague/data_distribution.h> +#include <parsec.h> +#include <parsec/data.h> +#include <parsec/data_distribution.h> #endif void @@ -121,7 +121,7 @@ void parsec_zhetrf( pastix_data_t *pastix_data, sopalin_data_t *sopalin_data ) { - dague_context_t *ctx; + parsec_context_t *ctx; /* Start PaRSEC */ if (pastix_data->parsec == NULL) { diff --git a/sopalin/sequential_zpotrf.c b/sopalin/sequential_zpotrf.c index af9ddb169..633067b6b 100644 --- a/sopalin/sequential_zpotrf.c +++ b/sopalin/sequential_zpotrf.c @@ -23,11 +23,11 @@ #include "pastix_zcores.h" #if defined(PASTIX_WITH_PARSEC) -#include <dague.h> -#include <dague/data.h> -#include <dague/data_distribution.h> +#include <parsec.h> +#include <parsec/data.h> +#include <parsec/data_distribution.h> -int dsparse_zpotrf_sp( dague_context_t *dague, +int dsparse_zpotrf_sp( parsec_context_t *parsec, sparse_matrix_desc_t *A, sopalin_data_t *sopalin_data ); #endif @@ -117,7 +117,7 @@ void parsec_zpotrf( pastix_data_t *pastix_data, sopalin_data_t *sopalin_data ) { - dague_context_t *ctx; + parsec_context_t *ctx; /* Start PaRSEC */ if (pastix_data->parsec == NULL) { diff --git a/sopalin/sequential_zsytrf.c b/sopalin/sequential_zsytrf.c index ad2261387..d98dfffa9 100644 --- a/sopalin/sequential_zsytrf.c +++ b/sopalin/sequential_zsytrf.c @@ -23,9 +23,9 @@ #include "pastix_zcores.h" #if defined(PASTIX_WITH_PARSEC) -#include <dague.h> -#include <dague/data.h> -#include <dague/data_distribution.h> +#include <parsec.h> +#include <parsec/data.h> +#include <parsec/data_distribution.h> #endif void @@ -121,7 +121,7 @@ void parsec_zsytrf( pastix_data_t *pastix_data, sopalin_data_t *sopalin_data ) { - dague_context_t *ctx; + parsec_context_t *ctx; /* Start PaRSEC */ if (pastix_data->parsec == NULL) { diff --git a/sopalin/sequential_ztrsm.c b/sopalin/sequential_ztrsm.c index 33f25c1f9..4e3b2e8a0 100644 --- a/sopalin/sequential_ztrsm.c +++ b/sopalin/sequential_ztrsm.c @@ -24,11 +24,11 @@ #include "pastix_zcores.h" #if defined(PASTIX_WITH_PARSEC) -#include <dague.h> -#include <dague/data.h> -#include <dague/data_distribution.h> +#include <parsec.h> +#include <parsec/data.h> +#include <parsec/data_distribution.h> -int dsparse_ztrsm_sp( dague_context_t *dague, +int dsparse_ztrsm_sp( parsec_context_t *parsec, sparse_matrix_desc_t *A, int side, int uplo, int trans, int diag, sopalin_data_t *sopalin_data, @@ -201,7 +201,7 @@ parsec_ztrsm( pastix_data_t *pastix_data, int side, int uplo, int trans, int dia sopalin_data_t *sopalin_data, int nrhs, pastix_complex64_t *b, int ldb ) { - dague_context_t *ctx; + parsec_context_t *ctx; /* Start PaRSEC */ if (pastix_data->parsec == NULL) { -- GitLab