Skip to content

Commit 7958ef5

Browse files
mike-dubmanmike-dubman
committed
Merge pull request open-mpi#11 from miked-mellanox/topic/sync_with_upstream
sync with ompi-release/v1.8
2 parents 15bf8fc + 1d16783 commit 7958ef5

27 files changed

+295
-100
lines changed

‎VERSION‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,14 @@ date="Unreleased developer copy"
8282
# Version numbers are described in the Libtool current:revision:age
8383
# format.
8484

85-
# JMS Code changed in libmpi
86-
# JMS Added MPIT interfaces in libmpi
8785
libmpi_so_version=7:0:6
8886
libmpi_cxx_so_version=2:3:1
89-
# JMS Add interface to libmpifh
9087
libmpi_mpifh_so_version=7:0:5
9188
libmpi_usempi_tkr_so_version=4:2:3
9289
libmpi_usempif08_so_version=5:0:5
93-
# JMS Code changes in libopen-rte
9490
libopen_rte_so_version=7:5:0
95-
# JMS Code changed in libopen-pal
9691
libopen_pal_so_version=8:1:2
9792
libmpi_java_so_version=3:0:2
98-
# JMS Code changes in liboshmem
9993
liboshmem_so_version=3:1:0
10094

10195
# "Common" components install standalone libraries that are run-time
@@ -104,13 +98,11 @@ liboshmem_so_version=3:1:0
10498
# components-don't-affect-the-build-system abstraction.
10599

106100
# OMPI layer
107-
# JMS Code changed in common cuda
108101
libmca_common_cuda_so_version=1:7:0
109102
libmca_common_mx_so_version=2:5:0
110103
libmca_common_sm_so_version=4:4:0
111104
libmca_common_ugni_so_version=2:1:2
112105
libmca_common_verbs_so_version=2:3:2
113106

114107
# OPAL layer
115-
# JMS Code changed in pmi common
116108
libmca_opal_common_pmi_so_version=2:3:1

