MAJ terminée. Nous sommes passés en version 14.6.2 . Pour consulter les "releases notes" associées c'est ici :

https://about.gitlab.com/releases/2022/01/11/security-release-gitlab-14-6-2-released/
https://about.gitlab.com/releases/2022/01/04/gitlab-14-6-1-released/

Commit 075986df authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Merge branch 'issue12/error_message' into 'master'

Fix issue 12 - error message

Closes #12

See merge request !25
parents a1b13c50 439efbf8
......@@ -80,14 +80,7 @@ void morse_warning(const char *func_name, char* msg_text)
******************************************************************************/
void morse_error(const char *func_name, char* msg_text)
{
MORSE_context_t *morse;
morse = morse_context_self();
if (morse == NULL)
morse_fatal_error("morse_error", "MORSE not initialized");
if (morse->errors_enabled)
fprintf(stderr, "MORSE ERROR: %s(): %s\n", func_name, msg_text);
fprintf(stderr, "MORSE ERROR: %s(): %s\n", func_name, msg_text);
}
/*******************************************************************************
......
......@@ -77,8 +77,7 @@ MORSE_context_t *morse_context_create()
morse->ncudas = 0;
morse->nthreads_per_worker= 1;
morse->errors_enabled = MORSE_FALSE;
morse->warnings_enabled = MORSE_FALSE;
morse->warnings_enabled = MORSE_TRUE;
morse->autotuning_enabled = MORSE_TRUE;
morse->parallel_enabled = MORSE_FALSE;
morse->profiling_enabled = MORSE_FALSE;
......@@ -128,7 +127,6 @@ int morse_context_destroy(){
* @param[in] option
* Feature to be enabled:
* @arg MORSE_WARNINGS printing of warning messages,
* @arg MORSE_ERRORS printing of error messages,
* @arg MORSE_AUTOTUNING autotuning for tile size and inner block size.
* @arg MORSE_PROFILING_MODE activate profiling of kernels
* @arg MORSE_PROGRESS activate progress indicator
......@@ -155,9 +153,6 @@ int MORSE_Enable(MORSE_enum option)
case MORSE_WARNINGS:
morse->warnings_enabled = MORSE_TRUE;
break;
case MORSE_ERRORS:
morse->errors_enabled = MORSE_TRUE;
break;
case MORSE_AUTOTUNING:
morse->autotuning_enabled = MORSE_TRUE;
break;
......@@ -201,7 +196,6 @@ int MORSE_Enable(MORSE_enum option)
* @param[in] option
* Feature to be disabled:
* @arg MORSE_WARNINGS printing of warning messages,
* @arg MORSE_ERRORS printing of error messages,
* @arg MORSE_AUTOTUNING autotuning for tile size and inner block size.
* @arg MORSE_PROFILING_MODE deactivate profiling of kernels
* @arg MORSE_PROGRESS deactivate progress indicator
......@@ -227,9 +221,6 @@ int MORSE_Disable(MORSE_enum option)
case MORSE_WARNINGS:
morse->warnings_enabled = MORSE_FALSE;
break;
case MORSE_ERRORS:
morse->errors_enabled = MORSE_FALSE;
break;
case MORSE_AUTOTUNING:
morse->autotuning_enabled = MORSE_FALSE;
break;
......
......@@ -128,7 +128,6 @@ typedef struct morse_context_s {
int group_size;
/* Boolean flags */
MORSE_bool errors_enabled;
MORSE_bool warnings_enabled;
MORSE_bool autotuning_enabled;
MORSE_bool parallel_enabled;
......
......@@ -492,7 +492,7 @@ main(int argc, char *argv[]) {
iparam[IPARAM_GEMM3M ] = 0;
iparam[IPARAM_PROGRESS ] = 0;
iparam[IPARAM_PROFILE ] = 0;
iparam[IPARAM_PRINT_ERRORS ] = 0;
iparam[IPARAM_PRINT_WARNINGS] = 1;
iparam[IPARAM_PEAK ] = 0;
iparam[IPARAM_PARALLEL_TASKS] = 0;
iparam[IPARAM_NO_CPU ] = 0;
......@@ -586,8 +586,8 @@ main(int argc, char *argv[]) {
iparam[IPARAM_PEAK] = 1;
} else if (startswith( argv[i], "--noprofile" )) {
iparam[IPARAM_PROFILE] = 0;
} else if (startswith( argv[i], "--printerrors" )) {
iparam[IPARAM_PRINT_ERRORS] = 1;
} else if (startswith( argv[i], "--nowarnings" )) {
iparam[IPARAM_PRINT_WARNINGS] = 0;
/* } else if (startswith( argv[i], "--parallel=" )) { */
/* sscanf( strchr( argv[i], '=' ) + 1, "%d", &(iparam[IPARAM_PARALLEL_TASKS]) ); */
/* } else if (startswith( argv[i], "--noparallel" )) { */
......@@ -653,12 +653,12 @@ main(int argc, char *argv[]) {
if (iparam[IPARAM_PROFILE] == 1)
MORSE_Enable(MORSE_PROFILING_MODE);
if (iparam[IPARAM_PRINT_ERRORS] == 1)
MORSE_Enable(MORSE_ERRORS);
if (iparam[IPARAM_PROGRESS] == 1)
MORSE_Enable(MORSE_PROGRESS);
if (iparam[IPARAM_PRINT_WARNINGS] == 0)
MORSE_Disable(MORSE_WARNINGS);
if (iparam[IPARAM_GEMM3M] == 1)
MORSE_Enable(MORSE_GEMM3M);
......
......@@ -54,7 +54,7 @@ enum iparam_timing {
IPARAM_GEMM3M, /* Use GEMM3M for complex matrix vector products */
/* Added for StarPU version */
IPARAM_PROFILE,
IPARAM_PRINT_ERRORS,
IPARAM_PRINT_WARNINGS,
IPARAM_PEAK,
IPARAM_PARALLEL_TASKS,
IPARAM_NO_CPU,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment