Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
0413321
Fix PGI warnings: coll/adapt
awlauria Feb 3, 2021
5d3c038
Fix PGI warnings: coll/base
awlauria Feb 3, 2021
2f5e8c5
Fix PGI warnings: coll/basic
awlauria Feb 3, 2021
244435b
Fix PGI warnings: coll/tuned
awlauria Feb 3, 2021
8d04b9a
Fix PGI warnings: coll/other
awlauria Feb 3, 2021
bb5a2f5
Fix PGI warnings: vprotocol
awlauria Feb 3, 2021
26dee89
Fix PGI warnings: topo
awlauria Feb 3, 2021
d5db048
Fix PGI warnings: sharedfp
awlauria Feb 3, 2021
bb3b5c2
Fix PGI warnings: pml
awlauria Feb 3, 2021
8ca01e8
Fix PGI warnings: osc
awlauria Feb 3, 2021
fa24233
Fix PGI warnings: op
awlauria Feb 3, 2021
1efcb05
Fix PGI warnings: mtl
awlauria Feb 3, 2021
88ab79d
Fix PGI warnings: io
awlauria Feb 3, 2021
2f64585
Fix PGI warnings: hook
awlauria Feb 3, 2021
5ff6ba0
Fix PGI warnings: fs
awlauria Feb 3, 2021
cff945b
Fix PGI warnings: fcoll
awlauria Feb 3, 2021
1679186
Fix PGI warnings: fbtl
awlauria Feb 3, 2021
4ca04e3
Fix PGI warnings: crcp
awlauria Feb 3, 2021
aa4abb2
Fix PGI warnings: bml
awlauria Feb 3, 2021
869f32c
Fix PGI warnings: runtime
awlauria Feb 3, 2021
660c054
Fix PGI warnings: mpi
awlauria Feb 3, 2021
437ad8a
Fix PGI warnings: ompi/various
awlauria Feb 3, 2021
f74a7ea
Fix PGI warnings: test
awlauria Feb 3, 2021
f87740a
Fix PGI warnings: opal/util
awlauria Feb 3, 2021
cae49b9
Fix PGI warnings: opal/runtime
awlauria Feb 3, 2021
4287b92
Fix PGI warnings: opal/mca/rcache
awlauria Feb 3, 2021
3963993
Fix PGI warnings: opal/mca/mpool
awlauria Feb 3, 2021
1921cd9
Fix PGI warnings: opal/mca/memory
awlauria Feb 3, 2021
eb74c5a
Fix PGI warnings: opal/mca/common/ucx
awlauria Feb 3, 2021
5b05fc4
Fix PGI warnings: opal/mca/base
awlauria Feb 3, 2021
18550f3
Fix PGI warnings: opal/sys/atomics
awlauria Feb 3, 2021
38538b0
Fix PGI warnings: opal/mca/various
awlauria Feb 3, 2021
6a0ac1e
Fix PGI warnings: opal/datatype
awlauria Feb 3, 2021
2487ed9
xlc: Silence extension-used compiler warning.
awlauria Feb 3, 2021
58f74a2
Fix check for IBM xl compilers for v13.1 and later.
awlauria Feb 3, 2021
2bf3e96
Fix configury where most compilers will get mislabeled as 'gnu'.
awlauria Feb 3, 2021
aa25bf3
Fix PGI warnings: oshmem
awlauria Feb 4, 2021
47dd77e
Fix PGI warnings: coll/libnbc
awlauria Feb 4, 2021
70b1ac1
Fix PGI warnings: coll/han
awlauria Feb 4, 2021
54ac6b4
Fix PGI warnings: ompio
awlauria Feb 4, 2021
70b35fa
Fix PGI warning: ompi/datatype
awlauria Feb 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 24 additions & 25 deletions config/opal_check_vendor.m4
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [

# IBM XL C/C++
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
[OPAL_IF_IFELSE([defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__)],
[OPAL_IF_IFELSE([defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__) || defined(__ibmxl__)],
[opal_check_compiler_vendor_result="ibm"
xlc_major_version=`$CC -qversion 2>&1 | tail -n 1 | cut -d ' ' -f 2 | cut -d '.' -f 1`
xlc_minor_version=`$CC -qversion 2>&1 | tail -n 1 | cut -d ' ' -f 2 | cut -d '.' -f 2`
Expand All @@ -132,30 +132,6 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [
],
[OPAL_IF_IFELSE([defined(_AIX) && !defined(__GNUC__)],
[opal_check_compiler_vendor_result="ibm"])])])

# GNU
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
[OPAL_IFDEF_IFELSE([__GNUC__],
[opal_check_compiler_vendor_result="gnu"

# We do not support gccfss as a compiler so die if
# someone tries to use said compiler. gccfss (gcc
# for SPARC Systems) is a compiler that is no longer
# supported by Oracle and it has some major flaws
# that prevents it from actually compiling OMPI code.
# So if we detect it we automatically bail.

if ($CC --version | grep gccfss) >/dev/null 2>&1; then
AC_MSG_RESULT([gccfss])
AC_MSG_WARN([Detected gccfss being used to compile Open MPI.])
AC_MSG_WARN([Because of several issues Open MPI does not support])
AC_MSG_WARN([the gccfss compiler. Please use a different compiler.])
AC_MSG_WARN([If you did not think you used gccfss you may want to])
AC_MSG_WARN([check to see if the compiler you think you used is])
AC_MSG_WARN([actually a link to gccfss.])
AC_MSG_ERROR([Cannot continue])
fi])])