‎config/ompi_setup_fc.m4‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dnl All rights reserved.
1313
dnl Copyright (c) 2007 Los Alamos National Security, LLC. All rights
1414
dnl reserved.
1515
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
16-
dnl Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
16+
dnl Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
1717
dnl $COPYRIGHT$
1818
dnl
1919
dnl Additional copyrights may follow
@@ -115,23 +115,26 @@ AC_DEFUN([OMPI_SETUP_FC],[
115115
[AC_FC_SRCEXT(f)
116116
AC_FC_SRCEXT(f90)])
117117

118-
# Per #1982, on OS X, we may need some esoteric linker flags in
119-
# the wrapper compilers. Assume that we need it for both F77 and
120-
# FC flags (note that in an upcoming update where there will only
121-
# be one Fortran compiler, anyway).
118+
# Per trac #1982, on OS X, we may need some esoteric linker flags
119+
# in the wrapper compilers. However, per
120+
# https://github.com/open-mpi/ompi/issues/259, we need to use
121+
# -Wl,-flat_namespace when *building* the library (and
122+
# -Wl,-commons,use_dylibs isn't quite sufficient).
122123
AS_IF([test $ompi_fc_happy -eq 1],
123124
[AC_MSG_CHECKING([to see if Fortran compilers need additional linker flags])
124125
case "$host" in
125126
*apple-darwin*)
126-
# Test whether -Wl,-commons,use_dylibs works; if it
127-
# does, use it.
127+
# Test whether -Wl,-flat_namespace works; if it does,
128+
# both use it to build the libraries, and also put it
129+
# in the wrapper compiler LDFLAGS.
128130
LDFLAGS_save=$LDFLAGS
129-
LDFLAGS="$LDFLAGS -Wl,-commons,use_dylibs"
131+
LDFLAGS="$LDFLAGS -Wl,-flat_namespace"
130132
AC_LANG_PUSH([Fortran])
131133
AC_LINK_IFELSE([AC_LANG_SOURCE([[program test
132134
integer :: i
133135
end program]])],
134-
[OMPI_FORTRAN_WRAPPER_FLAGS="-Wl,-commons,use_dylibs"
136+
[LDFLAGS_save=$LDFLAGS
137+
OMPI_FORTRAN_WRAPPER_FLAGS="-Wl,-flat_namespace"
135138
OPAL_WRAPPER_FLAGS_ADD([FCFLAGS], [$OMPI_FORTRAN_WRAPPER_FLAGS])],
136139
[OMPI_FORTRAN_WRAPPER_FLAGS=none])
137140
AC_LANG_POP([Fortran])

‎config/opal_check_ident.m4‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
dnl -*- shell-script -*-
22
dnl
33
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
4+
dnl Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
45
dnl $COPYRIGHT$
56
dnl
67
dnl Additional copyrights may follow
@@ -68,7 +69,8 @@ AC_DEFUN([_OMPI_CHECK_IDENT], [
6869

6970
ompi_ident="string_not_coincidentally_inserted_by_the_compiler"
7071
cat > conftest.$3 <<EOF
71-
$4 "$ompi_ident" $5
72+
#define IDENT_MSG "$ompi_ident"
73+
$4 IDENT_MSG $5
7274
int main(int argc, char** argv);
7375
int main(int argc, char** argv) { return 0; }
7476
EOF

‎config/opal_check_os_flavors.m4‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
dnl -*- shell-script -*-
22
dnl
33
dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
4+
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
45
dnl
56
dnl $COPYRIGHT$
67
dnl
@@ -44,7 +45,9 @@ AC_DEFUN([OPAL_CHECK_OS_FLAVORS],
4445
OPAL_CHECK_OS_FLAVOR_SPECIFIC([__sun__], [sun])
4546

4647
AS_IF([test "$opal_found_sun" = "yes"],
47-
[opal_have_solaris=1],
48+
[opal_have_solaris=1
49+
CFLAGS="$CFLAGS -D_REENTRANT"
50+
CPPFLAGS="$CPPFLAGS -D_REENTRANT"],
4851
[opal_have_solaris=0])
4952
AC_DEFINE_UNQUOTED([OPAL_HAVE_SOLARIS],
5053
[$opal_have_solaris],

‎contrib/openmpi-valgrind.supp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
{
9393
tcp_send
9494
Memcheck:Param
95+
writev(vector[...])
9596
fun:writev
9697
fun:mca_btl_tcp_frag_send
9798
fun:mca_btl_tcp_endpoint_send

‎ompi/communicator/comm.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ int ompi_comm_set ( ompi_communicator_t **ncomm,
117117
}
118118

119119
if (NULL != req) {
120-
ompi_request_wait (&req, MPI_STATUS_IGNORE);
120+
ompi_request_wait( &req, MPI_STATUS_IGNORE);
121121
}
122122

123123
return OMPI_SUCCESS;
@@ -1376,13 +1376,13 @@ static int ompi_comm_allgather_emulate_intra( void *inbuf, int incount,
13761376
}
13771377

13781378
if ( 0 == rank ) {
1379-
rc = ompi_request_wait_all (rsize, req, MPI_STATUSES_IGNORE);
1379+
rc = ompi_request_wait_all( rsize, req, MPI_STATUSES_IGNORE);
13801380
if ( OMPI_SUCCESS != rc ) {
13811381
goto exit;
13821382
}
13831383
}
13841384

1385-
rc = ompi_request_wait_all (1, &sendreq, MPI_STATUS_IGNORE);
1385+
rc = ompi_request_wait( &sendreq, MPI_STATUS_IGNORE);
13861386
if ( OMPI_SUCCESS != rc ) {
13871387
goto exit;
13881388
}
@@ -1405,7 +1405,7 @@ static int ompi_comm_allgather_emulate_intra( void *inbuf, int incount,
14051405
}
14061406
}
14071407

1408-
rc = ompi_request_wait_all (1, &sendreq, MPI_STATUS_IGNORE );
1408+
rc = ompi_request_wait( &sendreq, MPI_STATUS_IGNORE );
14091409

14101410
exit:
14111411
if ( NULL != req ) {
@@ -1568,7 +1568,7 @@ ompi_proc_t **ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
15681568
if ( OMPI_SUCCESS != rc ) {
15691569
goto err_exit;
15701570
}
1571-
rc = ompi_request_wait_all ( 1, &req, MPI_STATUS_IGNORE );
1571+
rc = ompi_request_wait( &req, MPI_STATUS_IGNORE );
15721572
if ( OMPI_SUCCESS != rc ) {
15731573
goto err_exit;
15741574
}
@@ -1600,7 +1600,7 @@ ompi_proc_t **ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
16001600
if ( OMPI_SUCCESS != rc ) {
16011601
goto err_exit;
16021602
}
1603-
rc = ompi_request_wait_all ( 1, &req, MPI_STATUS_IGNORE );
1603+
rc = ompi_request_wait( &req, MPI_STATUS_IGNORE );
16041604
if ( OMPI_SUCCESS != rc ) {
16051605
goto err_exit;
16061606
}

‎ompi/communicator/comm_cid.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
* reserved.
1919
* Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
2020
* Copyright (c) 2013 Intel, Inc. All rights reserved.
21+
* Copyright (c) 2014 Research Organization for Information Science
22+
* and Technology (RIST). All rights reserved.
2123
* $COPYRIGHT$
2224
*
2325
* Additional copyrights may follow
@@ -1291,7 +1293,7 @@ static int ompi_comm_allreduce_intra_bridge (int *inbuf, int *outbuf,
12911293
if ( OMPI_SUCCESS != rc ) {
12921294
goto exit;
12931295
}
1294-
rc = ompi_request_wait_all ( 1, &req, MPI_STATUS_IGNORE);
1296+
rc = ompi_request_wait( &req, MPI_STATUS_IGNORE);
12951297
if ( OMPI_SUCCESS != rc ) {
12961298
goto exit;
12971299
}

‎ompi/mca/coll/basic/coll_basic.h‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* All rights reserved.
1313
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2012 Sandia National Laboratories. All rights reserved.
15-
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
15+
* Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
1616
* reserved.
1717
* $COPYRIGHT$
1818
*
@@ -354,6 +354,25 @@ struct mca_coll_basic_module_t {
354354
int mccb_num_reqs;
355355
};
356356
typedef struct mca_coll_basic_module_t mca_coll_basic_module_t;
357+
358+
static inline int mca_coll_basic_check_for_requests (mca_coll_basic_module_t *basic_module, int max_reqs)
359+
{
360+
if (basic_module->mccb_num_reqs < max_reqs) {
361+
void *tmp;
362+
363+
basic_module->mccb_num_reqs = max_reqs;
364+
365+
tmp = realloc (basic_module->mccb_reqs, sizeof(ompi_request_t *) * basic_module->mccb_num_reqs);
366+
if (NULL == tmp) {
367+
return OMPI_ERR_OUT_OF_RESOURCE;
368+
}
369+
370+
basic_module->mccb_reqs = tmp;
371+
}
372+
373+
return OMPI_SUCCESS;
374+
}
375+
357376
OBJ_CLASS_DECLARATION(mca_coll_basic_module_t);
358377

359378
END_C_DECLS

‎ompi/mca/coll/basic/coll_basic_allgather.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
* University of Stuttgart. All rights reserved.
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
12+
* Copyright (c) 2014 Research Organization for Information Science
13+
* and Technology (RIST). All rights reserved.
1214
* $COPYRIGHT$
1315
*
1416
* Additional copyrights may follow
@@ -179,7 +181,7 @@ mca_coll_basic_allgather_inter(void *sbuf, int scount,
179181
goto exit;
180182
}
181183

182-
err = ompi_request_wait_all(1, &req, MPI_STATUS_IGNORE);
184+
err = ompi_request_wait( &req, MPI_STATUS_IGNORE);
183185
if (OMPI_SUCCESS != err) {
184186
goto exit;
185187
}

‎ompi/mca/coll/basic/coll_basic_alltoall.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
* All rights reserved.
1313
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1414
* reserved.
15+
* Copyright (c) 2014 Research Organization for Information Science
16+
* and Technology (RIST). All rights reserved.
1517
* $COPYRIGHT$
1618
*
1719
* Additional copyrights may follow
@@ -104,7 +106,7 @@ mca_coll_basic_alltoall_intra_inplace(void *rbuf, int rcount,
104106
}
105107

106108
/* Wait for the requests to complete */
107-
err = ompi_request_wait_all (2, basic_module->mccb_reqs, MPI_STATUS_IGNORE);
109+
err = ompi_request_wait_all (2, basic_module->mccb_reqs, MPI_STATUSES_IGNORE);
108110
if (MPI_SUCCESS != err) { goto error_hndl; }
109111

110112
/* Free the requests. */

0 commit comments

Comments
 (0)