From 92767cb8f120a278a5b725379040c02da12f21b2 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 5 Feb 2018 18:25:17 +0100
Subject: [PATCH] Remove the unused peak option
---
example/basic_zposv/basic_posv.h | 8 ++------
timing/timing.c | 26 +++++++++-----------------
timing/timing.h | 2 --
3 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/example/basic_zposv/basic_posv.h b/example/basic_zposv/basic_posv.h
index 04748c34f..5f7aa0dc0 100644
--- a/example/basic_zposv/basic_posv.h
+++ b/example/basic_zposv/basic_posv.h
@@ -117,7 +117,6 @@ enum iparam_examples {
/* Added for StarPU version */
IPARAM_PROFILE,
IPARAM_PRINT_ERRORS,
- IPARAM_PEAK,
IPARAM_PARALLEL_TASKS,
IPARAM_NO_CPU,
IPARAM_BOUND,
@@ -132,7 +131,6 @@ enum dparam_examples {
IPARAM_XNORM,
IPARAM_RNORM,
IPARAM_AinvNORM,
- IPARAM_ESTIMATED_PEAK,
IPARAM_RES,
/* Begin section for hydra integration tool */
IPARAM_THRESHOLD_CHECK, /* Maximum value accepted for: |Ax-b||/N/eps/(||A||||x||+||b||) */
@@ -179,7 +177,6 @@ static void init_iparam(int iparam[IPARAM_SIZEOF]){
iparam[IPARAM_Q ] = 1;
iparam[IPARAM_PROFILE ] = 0;
iparam[IPARAM_PRINT_ERRORS ] = 0;
- iparam[IPARAM_PEAK ] = 0;
iparam[IPARAM_PARALLEL_TASKS] = 0;
iparam[IPARAM_NO_CPU ] = 0;
iparam[IPARAM_BOUND ] = 0;
@@ -210,7 +207,6 @@ static void print_header(char *prog_name, int * iparam) {
const char *bound_header = iparam[IPARAM_BOUND] ? " thGflop/s" : "";
const char *check_header = iparam[IPARAM_CHECK] ? " ||Ax-b|| ||A|| ||x|| ||b|| ||Ax-b||/N/eps/(||A||||x||+||b||) RETURN" : "";
const char *inverse_header = iparam[IPARAM_INVERSE] ? " ||I-A*Ainv|| ||A|| ||Ainv|| ||Id - A*Ainv||/((||A|| ||Ainv||).N.eps)" : "";
- const char *peak_header = iparam[IPARAM_PEAK] ? " (% of peak) peak" : "";
#if defined(CHAMELEON_SIMULATION)
double eps = 0.;
#else
@@ -235,8 +231,8 @@ static void print_header(char *prog_name, int * iparam) {
iparam[IPARAM_IB],
eps );
- printf( "# M N K/NRHS seconds Gflop/s Deviation%s%s%s\n",
- bound_header, peak_header, iparam[IPARAM_INVERSE] ? inverse_header : check_header);
+ printf( "# M N K/NRHS seconds Gflop/s Deviation%s%s\n",
+ bound_header, iparam[IPARAM_INVERSE] ? inverse_header : check_header);
printf( "# %5.0d %5.0d %5.0d\n", iparam[IPARAM_N], iparam[IPARAM_N], iparam[IPARAM_K]);
return;
}
diff --git a/timing/timing.c b/timing/timing.c
index 13cebf7c9..093ade83c 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -221,34 +221,30 @@ Test(int64_t n, int *iparam) {
if ( MORSE_My_Mpi_Rank() == 0) {
printf( "%9.3f %9.2f +-%7.2f ", sumt/niter, gflops, sd);
- if (iparam[IPARAM_BOUND])
+ if (iparam[IPARAM_BOUND]) {
printf(" %9.2f", sumgf_upper/niter);
-
- if ( iparam[IPARAM_PEAK] )
- {
- if (dparam[IPARAM_ESTIMATED_PEAK]<0.0f)
- printf(" n/a n/a ");
- else
- printf(" %5.2f%% %9.2f ", 100.0f*(gflops/dparam[IPARAM_ESTIMATED_PEAK]), dparam[IPARAM_ESTIMATED_PEAK]);
}
if ( iparam[IPARAM_CHECK] ){
hres = ( dparam[IPARAM_RES] / n / eps / (dparam[IPARAM_ANORM] * dparam[IPARAM_XNORM] + dparam[IPARAM_BNORM] ) > dparam[IPARAM_THRESHOLD_CHECK] );
- if (hres)
+ if (hres) {
printf( "%8.5e %8.5e %8.5e %8.5e %8.5e FAILURE",
dparam[IPARAM_RES], dparam[IPARAM_ANORM], dparam[IPARAM_XNORM], dparam[IPARAM_BNORM],
dparam[IPARAM_RES] / n / eps / (dparam[IPARAM_ANORM] * dparam[IPARAM_XNORM] + dparam[IPARAM_BNORM] ));
- else
+ }
+ else {
printf( "%8.5e %8.5e %8.5e %8.5e %8.5e SUCCESS",
dparam[IPARAM_RES], dparam[IPARAM_ANORM], dparam[IPARAM_XNORM], dparam[IPARAM_BNORM],
dparam[IPARAM_RES] / n / eps / (dparam[IPARAM_ANORM] * dparam[IPARAM_XNORM] + dparam[IPARAM_BNORM] ));
+ }
}
- if ( iparam[IPARAM_INVERSE] )
+ if ( iparam[IPARAM_INVERSE] ) {
printf( " %8.5e %8.5e %8.5e %8.5e",
dparam[IPARAM_RNORM], dparam[IPARAM_ANORM], dparam[IPARAM_AinvNORM],
dparam[IPARAM_RNORM] /((dparam[IPARAM_ANORM] * dparam[IPARAM_AinvNORM])*n*eps));
+ }
printf("\n");
@@ -387,7 +383,6 @@ show_help(char *prog_name) {
" -s, --sync Enable synchronous calls in wrapper function such as POTRI\n"
" -o, --ooc Enable out-of-core (available only with StarPU)\n"
" -G, --gemm3m Use gemm3m complex method\n"
- //" --peak ?\n"todo
" --bound Compare result to area bound\n"
"\n");
}
@@ -398,7 +393,6 @@ print_header(char *prog_name, int * iparam) {
const char *bound_header = iparam[IPARAM_BOUND] ? " thGflop/s" : "";
const char *check_header = iparam[IPARAM_CHECK] ? " ||Ax-b|| ||A|| ||x|| ||b|| ||Ax-b||/N/eps/(||A||||x||+||b||) RETURN" : "";
const char *inverse_header = iparam[IPARAM_INVERSE] ? " ||I-A*Ainv|| ||A|| ||Ainv|| ||Id - A*Ainv||/((||A|| ||Ainv||).N.eps)" : "";
- const char *peak_header = iparam[IPARAM_PEAK] ? " (% of peak) peak" : "";
#if defined(CHAMELEON_SIMULATION)
_PREC eps = 0.;
#else
@@ -431,8 +425,8 @@ print_header(char *prog_name, int * iparam) {
iparam[IPARAM_IB],
eps );
- printf( "# M N K/NRHS seconds Gflop/s Deviation%s%s%s\n",
- bound_header, peak_header, iparam[IPARAM_INVERSE] ? inverse_header : check_header);
+ printf( "# M N K/NRHS seconds Gflop/s Deviation%s%s\n",
+ bound_header, iparam[IPARAM_INVERSE] ? inverse_header : check_header);
return;
}
@@ -482,7 +476,6 @@ static struct option long_options[] =
{"sync", no_argument, 0, 's'},
{"ooc", no_argument, 0, 'o'},
{"gemm3m", no_argument, 0, 'G'},
- {"peak", no_argument, 0, '4'},
{"bound", no_argument, 0, '5'},
{0, 0, 0, 0}
};
@@ -611,7 +604,6 @@ parse_arguments(int *_argc, char ***_argv, int *iparam, int *start, int *stop, i
case 's' : iparam[IPARAM_ASYNC ] = 0; break;
case 'o' : iparam[IPARAM_OOC ] = 1; break;
case 'G' : iparam[IPARAM_GEMM3M ] = 1; break;
- case '4' : iparam[IPARAM_PEAK ] = 1; break;
case '5' : iparam[IPARAM_BOUND ] = 1; break;
case 'h' :
case '?' :
diff --git a/timing/timing.h b/timing/timing.h
index 9eb12fdbc..ef7357b3d 100644
--- a/timing/timing.h
+++ b/timing/timing.h
@@ -57,7 +57,6 @@ enum iparam_timing {
/* Added for StarPU version */
IPARAM_PROFILE,
IPARAM_PRINT_WARNINGS,
- IPARAM_PEAK,
IPARAM_PARALLEL_TASKS,
IPARAM_NO_CPU,
IPARAM_BOUND,
@@ -80,7 +79,6 @@ enum dparam_timing {
IPARAM_XNORM,
IPARAM_RNORM,
IPARAM_AinvNORM,
- IPARAM_ESTIMATED_PEAK,
IPARAM_RES,
/* Begin section for hydra integration tool */
IPARAM_THRESHOLD_CHECK, /* Maximum value accepted for: |Ax-b||/N/eps/(||A||||x||+||b||) */
--
GitLab