# Borland Turbo C
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
[OPAL_IFDEF_IFELSE([__TURBOC__],
Expand Down Expand Up @@ -279,6 +255,29 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [
[OPAL_IFDEF_IFELSE([__WATCOMC__],
[opal_check_compiler_vendor_result="watcom"])])

# GNU
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
[OPAL_IFDEF_IFELSE([__GNUC__],
[opal_check_compiler_vendor_result="gnu"

# We do not support gccfss as a compiler so die if
# someone tries to use said compiler. gccfss (gcc
# for SPARC Systems) is a compiler that is no longer
# supported by Oracle and it has some major flaws
# that prevents it from actually compiling OMPI code.
# So if we detect it we automatically bail.

if ($CC --version | grep gccfss) >/dev/null 2>&1; then
AC_MSG_RESULT([gccfss])
AC_MSG_WARN([Detected gccfss being used to compile Open MPI.])
AC_MSG_WARN([Because of several issues Open MPI does not support])
AC_MSG_WARN([the gccfss compiler. Please use a different compiler.])
AC_MSG_WARN([If you did not think you used gccfss you may want to])
AC_MSG_WARN([check to see if the compiler you think you used is])
AC_MSG_WARN([actually a link to gccfss.])
AC_MSG_ERROR([Cannot continue])
fi])])

$1="$opal_check_compiler_vendor_result"
unset opal_check_compiler_vendor_result
])
8 changes: 7 additions & 1 deletion config/opal_setup_cc.m4
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ AC_DEFUN([OPAL_PROG_CC_C11_HELPER],[
OPAL_CC_HELPER([if $CC $1 supports C11 _Atomic keyword], [opal_prog_cc_c11_helper__Atomic_available],
[[#include <stdatomic.h>]],[[static _Atomic long foo = 1;++foo;]])

OPAL_CC_HELPER([if $CC $1 supports C11 _c11_atomic functions], [opal_prog_cc_c11_atomic_function],
[[#include <stdatomic.h>]],[[atomic_int acnt = 0; __c11_atomic_fetch_add(&acnt, 1, memory_order_relaxed);]])
if test $opal_prog_cc_c11_atomic_function -eq 1; then
AC_DEFINE_UNQUOTED([OPAL_HAVE_CLANG_BUILTIN_ATOMIC_C11_FUNC], [$opal_prog_cc_c11_atomic_function], [Whether we have Clang __c11 atomic functions])
fi;

OPAL_CC_HELPER([if $CC $1 supports C11 _Generic keyword], [opal_prog_cc_c11_helper__Generic_available],
[[#define FOO(x) (_Generic (x, int: 1))]], [[static int x, y; y = FOO(x);]])

Expand Down Expand Up @@ -154,7 +160,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
AC_REQUIRE([_OPAL_PROG_CC])
AC_REQUIRE([AM_PROG_CC_C_O])

OPAL_VAR_SCOPE_PUSH([opal_prog_cc_c11_helper__Thread_local_available opal_prog_cc_c11_helper_atomic_var_available opal_prog_cc_c11_helper__Atomic_available opal_prog_cc_c11_helper__static_assert_available opal_prog_cc_c11_helper__Generic_available opal_prog_cc__thread_available opal_prog_cc_c11_helper_atomic_fetch_xor_explicit_available opal_prog_cc_c11_helper_proper__Atomic_support_in_atomics])
OPAL_VAR_SCOPE_PUSH([opal_prog_cc_c11_helper__Thread_local_available opal_prog_cc_c11_helper_atomic_var_available opal_prog_cc_c11_helper__Atomic_available opal_prog_cc_c11_helper__static_assert_available opal_prog_cc_c11_helper__Generic_available opal_prog_cc__thread_available opal_prog_cc_c11_helper_atomic_fetch_xor_explicit_available opal_prog_cc_c11_helper_proper__Atomic_support_in_atomics opal_prog_cc_c11_atomic_function])

OPAL_PROG_CC_C11

Expand Down
4 changes: 2 additions & 2 deletions ompi/datatype/ompi_datatype_get_elements.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
int ompi_datatype_get_elements (ompi_datatype_t *datatype, size_t ucount, size_t *count)
{
size_t internal_count, size, total;
int rc, i;
int i;

*count = 0;
if (OMPI_SUCCESS != (rc = ompi_datatype_type_size (datatype, &size))) {
if (OMPI_SUCCESS != ompi_datatype_type_size (datatype, &size)) {
return OMPI_ERR_BAD_PARAM;
}

Expand Down
11 changes: 8 additions & 3 deletions ompi/datatype/ompi_datatype_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,9 +547,14 @@ int32_t ompi_datatype_init( void )
ompi_mpi_##name.dt.d_f_to_c_index = index; \
rc = opal_pointer_array_set_item(&ompi_datatype_f_to_c_table, \
index, &ompi_mpi_##name); \
assert( rc == OPAL_SUCCESS ); \
if( ompi_datatype_number_of_predefined_data < (ompi_mpi_##name).dt.d_f_to_c_index + 1 ) \
ompi_datatype_number_of_predefined_data = (ompi_mpi_##name).dt.d_f_to_c_index + 1; \
if(OPAL_SUCCESS != rc) { \
fprintf(stderr, "ERROR: opal_pointer_array_set_item() returned %d\n", rc); \
fprintf(stderr, "Failure in %s:%d\n", __func__, __LINE__); \
return rc; \
} \
if( ompi_datatype_number_of_predefined_data < (ompi_mpi_##name).dt.d_f_to_c_index + 1 ) { \
ompi_datatype_number_of_predefined_data = (ompi_mpi_##name).dt.d_f_to_c_index + 1; \
} \
} while(0)

/*
Expand Down
3 changes: 2 additions & 1 deletion ompi/debuggers/ompi_debuggers.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ ompi_debugger_setup_dlls(void)
ompi_debugger_dll_path = opal_install_dirs.opallibdir;
(void) mca_base_var_register("ompi", "ompi", "debugger", "dll_path",
"List of directories where MPI_INIT should search for debugger plugins",
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
MCA_BASE_VAR_TYPE_STRING, NULL, 0,
MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&ompi_debugger_dll_path);
Expand Down
4 changes: 0 additions & 4 deletions ompi/errhandler/errhandler_invoke.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,25 +176,21 @@ int ompi_errhandler_request_invoke(int count,
mpi_object.comm,
mpi_object.comm->errhandler_type,
ec, message);
break;
case OMPI_REQUEST_IO:
return ompi_errhandler_invoke(mpi_object.file->error_handler,
mpi_object.file,
mpi_object.file->errhandler_type,
ec, message);
break;
case OMPI_REQUEST_WIN:
return ompi_errhandler_invoke(mpi_object.win->error_handler,
mpi_object.win,
mpi_object.win->errhandler_type,
ec, message);
break;
default:
/* Covers REQUEST_GEN, REQUEST_NULL, REQUEST_MAX */
return ompi_errhandler_invoke(MPI_COMM_WORLD->error_handler,
MPI_COMM_WORLD,
MPI_COMM_WORLD->errhandler_type,
ec, message);
break;
}
}
4 changes: 2 additions & 2 deletions ompi/include/ompi/memchecker.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
# define MEMCHECKER(x)
#endif /* OPAL_WANT_MEMCHECKER */


#if OPAL_WANT_MEMCHECKER
static inline int memchecker_convertor_call (int (*f)(void *, size_t), opal_convertor_t* pConvertor)
{
if (!opal_memchecker_base_runindebugger() ||
Expand Down Expand Up @@ -415,6 +415,6 @@ static inline int memchecker_message(MPI_Message *message)
#define memchecker_message(message)
#endif /* OMPI_WANT_MEMCHECKER_MPI_OBJECTS */


#endif
#endif /* OMPI_MEMCHECKER_H */

4 changes: 2 additions & 2 deletions ompi/mca/bml/base/bml_base_frame.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static int mca_bml_base_close(void);

MCA_BASE_FRAMEWORK_DECLARE(ompi, bml, "BTL Multiplexing Layer", mca_bml_base_register,
mca_bml_base_open, mca_bml_base_close, mca_bml_base_static_components,
0);
MCA_BASE_FRAMEWORK_FLAG_DEFAULT);

#if OPAL_ENABLE_DEBUG_RELIABILITY
int mca_bml_base_error_rate_floor;
Expand Down Expand Up @@ -114,7 +114,7 @@ static int mca_bml_base_open(mca_base_open_flag_t flags)
}
#endif

return mca_base_framework_open(&opal_btl_base_framework, 0);
return mca_base_framework_open(&opal_btl_base_framework, MCA_BASE_OPEN_DEFAULT);
}

static int mca_bml_base_close( void )
Expand Down
3 changes: 2 additions & 1 deletion ompi/mca/bml/r2/bml_r2_component.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ static int mca_bml_r2_component_register(void)
(void) mca_base_component_var_register(&mca_bml_r2_component.bml_version,
"show_unreach_errors",
"Show error message when procs are unreachable",
MCA_BASE_VAR_TYPE_BOOL, NULL, 0,0,
MCA_BASE_VAR_TYPE_BOOL, NULL, 0,
MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_bml_r2.show_unreach_errors);
Expand Down
4 changes: 2 additions & 2 deletions ompi/mca/bml/r2/bml_r2_ft.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ int mca_bml_r2_ft_event(int state)
/*
* Re-open the BTL framework to get the full list of components.
*/
if( OMPI_SUCCESS != (ret = mca_base_framework_open(&opal_btl_base_framework, 0)) ) {
if( OMPI_SUCCESS != (ret = mca_base_framework_open(&opal_btl_base_framework, MCA_BASE_OPEN_DEFAULT)) ) {
opal_output(0, "bml:r2: ft_event(Restart): Failed to open BTL framework\n");
return ret;
}
Expand Down Expand Up @@ -243,7 +243,7 @@ int mca_bml_r2_ft_event(int state)
opal_output_verbose(11, ompi_cr_output,
"Restart (Previous BTL MCA): <%s>\n", btl_list ? btl_list[0] : "");

if( OMPI_SUCCESS != (ret = mca_base_framework_open(&opal_btl_base_framework, 0)) ) {
if( OMPI_SUCCESS != (ret = mca_base_framework_open(&opal_btl_base_framework, MCA_BASE_OPEN_DEFAULT)) ) {
opal_output(0, "bml:r2: ft_event(Restart): Failed to open BTL framework\n");
return ret;
}
Expand Down
10 changes: 5 additions & 5 deletions ompi/mca/coll/adapt/coll_adapt_component.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,37 +114,37 @@ static int adapt_register(void)
we should have a high priority */
cs->adapt_priority = 0;
(void) mca_base_component_var_register(c, "priority", "Priority of the adapt coll component",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY, &cs->adapt_priority);

cs->adapt_verbose = ompi_coll_base_framework.framework_verbose;
(void) mca_base_component_var_register(c, "verbose",
"Verbose level (default set to the collective framework verbosity)",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY, &cs->adapt_verbose);

cs->adapt_context_free_list_min = 64;
(void) mca_base_component_var_register(c, "context_free_list_min",
"Minimum number of segments in context free list",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&cs->adapt_context_free_list_min);

cs->adapt_context_free_list_max = 1024;
(void) mca_base_component_var_register(c, "context_free_list_max",
"Maximum number of segments in context free list",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&cs->adapt_context_free_list_max);

cs->adapt_context_free_list_inc = 32;
(void) mca_base_component_var_register(c, "context_free_list_inc",
"Increasement number of segments in context free list",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&cs->adapt_context_free_list_inc);
Expand Down
10 changes: 5 additions & 5 deletions ompi/mca/coll/adapt/coll_adapt_ibcast.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ int ompi_coll_adapt_ibcast_register(void)

mca_coll_adapt_component.adapt_ibcast_algorithm = 1;
mca_base_component_var_register(c, "bcast_algorithm",
"Algorithm of broadcast, 0: tuned, 1: binomial, 2: in_order_binomial, 3: binary, 4: pipeline, 5: chain, 6: linear", MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
"Algorithm of broadcast, 0: tuned, 1: binomial, 2: in_order_binomial, 3: binary, 4: pipeline, 5: chain, 6: linear", MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_5, MCA_BASE_VAR_SCOPE_READONLY,
&mca_coll_adapt_component.adapt_ibcast_algorithm);
if( (mca_coll_adapt_component.adapt_ibcast_algorithm < 0) ||
Expand All @@ -44,31 +44,31 @@ int ompi_coll_adapt_ibcast_register(void)
mca_coll_adapt_component.adapt_ibcast_segment_size = 0;
mca_base_component_var_register(c, "bcast_segment_size",
"Segment size in bytes used by default for bcast algorithms. Only has meaning if algorithm is forced and supports segmenting. 0 bytes means no segmentation.",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_5,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_coll_adapt_component.adapt_ibcast_segment_size);

mca_coll_adapt_component.adapt_ibcast_max_send_requests = 2;
mca_base_component_var_register(c, "bcast_max_send_requests",
"Maximum number of send requests",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_5,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_coll_adapt_component.adapt_ibcast_max_send_requests);

mca_coll_adapt_component.adapt_ibcast_max_recv_requests = 3;
mca_base_component_var_register(c, "bcast_max_recv_requests",
"Maximum number of receive requests",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_5,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_coll_adapt_component.adapt_ibcast_max_recv_requests);

mca_coll_adapt_component.adapt_ibcast_synchronous_send = true;
(void) mca_base_component_var_register(c, "bcast_synchronous_send",
"Whether to use synchronous send operations during setup of bcast operations",
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_NONE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_coll_adapt_component.adapt_ibcast_synchronous_send);
Expand Down
Loading