Skip to content

Commit 3edd62e

Browse files
jsquyresjsquyres
authored
Merge pull request open-mpi#8203 from jsquyres/pr/fix-warnings
Fix many compiler warnings
2 parents c134664 + 14aa5fa commit 3edd62e

File tree

16 files changed

+144
-91
lines changed

16 files changed

+144
-91
lines changed

‎configure.ac‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,9 @@ AC_CHECK_SIZEOF(_Bool)
459459
AC_CHECK_SIZEOF(char)
460460
AC_CHECK_SIZEOF(short)
461461
AC_CHECK_SIZEOF(int)
462+
AC_CHECK_SIZEOF(unsigned int)
462463
AC_CHECK_SIZEOF(long)
464+
AC_CHECK_SIZEOF(unsigned long)
463465
AC_CHECK_SIZEOF(long long)
464466
if test "$ac_cv_type_short_float" = yes; then
465467
AC_CHECK_SIZEOF(short float)

‎ompi/dpm/dpm.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* University of Stuttgart. All rights reserved.
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
13-
* Copyright (c) 2007-2018 Cisco Systems, Inc. All rights reserved
13+
* Copyright (c) 2007-2020 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2006-2009 University of Houston. All rights reserved.
1515
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
1616
* Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights
@@ -651,7 +651,7 @@ static int dpm_convert(opal_list_t *infos,
651651
bool deprecated)
652652
{
653653
opal_info_item_t *iptr;
654-
char *ck, *ptr, *help_str;
654+
char *ck, *ptr, *help_str = NULL;
655655
int rc;
656656
char **tmp;
657657
dpm_conflicts_t *modifiers;

‎ompi/errhandler/errhandler.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* University of Stuttgart. All rights reserved.
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
13-
* Copyright (c) 2008-2018 Cisco Systems, Inc. All rights reserved
13+
* Copyright (c) 2008-2020 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
1515
* Copyright (c) 2015 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
@@ -282,7 +282,7 @@ static void *ompi_errhandler_event_cb(int fd, int flags, void *context) {
282282
/* TODO: this error should return to the caller and invoke an error
283283
* handler from the MPI API call.
284284
* For now, it is fatal. */
285-
ompi_mpi_errors_are_fatal_comm_handler(NULL, status, "PMIx Even Notification");
285+
ompi_mpi_errors_are_fatal_comm_handler(NULL, &status, "PMIx Event Notification");
286286
return NULL;
287287
}
288288

‎ompi/mca/coll/adapt/coll_adapt_ireduce.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ int ompi_coll_adapt_ireduce_generic(const void *sbuf, void *rbuf, int count,
624624
OPAL_OUTPUT_VERBOSE((30, mca_coll_adapt_component.adapt_output,
625625
"[%d]: distance %d, inbuf %p, inbuf->buff %p, inbuf->buff-lb %p, to_inbuf %p, inbuf_list %p\n",
626626
rank, con->distance, (void *) temp_inbuf, (void *) temp_inbuf->buff,
627-
(char *) temp_inbuf->buff - lower_bound,
627+
(void *) ((char *) temp_inbuf->buff - lower_bound),
628628
(void *) to_inbuf((char *) temp_inbuf->buff - lower_bound, con->distance),
629629
(void *) &con->inbuf_list));
630630
opal_free_list_return_st(&con->inbuf_list, (opal_free_list_item_t *) temp_inbuf);

‎ompi/mca/common/monitoring/Makefile.am‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Copyright (c) 2016 Inria. All rights reserved.
66
# Copyright (c) 2017 Research Organization for Information Science
77
# and Technology (RIST). All rights reserved.
8-
# Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
8+
# Copyright (c) 2018-2020 Cisco Systems, Inc. All rights reserved.
99
# $COPYRIGHT$
1010
#
1111
# Additional copyrights may follow
@@ -28,6 +28,9 @@ lib_LTLIBRARIES += $(component_install)
2828
lib_LTLIBRARIES += ompi_monitoring_prof.la
2929

3030
ompi_monitoring_prof_la_SOURCES = monitoring_prof.c
31+
if OMPI_BUILD_FORTRAN_MPIFH_BINDINGS
32+
ompi_monitoring_prof_la_SOURCES += monitoring_prof_f.c
33+
endif
3134
ompi_monitoring_prof_la_LDFLAGS= \
3235
-module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS)
3336
ompi_monitoring_prof_la_LIBADD = \

‎ompi/mca/common/monitoring/monitoring_prof.c‎

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* reserved.
55
* Copyright (c) 2013-2017 Inria. All rights reserved.
66
* Copyright (c) 2013-2015 Bull SAS. All rights reserved.
7-
* Copyright (c) 2016-2018 Cisco Systems, Inc. All rights reserved.
7+
* Copyright (c) 2016-2020 Cisco Systems, Inc. All rights reserved.
88
* Copyright (c) 2017 Research Organization for Information Science
99
* and Technology (RIST). All rights reserved.
1010
* $COPYRIGHT$
@@ -398,59 +398,3 @@ int write_mat(char * filename, size_t * mat, unsigned int dim)
398398

399399
return 0;
400400
}
401-
402-
/**
403-
* MPI binding for fortran
404-
*/
405-
406-
void monitoring_prof_mpi_init_f2c( MPI_Fint * );
407-
void monitoring_prof_mpi_finalize_f2c( MPI_Fint * );
408-
409-
void monitoring_prof_mpi_init_f2c( MPI_Fint *ierr ) {
410-
int c_ierr;
411-
int argc = 0;
412-
char ** argv = NULL;
413-
414-
c_ierr = MPI_Init(&argc, &argv);
415-
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
416-
}
417-
418-
void monitoring_prof_mpi_finalize_f2c( MPI_Fint *ierr ) {
419-
int c_ierr;
420-
421-
c_ierr = MPI_Finalize();
422-
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
423-
}
424-
425-
#if OPAL_HAVE_WEAK_SYMBOLS
426-
#pragma weak MPI_INIT = monitoring_prof_mpi_init_f2c
427-
#pragma weak mpi_init = monitoring_prof_mpi_init_f2c
428-
#pragma weak mpi_init_ = monitoring_prof_mpi_init_f2c
429-
#pragma weak mpi_init__ = monitoring_prof_mpi_init_f2c
430-
#pragma weak MPI_Init_f = monitoring_prof_mpi_init_f2c
431-
#pragma weak MPI_Init_f08 = monitoring_prof_mpi_init_f2c
432-
433-
#pragma weak MPI_FINALIZE = monitoring_prof_mpi_finalize_f2c
434-
#pragma weak mpi_finalize = monitoring_prof_mpi_finalize_f2c
435-
#pragma weak mpi_finalize_ = monitoring_prof_mpi_finalize_f2c
436-
#pragma weak mpi_finalize__ = monitoring_prof_mpi_finalize_f2c
437-
#pragma weak MPI_Finalize_f = monitoring_prof_mpi_finalize_f2c
438-
#pragma weak MPI_Finalize_f08 = monitoring_prof_mpi_finalize_f2c
439-
#elif OMPI_BUILD_FORTRAN_BINDINGS
440-
441-
OMPI_GENERATE_F77_BINDINGS (MPI_INIT,
442-
mpi_init,
443-
mpi_init_,
444-
mpi_init__,
445-
monitoring_prof_mpi_init_f2c,
446-
(MPI_Fint *ierr),
447-
(ierr) )
448-
449-
OMPI_GENERATE_F77_BINDINGS (MPI_FINALIZE,
450-
mpi_finalize,
451-
mpi_finalize_,
452-
mpi_finalize__,
453-
monitoring_prof_mpi_finalize_f2c,
454-
(MPI_Fint *ierr),
455-
(ierr) )
456-
#endif

‎ompi/mca/common/monitoring/monitoring_prof_f.c‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
/*
2+
* Copyright (c) 2013-2017 The University of Tennessee and The University
3+
* of Tennessee Research Foundation. All rights
4+
* reserved.
5+
* Copyright (c) 2013-2017 Inria. All rights reserved.
6+
* Copyright (c) 2013-2015 Bull SAS. All rights reserved.
7+
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
8+
* Copyright (c) 2017 Research Organization for Information Science
9+
* and Technology (RIST). All rights reserved.
10+
* $COPYRIGHT$
11+
*
12+
* Additional copyrights may follow
13+
*
14+
* $HEADER$
15+
*/
16+
17+
/*
18+
* MPI binding for fortran
19+
*/
20+
21+
#define OMPI_BUILD_MPI_PROFILING 0
22+
#define OMPI_COMPILING_FORTRAN_WRAPPERS 1
23+
24+
#include <stdbool.h>
25+
26+
#include "ompi_config.h"
27+
28+
#include "ompi/mpi/fortran/mpif-h/bindings.h"
29+
#include "ompi/mpi/fortran/base/constants.h"
30+
31+
32+
void monitoring_prof_mpi_init_f2c( MPI_Fint * );
33+
void monitoring_prof_mpi_finalize_f2c( MPI_Fint * );
34+
35+
void monitoring_prof_mpi_init_f2c( MPI_Fint *ierr ) {
36+
int c_ierr;
37+
int argc = 0;
38+
char ** argv = NULL;
39+
40+
c_ierr = PMPI_Init(&argc, &argv);
41+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
42+
}
43+
44+
void monitoring_prof_mpi_finalize_f2c( MPI_Fint *ierr ) {
45+
int c_ierr;
46+
47+
c_ierr = PMPI_Finalize();
48+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
49+
}
50+
51+
#if OPAL_HAVE_WEAK_SYMBOLS
52+
#pragma weak MPI_INIT = monitoring_prof_mpi_init_f2c
53+
#pragma weak mpi_init = monitoring_prof_mpi_init_f2c
54+
#pragma weak mpi_init_ = monitoring_prof_mpi_init_f2c
55+
#pragma weak mpi_init__ = monitoring_prof_mpi_init_f2c
56+
#pragma weak MPI_Init_f = monitoring_prof_mpi_init_f2c
57+
#pragma weak MPI_Init_f08 = monitoring_prof_mpi_init_f2c
58+
59+
#pragma weak MPI_FINALIZE = monitoring_prof_mpi_finalize_f2c
60+
#pragma weak mpi_finalize = monitoring_prof_mpi_finalize_f2c
61+
#pragma weak mpi_finalize_ = monitoring_prof_mpi_finalize_f2c
62+
#pragma weak mpi_finalize__ = monitoring_prof_mpi_finalize_f2c
63+
#pragma weak MPI_Finalize_f = monitoring_prof_mpi_finalize_f2c
64+
#pragma weak MPI_Finalize_f08 = monitoring_prof_mpi_finalize_f2c
65+
#else
66+
67+
OMPI_GENERATE_F77_BINDINGS (MPI_INIT,
68+
mpi_init,
69+
mpi_init_,
70+
mpi_init__,
71+
monitoring_prof_mpi_init_f2c,
72+
(MPI_Fint *ierr),
73+
(ierr) )
74+
75+
OMPI_GENERATE_F77_BINDINGS (MPI_FINALIZE,
76+
mpi_finalize,
77+
mpi_finalize_,
78+
mpi_finalize__,
79+
monitoring_prof_mpi_finalize_f2c,
80+
(MPI_Fint *ierr),
81+
(ierr) )
82+
#endif

