From 09b35e11432d357b4d0879fdd80b3f9824aa3390 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Tue, 26 Jan 2021 22:59:44 +0100
Subject: [PATCH] Fix enable/disable traces
---
src/testCHAMELEON.c | 12 ++++++++++++
src/testHCHAMELEON.c | 10 ++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/testCHAMELEON.c b/src/testCHAMELEON.c
index 82b2971..6314823 100644
--- a/src/testCHAMELEON.c
+++ b/src/testCHAMELEON.c
@@ -79,7 +79,13 @@ int testCHAMELEON(void) {
nbPts, nbRHS, 1, np ); CHKERRQ(ierr);
/* Compute the mat.vec product A.rhs -> solCHAM */
+ if ( generate_traces ) {
+ CHAMELEON_Enable( CHAMELEON_PROFILING_MODE );
+ }
CHAMELEON_gemm_Tile( descA, descX, descY );
+ if ( generate_traces ) {
+ CHAMELEON_Disable( CHAMELEON_PROFILING_MODE );
+ }
temps_final = getTime ();
temps_cpu = temps_final - temps_initial ;
@@ -117,6 +123,9 @@ int testCHAMELEON(void) {
/* Factorize the CHAMELEON Matrix */
/* ===================================================================================== */
Mpf_printf(MPI_COMM_WORLD, "\n\n**** Factorizing CHAMELEON Mat...\n") ;
+ if ( generate_traces ) {
+ CHAMELEON_Enable( CHAMELEON_PROFILING_MODE );
+ }
temps_initial = getTime ();
if (symMatSolver) {
ierr = CHAMELEON_sytrf_Tile (ChamLower, descA); CHKERRQ(ierr);
@@ -125,6 +134,9 @@ int testCHAMELEON(void) {
}
temps_final = getTime ();
temps_cpu = temps_final - temps_initial ;
+ if ( generate_traces ) {
+ CHAMELEON_Disable( CHAMELEON_PROFILING_MODE );
+ }
if ( verboseTest ) {
void *lapackA = (void*)MpfCalloc( nbPts * nbPts, sizeof(D_type) ) ; CHKPTRQ(lapackA);
diff --git a/src/testHCHAMELEON.c b/src/testHCHAMELEON.c
index 86b925e..89c85ec 100644
--- a/src/testHCHAMELEON.c
+++ b/src/testHCHAMELEON.c
@@ -150,7 +150,13 @@ int testHCHAMELEON(void) {
nbPts, nbRHS, dims[0], dims[1] ); CHKERRQ(ierr);
/* Compute the mat.vec product A.rhs -> solCHAM */
+ if ( generate_traces ) {
+ CHAMELEON_Enable( CHAMELEON_PROFILING_MODE );
+ }
CHAMELEON_gemm_Tile( hdescA.super, descX, descY );
+ if ( generate_traces ) {
+ CHAMELEON_Disable( CHAMELEON_PROFILING_MODE );
+ }
/* convert back to lapack format */
ierr = CHAMELEON_Desc2Lap( ChamUpperLower, descY, solCHAM, nbPts ); CHKERRQ(ierr);
@@ -197,7 +203,7 @@ int testHCHAMELEON(void) {
/* ===================================================================================== */
Mpf_printf(MPI_COMM_WORLD, "\n\n**** Factorizing H-CHAMELEON...\n") ;
if ( generate_traces ) {
- CHAMELEON_Enable(CHAMELEON_PROFILING_MODE);
+ CHAMELEON_Enable( CHAMELEON_PROFILING_MODE );
}
temps_initial = getTime ();
if ( symMatSolver ) {
@@ -208,7 +214,7 @@ int testHCHAMELEON(void) {
temps_final = getTime ();
temps_cpu = temps_final - temps_initial ;
if ( generate_traces ) {
- CHAMELEON_Disable(CHAMELEON_PROFILING_MODE);
+ CHAMELEON_Disable( CHAMELEON_PROFILING_MODE );
}
Mpf_printf(MPI_COMM_WORLD,"<PERFTESTS> TpsCpuFacto = %f \n", temps_cpu) ;
--
GitLab