1
1

oshmem: Add help message for fatal issues in scoll:mpi and scoll:fca

Signed-off-by: Igor Ivanov <Igor.Ivanov@itseez.com>
Этот коммит содержится в:
Igor Ivanov 2015-09-21 17:08:51 +03:00
родитель ec7cd13a81
Коммит 7de0537a1d
6 изменённых файлов: 55 добавлений и 2 удалений

Просмотреть файл

@ -1,7 +1,7 @@
# -*- shell-script -*-
#
#
# Copyright (c) 2013 Mellanox Technologies, Inc.
# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
# All rights reserved.
# $COPYRIGHT$
#
@ -10,6 +10,10 @@
# $HEADER$
#
#
dist_oshmemdata_DATA = \
help-oshmem-scoll-fca.txt
AM_CPPFLAGS = $(coll_fca_CPPFLAGS) -DCOLL_FCA_HOME=\"$(coll_fca_HOME)\" $(coll_fca_extra_CPPFLAGS)
scoll_fca_sources = \
scoll_fca.h \

Просмотреть файл

@ -0,0 +1,16 @@
#
# Copyright (c) 2015 Mellanox Technologies, Inc.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
[module_enable:fatal]
scoll:fca module reports issue during module enabling phase.
Try to use scoll:fca component with anoter one
for example scoll:basic
Error: %s
#

Просмотреть файл

@ -14,6 +14,8 @@
#include "scoll_fca.h"
#include <stdio.h>
#include <unistd.h>
#include "opal/util/show_help.h"
#include "oshmem/constants.h"
#include "oshmem/mca/scoll/scoll.h"
#include "oshmem/mca/scoll/base/base.h"
@ -430,6 +432,10 @@ static int mca_scoll_fca_module_enable(mca_scoll_base_module_t *module,
* So differnt frameworks will be used for collective ops
*/
FCA_ERROR("FCA module enable failed - aborting to prevent inconsistent application state");
/* There's no modules available */
opal_show_help("help-oshmem-scoll-fca.txt",
"module_enable:fatal", true,
"FCA module enable failed - aborting to prevent inconsistent application state");
oshmem_shmem_abort(-1);
return OMPI_ERROR;
}

Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2013 Mellanox Technologies, Inc.
# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
# All rights reserved.
# $COPYRIGHT$
#
@ -7,6 +7,10 @@
# $HEADER$
#
#
dist_oshmemdata_DATA = \
help-oshmem-scoll-mpi.txt
scoll_mpi_sources = \
scoll_mpi.h \
scoll_mpi_debug.h \

Просмотреть файл

@ -0,0 +1,16 @@
#
# Copyright (c) 2015 Mellanox Technologies, Inc.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
[module_enable:fatal]
scoll:mpi module reports issue during module enabling phase.
Try to use scoll:mpi component with anoter one
for example scoll:basic
Error: %s
#

Просмотреть файл

@ -12,6 +12,8 @@
#include "ompi_config.h"
#include "scoll_mpi.h"
#include "opal/util/show_help.h"
#include "oshmem/proc/proc.h"
#include "oshmem/runtime/runtime.h"
#include "ompi/mca/coll/base/base.h"
@ -78,6 +80,11 @@ static int mca_scoll_mpi_module_enable(mca_scoll_base_module_t *module,
if (OSHMEM_SUCCESS != mca_scoll_mpi_save_coll_handlers(module, osh_group)){
MPI_COLL_ERROR("MPI module enable failed - aborting to prevent inconsistent application state");
/* There's no modules available */
opal_show_help("help-oshmem-scoll-mpi.txt",
"module_enable:fatal", true,
"MPI module enable failed - aborting to prevent inconsistent application state");
oshmem_shmem_abort(-1);
return OSHMEM_ERROR;
}