‎ompi/mca/osc/rdma/osc_rdma_types.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (c) 2014-2018 Los Alamos National Security, LLC. All rights
44
* reserved.
55
* Copyright (c) 2020 Google, LLC. All rights reserved.
6+
* Copyright (c) 2020 Cisco Systems, Inc. All rights reserved.
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -23,7 +24,7 @@ struct ompi_osc_rdma_peer_t;
2324
#if OPAL_HAVE_ATOMIC_MATH_64
2425

2526
typedef int64_t osc_rdma_base_t;
26-
typedef int64_t osc_rdma_size_t;
27+
typedef uint64_t osc_rdma_size_t;
2728
typedef int64_t osc_rdma_counter_t;
2829
typedef opal_atomic_int64_t osc_rdma_atomic_counter_t;
2930

@@ -32,7 +33,7 @@ typedef opal_atomic_int64_t osc_rdma_atomic_counter_t;
3233
#else
3334

3435
typedef int32_t osc_rdma_base_t;
35-
typedef int32_t osc_rdma_size_t;
36+
typedef uint32_t osc_rdma_size_t;
3637
typedef int32_t osc_rdma_counter_t;
3738
typedef opal_atomic_int32_t osc_rdma_atomic_counter_t;
3839

‎ompi/mca/pml/base/pml_base_select.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2012 Los Alamos National Security, LLC. All rights
1414
* reserved.
1515
* Copyright (c) 2013-2020 Intel, Inc. All rights reserved.
16-
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
16+
* Copyright (c) 2015-2020 Cisco Systems, Inc. All rights reserved.
1717
* Copyright (c) 2020 Amazon.com, Inc. or its affiliates. All Rights
1818
* reserved.
1919
* $COPYRIGHT$
@@ -368,7 +368,7 @@ mca_pml_base_pml_check_selected_impl(const char *my_pml,
368368
/* if that module doesn't match my own, return an error */
369369
if ((size != strlen(my_pml) + 1) ||
370370
(0 != strcmp(my_pml, remote_pml))) {
371-
char *errhost;
371+
char *errhost = NULL;
372372
OPAL_MODEX_RECV_VALUE_OPTIONAL(ret, PMIX_HOSTNAME, &proc_name,
373373
&(errhost), PMIX_STRING);
374374
opal_output(0, "%s selected pml %s, but peer %s on %s selected pml %s",

‎ompi/mca/topo/treematch/treematch/tm_tree.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1828,7 +1828,7 @@ void group_nodes(tm_affinity_mat_t *aff_mat, tm_tree_t *tab_node, tm_tree_t *new
18281828
best_selection = (group_list_t **)MALLOC(sizeof(group_list_t*)*solution_size);
18291829

18301830
list_all_possible_groups(cost_mat, tab_node, 0, arity, 0, cur_group, &list);
1831-
assert( (int)list.val == nb_groups);
1831+
assert( list.val == nb_groups);
18321832
tab_group = (group_list_t**)MALLOC(sizeof(group_list_t*)*nb_groups);
18331833
list_to_tab(list.next, tab_group, nb_groups);
18341834
if(verbose_level>=INFO)

0 commit comments

Comments
 (0)